Chrome UI language menu fix and add Hawaiian to the A-L list.

app/l10n_util.cc

 // Copyright (c) 2006-2008 The Chromium Authors. All rights reserved.
 // Use of this source code is governed by a BSD-style license that can be
 // found in the LICENSE file.
 
 #include "app/l10n_util.h"
 
 #include "app/app_paths.h"
 #include "app/app_switches.h"
 #include "app/gfx/canvas.h"
 #include "app/resource_bundle.h"
@@ skipping 69 matching lines @@
   "fr",     // French
   "fr-CA",  // French (Canada)
   "fr-CH",  // French (Switzerland)
   "fr-FR",  // French (France)
   "fy",     // Frisian
   "ga",     // Irish
   "gd",     // Scots Gaelic
   "gl",     // Galician
   "gn",     // Guarani
   "gu",     // Gujarati
+  "ha",     // Hausa
+  "haw",    // Hawaiian
   "he",     // Hebrew
   "hi",     // Hindi
   "hr",     // Croatian
   "hu",     // Hungarian
   "hy",     // Armenian
   "ia",     // Interlingua
   "id",     // Indonesian
   "is",     // Icelandic
   "it",     // Italian
   "it-CH",  // Italian (Switzerland)
@@ skipping 18 matching lines @@
   "mo",     // Moldavian
   "mr",     // Marathi
   "ms",     // Malay
   "mt",     // Maltese
   "nb",     // Norwegian (Bokmal)
   "ne",     // Nepali
   "nl",     // Dutch
   "nn",     // Norwegian (Nynorsk)
   "no",     // Norwegian
   "oc",     // Occitan
+  "om",     // Oromo
   "or",     // Oriya
   "pa",     // Punjabi
   "pl",     // Polish
   "ps",     // Pashto
   "pt",     // Portuguese
   "pt-BR",  // Portuguese (Brazil)
   "pt-PT",  // Portuguese (Portugal)
   "qu",     // Quechua
   "rm",     // Romansh
   "ro",     // Romanian
@@ skipping 111 matching lines @@
   // has to be added manually in GetAvailableLocales().
   if (LowerCaseEqualsASCII(locale_name.substr(0, 3),  "es_"))
     return true;
   for (size_t i = 0; i < arraysize(kDuplicateNames); ++i) {
     if (base::strcasecmp(kDuplicateNames[i], locale_name.c_str()) == 0)
       return true;
   }
   return false;
 }
 
+bool IsLocaleNameTranslated(const char* locale,
+                            const std::string& display_locale) {
+  string16 display_name =
+      l10n_util::GetDisplayNameForLocale(locale, display_locale, false);
+  // Because ICU sets the error code to U_USING_DEFAULT_WARNING whether or not
+  // uloc_getDisplayName returns the actual translation or the default
+  // value (locale code), we have to rely on this hack to tell whether
+  // the translation is available or not.  If ICU doesn't have a translated
+  // name for this locale, GetDisplayNameForLocale will just return the
+  // locale code.
+  return !IsStringASCII(display_name) || UTF16ToASCII(display_name) != locale;
+}
+
+// We added 30+ minimally populated locales with only a few entries
+// (exemplar character set, script, writing direction and its own
+// lanaguage name). These locales have to be distinguished from the
+// fully populated locales to which Chrome is localized.
+bool IsLocalePartiallyPopulated(const std::string& locale_name) {
+  // For partially populated locales, even the translation for "English"
+  // is not available. A more robust/elegant way to check is to add a special
+  // field (say, 'isPartial' to our version of ICU locale files) and
+  // check its value, but this hack seems to work well.
+  return !IsLocaleNameTranslated("en", locale_name);
+}
+
 bool IsLocaleAvailable(const std::string& locale,
                        const FilePath& locale_path) {
   // If locale has any illegal characters in it, we don't want to try to
   // load it because it may be pointing outside the locale data file directory.
   if (!file_util::IsFilenameLegal(ASCIIToUTF16(locale)))
     return false;
 
   if (!l10n_util::IsLocaleSupportedByOS(locale))
     return false;
 
@@ skipping 589 matching lines @@
 
 const std::vector<std::string>& GetAvailableLocales() {
   static std::vector<std::string> locales;
   if (locales.empty()) {
     int num_locales = uloc_countAvailable();
     for (int i = 0; i < num_locales; ++i) {
       std::string locale_name = uloc_getAvailable(i);
       // Filter out the names that have aliases.
       if (IsDuplicateName(locale_name))
         continue;
+      // Filter out locales for which we have only partially populated data
+      // and to which Chrome is not localized.
+      if (IsLocalePartiallyPopulated(locale_name))
+        continue;
       if (!IsLocaleSupportedByOS(locale_name))
         continue;
       // Normalize underscores to hyphens because that's what our locale files
       // use.
       std::replace(locale_name.begin(), locale_name.end(), '_', '-');
 
       // Map the Chinese locale names over to zh-CN and zh-TW.
       if (LowerCaseEqualsASCII(locale_name, "zh-hans")) {
         locale_name = "zh-CN";
       } else if (LowerCaseEqualsASCII(locale_name, "zh-hant")) {
         locale_name = "zh-TW";
       }
       locales.push_back(locale_name);
     }
 
     // Manually add 'es-419' to the list. See the comment in IsDuplicateName().
     locales.push_back("es-419");
   }
   return locales;
 }
 
 void GetAcceptLanguagesForLocale(const std::string& display_locale,
                                  std::vector<std::string>* locale_codes) {
   for (size_t i = 0; i < arraysize(kAcceptLanguageList); ++i) {
-    string16 display_name =
-        l10n_util::GetDisplayNameForLocale(kAcceptLanguageList[i],
-                                           display_locale, false);
-    // This is a hack. If ICU doesn't have a translated name for
-    // this language, GetDisplayNameForLocale will just return the
-    // language code. In that case, we skip it.
-    // TODO(jungshik) : Put them at the of the list with language codes
-    // enclosed by brackets.
-    if (IsStringASCII(display_name) &&
-        UTF16ToASCII(display_name) == kAcceptLanguageList[i])
-      continue;
+    if (!IsLocaleNameTranslated(kAcceptLanguageList[i], display_locale))
+      // TODO(jungshik) : Put them at the of the list with language codes
+      // enclosed by brackets instead of skipping.
+        continue;
     locale_codes->push_back(kAcceptLanguageList[i]);
   }
 }
 
 BiDiLineIterator::~BiDiLineIterator() {
   if (bidi_) {
     ubidi_close(bidi_);
     bidi_ = NULL;
   }
 }
@@ skipping 34 matching lines @@
 }
 
 void BiDiLineIterator::GetLogicalRun(int start,
                                      int* end,
                                      UBiDiLevel* level) {
   DCHECK(bidi_ != NULL);
   ubidi_getLogicalRun(bidi_, start, end, level);
 }
 
 }