2008-05-22 Marek Habersack <mhabersack@novell.com>

[mono.git] / mcs / class / System.Web / System.Web.Configuration_2.0 / GlobalizationSection.cs

diff --git a/mcs/class/System.Web/System.Web.Configuration_2.0/GlobalizationSection.cs b/mcs/class/System.Web/System.Web.Configuration_2.0/GlobalizationSection.cs
index 241e5403fb47093e73ce90d9f21c5b33cea69ffd..5116d2abd7d503d804562498e487503dedd338c4 100644 (file)
--- a/mcs/class/System.Web/System.Web.Configuration_2.0/GlobalizationSection.cs
+++ b/mcs/class/System.Web/System.Web.Configuration_2.0/GlobalizationSection.cs
@@ -83,15 +83,16 @@ namespace System.Web.Configuration {
 
                void VerifyData ()
                {
+                       bool fake = false;
                        try {
-                               new CultureInfo (Culture);
+                               GetSanitizedCulture (Culture, ref fake);
                        }
                        catch {
                                throw new ConfigurationErrorsException ("the <globalization> tag contains an invalid value for the 'culture' attribute");
                        }
 
                        try {
-                               new CultureInfo (UICulture);
+                               GetSanitizedCulture (UICulture, ref fake);
                        }
                        catch {
                                throw new ConfigurationErrorsException ("the <globalization> tag contains an invalid value for the 'uiCulture' attribute");
@@ -186,11 +187,39 @@ namespace System.Web.Configuration {
                static bool encoding_warning;
                static bool culture_warning;
 
+               bool autoCulture;
+               bool autoUICulture;
+
+               internal bool IsAutoCulture {
+                       get { return autoCulture; }
+               }
+
+               internal bool IsAutoUICulture {
+                       get { return autoUICulture; }
+               }
+               
+               CultureInfo GetSanitizedCulture (string culture, ref bool auto)
+               {
+                       auto = false;
+                       if (culture == null)
+                               throw new ArgumentNullException ("culture");
+                       if (culture.Length <= 3)
+                               return new CultureInfo (culture);
+                       if (culture.StartsWith ("auto")) {
+                               auto = true;
+                               if (culture.Length > 5 && culture[4] == ':')
+                                       return new CultureInfo (culture.Substring (5));
+                               return CultureInfo.InvariantCulture;// (0x007f);
+                       }
+
+                       return new CultureInfo (culture);
+               }
+                               
                internal CultureInfo GetUICulture ()
                {
                        if (cached_uiculture != UICulture) {
                                try {
-                                       cached_uicultureinfo = new CultureInfo (UICulture);
+                                       cached_uicultureinfo = GetSanitizedCulture (UICulture, ref autoUICulture);
                                } catch {
                                        CultureFailed ("UICulture", UICulture);
                                        cached_uicultureinfo = new CultureInfo (0x007f); // Invariant
@@ -204,7 +233,7 @@ namespace System.Web.Configuration {
                {
                        if (cached_culture != Culture) {
                                try {
-                                       cached_cultureinfo = new CultureInfo (Culture);
+                                       cached_cultureinfo = GetSanitizedCulture (Culture, ref autoCulture);
                                } catch {
                                        CultureFailed ("Culture", Culture);
                                        cached_cultureinfo = new CultureInfo (0x007f); // Invariant
@@ -216,13 +245,14 @@ namespace System.Web.Configuration {
 
                Encoding GetEncoding (ConfigurationProperty prop, ref string cached_encoding_name)
                {
+                       string enc = (string) base [prop];
                        if (cached_encoding_name == null)
-                               cached_encoding_name = "utf-8";
+                               cached_encoding_name = ((enc == null) ? "utf-8" : enc);
 
                        Encoding encoding = (Encoding)encodingHash [prop];
                        if (encoding == null || encoding.EncodingName != cached_encoding_name) {
                                try {
-                                       switch (cached_encoding_name.ToLower ()) {
+                                       switch (cached_encoding_name.ToLower (CultureInfo.InvariantCulture)) {
                                        case "utf-16le":
                                        case "utf-16":
                                        case "ucs-2":