| Index: ui/android/java/src/org/chromium/ui/base/LocalizationUtils.java
|
| diff --git a/ui/android/java/src/org/chromium/ui/base/LocalizationUtils.java b/ui/android/java/src/org/chromium/ui/base/LocalizationUtils.java
|
| index d5f66383d9d87e747d24be89789c550b1c4e1a15..25d41c3777a0cbdac820a09c418038aceeb9d27d 100644
|
| --- a/ui/android/java/src/org/chromium/ui/base/LocalizationUtils.java
|
| +++ b/ui/android/java/src/org/chromium/ui/base/LocalizationUtils.java
|
| @@ -11,6 +11,7 @@ import org.chromium.base.ApiCompatibilityUtils;
|
| import org.chromium.base.ApplicationStatus;
|
| import org.chromium.base.CalledByNative;
|
| import org.chromium.base.JNINamespace;
|
| +import org.chromium.base.LocaleUtils;
|
|
|
| import java.util.Locale;
|
|
|
| @@ -35,22 +36,7 @@ public class LocalizationUtils {
|
| */
|
| @CalledByNative
|
| public static String getDefaultLocale() {
|
| - Locale locale = Locale.getDefault();
|
| - String language = locale.getLanguage();
|
| - String country = locale.getCountry();
|
| -
|
| - // 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.
|
| - // See http://developer.android.com/reference/java/util/Locale.html
|
| - if ("iw".equals(language)) {
|
| - language = "he";
|
| - } else if ("in".equals(language)) {
|
| - language = "id";
|
| - } else if ("tl".equals(language)) {
|
| - language = "fil";
|
| - }
|
| - return country.isEmpty() ? language : language + "-" + country;
|
| + return LocaleUtils.getDefaultLocale();
|
| }
|
|
|
| @CalledByNative
|
|
|