Update handling of Android language codes

ui/base/l10n/l10n_util.cc

 // Copyright (c) 2012 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 "ui/base/l10n/l10n_util.h"
 
 #include <algorithm>
 #include <cstdlib>
 #include <iterator>
 #include <string>
@@ skipping 251 matching lines @@
   std::string::size_type variant_pos = locale.find('@');
   if (variant_pos != std::string::npos)
     return false;
 
   // If the locale matches language but not country, use that instead.
   // TODO(jungshik) : Nothing is done about languages that Chrome
   // does not support but available on Windows. We fall
   // back to en-US in GetApplicationLocale so that it's a not critical,
   // but we can do better.
   std::string::size_type hyphen_pos = locale.find('-');
+  std::string lang(locale, 0, hyphen_pos);
   if (hyphen_pos != std::string::npos && hyphen_pos > 0) {
-    std::string lang(locale, 0, hyphen_pos);
     std::string region(locale, hyphen_pos + 1);
     std::string tmp_locale(lang);
     // Map es-RR other than es-ES to es-419 (Chrome's Latin American
     // Spanish locale).
     if (LowerCaseEqualsASCII(lang, "es") &&
         !LowerCaseEqualsASCII(region, "es")) {
       tmp_locale.append("-419");
     } else if (LowerCaseEqualsASCII(lang, "zh")) {
       // Map zh-HK and zh-MO to zh-TW. Otherwise, zh-FOO is mapped to zh-CN.
       if (LowerCaseEqualsASCII(region, "hk") ||
@@ skipping 15 matching lines @@
       } else {
         tmp_locale.append("-US");
       }
     }
     if (IsLocaleAvailable(tmp_locale)) {
       resolved_locale->swap(tmp_locale);
       return true;
     }
   }
 
-  // Google updater uses no, iw and en for our nb, he, and en-US.
-  // We need to map them to our codes.
+  // Google updater uses no, iw and en for our nb, he, and en-US, and
+  // Android uses iw-*, in-*, and ji-*.  We need to map them to our codes.
   struct {
     const char* source;
     const char* dest;
   } alias_map[] = {
       {"no", "nb"},
       {"tl", "fil"},
       {"iw", "he"},
       {"en", "en-US"},
+      {"in", "id"},
+      {"ji", "yi"},
   };
 
   for (size_t i = 0; i < ARRAYSIZE_UNSAFE(alias_map); ++i) {
-    if (LowerCaseEqualsASCII(locale, alias_map[i].source)) {
+    if (LowerCaseEqualsASCII(lang, alias_map[i].source)) {
       std::string tmp_locale(alias_map[i].dest);
       if (IsLocaleAvailable(tmp_locale)) {
         resolved_locale->swap(tmp_locale);
         return true;
       }
     }
   }
 
   return false;
 }
@@ skipping 509 matching lines @@
   for (size_t i = 0; i < arraysize(kAcceptLanguageList); ++i) {
     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]);
   }
 }
 
 }  // namespace l10n_util