| Index: base/android/java/src/org/chromium/base/LocaleUtils.java
|
| diff --git a/base/android/java/src/org/chromium/base/LocaleUtils.java b/base/android/java/src/org/chromium/base/LocaleUtils.java
|
| index 5c26e7a50c28618ad009b7499bd1954b44b4541c..b45544cb5f20ed61abc34ca278a34425ee9794d3 100644
|
| --- a/base/android/java/src/org/chromium/base/LocaleUtils.java
|
| +++ b/base/android/java/src/org/chromium/base/LocaleUtils.java
|
| @@ -24,9 +24,19 @@ public class LocaleUtils {
|
| * used by Chromium.
|
| */
|
| public static String getLocale(Locale locale) {
|
| - String language = locale.getLanguage();
|
| + String language = getLanguage(locale);
|
| String country = locale.getCountry();
|
|
|
| + return country.isEmpty() ? language : language + "-" + country;
|
| + }
|
| +
|
| + /**
|
| + * @return the language for the given locale, translating
|
| + * Android deprecated languages codes into modern ones used by Chromium.
|
| + */
|
| + public static String getLanguage(Locale locale) {
|
| + String language = locale.getLanguage();
|
| +
|
| // Android uses deprecated lanuages codes for Hebrew and Indonesian but Chromium uses the
|
| // updated codes. Also, Android uses "tl" while Chromium uses "fil" for Tagalog/Filipino.
|
| // So apply a mapping.
|
| @@ -38,7 +48,7 @@ public class LocaleUtils {
|
| } else if ("tl".equals(language)) {
|
| language = "fil";
|
| }
|
| - return country.isEmpty() ? language : language + "-" + country;
|
| + return language;
|
| }
|
|
|
| /**
|
|
|