Ticket #5970: kits_locale.patch

src/kits/locale/Country.cpp

@@ -8 +8 @@
 #include <Country.h>
 
 #include <assert.h>
+#include <string.h>
 
 #include <IconUtils.h>
 #include <Resources.h>
@@ -52 +53 @@
 }
 
 
-BCountry::BCountry(const char* languageAndCountryCode)
+/*!
+    Parameter for the method should follow one of the following models: 
+    "en_US@ISO-8859-1", en_US@ISO-8859-15" "en_US@euro" "en_US@utf8" 
+    "en_US@utf-8" "en_US@UTF8" "en_US@UTF-8""en_US.ISO-8859-1", 
+    "en_US.ISO-8859-15" "en_US.euro" "en_US.utf8" "en_US.utf-8", "en_US.UTF8" 
+    and "en_US.UTF-8".
+*/
+BCountry::BCountry(const char* languageAndCountryCodeAtEncoding)
     :
     fStrings(gStrings)
 {
-    fICULocale = new icu_4_2::Locale(languageAndCountryCode);
+    int len = strcspn(languageAndCountryCodeAtEncoding, "@.");
+    if (len < strlen(languageAndCountryCodeAtEncoding) {
+        char languageAndCountryCode[512];
+        strncpy(languageAndCountryCode, languageAndCountryCodeAtEncoding, len);
+        languageAndCountryCode[len]='\0';
+
+        int langSize = strlen(languageAndCountryCode);
+        int paramSize = strlen(languageAndCountryCodeAtEncoding);
+        char encoding[512];
+
+        if (paramSize > (langSize+1)) {
+            len = paramSize-langSize-1;
+            strncpy(encoding, languageAndCountryCodeAtEncoding+(langSize+1), len);
+            encoding[len] = '\0';
+        } else
+            encoding[0] = '\0';
+    
+        fICULocale = new icu_4_2::Locale(languageAndCountryCode);
+        fICULocale->setEncoding(encoding);
+    } else
+        fICULocale = new icu_4_2::Locale(languageAndCountryCodeAtEncoding);
+        
     fICULongDateFormatter = DateFormat::createDateInstance(
         DateFormat::FULL, *fICULocale);
     fICUShortDateFormatter = DateFormat::createDateInstance(
         DateFormat::SHORT, *fICULocale);
+    fICULocale->setEncoding("");
 }
 
 
@@ -111 +141 @@
 }
 
 
+bool
+BCountry::Encoding(BString& code) const
+{
+    UnicodeString uString;
+    fICULocale->getEncoding(uString);
+    BStringByteSink stringConverter(&code);
+    uString.toUTF8(stringConverter);
+    return true;
+}
+
+
 // TODO use ICU backend keywords instead
 const char*
 BCountry::GetString(uint32 id) const
@@ -247 +288 @@
 
 
 void
+BCountry::Set24HourClock(bool clock)
+{
+    fIsClock24Hour = clock;
+}
+
+
+bool
+BCountry::IsClock24Hour() const
+{
+    return fIsClock24Hour;
+}
+
+
+void
 BCountry::FormatNumber(char* string, size_t maxSize, double value)
 {
     BString fullString;

src/kits/locale/LocaleRoster.cpp

@@ -192 +192 @@
     BMessage fPreferredLanguages;
     BString fCountryCodeName;
     BString fCountryDateFormat;
+    bool    fIsClock24Hour;
 
     RosterData();
     ~RosterData();
@@ -247 +248 @@
 
             if (settingsMessage.FindString("country", &fCountryCodeName) != B_OK)
                 fCountryCodeName = "en_US";
+            fIsClock24Hour = false;
             return;
         }
     }
@@ -255 +257 @@
     // set everything to default values
     fPreferredLanguages.AddString("language", "en");
     fCountryCodeName = "en_US";
+    fIsClock24Hour = false;
     log_team(LOG_ERR,"*** No language preference found!\n");
 }