diff options
| author | srowen <srowen@59b500cc-1b3d-0410-9834-0bbf25fbcc57> | 2011-09-17 20:23:36 +0400 |
|---|---|---|
| committer | srowen <srowen@59b500cc-1b3d-0410-9834-0bbf25fbcc57> | 2011-09-17 20:23:36 +0400 |
| commit | a27c24cd0944eef2e7719bd85f66d217ec93b84f (patch) | |
| tree | b5fb44a988e2a2f2919862954cc925c128937138 | |
| parent | 409671853fabb2689eb20b5b4249ec49b2bbda04 (diff) | |
| download | zxing-android-embedded-a27c24cd0944eef2e7719bd85f66d217ec93b84f.tar.xz | |
Japanese language strings better as "values-ja", and other small translator tweaks
git-svn-id: http://zxing.googlecode.com/svn/trunk/android@1914 59b500cc-1b3d-0410-9834-0bbf25fbcc57
| -rw-r--r-- | res/values-ja/strings.xml (renamed from res/values-ja-rJP/strings.xml) | 0 | ||||
| -rw-r--r-- | src/com/google/zxing/client/android/LocaleManager.java | 16 |
2 files changed, 9 insertions, 7 deletions
diff --git a/res/values-ja-rJP/strings.xml b/res/values-ja/strings.xml index 528b73c0..528b73c0 100644 --- a/res/values-ja-rJP/strings.xml +++ b/res/values-ja/strings.xml diff --git a/src/com/google/zxing/client/android/LocaleManager.java b/src/com/google/zxing/client/android/LocaleManager.java index b829ea10..c7edbef8 100644 --- a/src/com/google/zxing/client/android/LocaleManager.java +++ b/src/com/google/zxing/client/android/LocaleManager.java @@ -16,8 +16,8 @@ package com.google.zxing.client.android; +import java.util.Arrays; import java.util.Collection; -import java.util.HashSet; import java.util.Locale; import java.util.Map; import java.util.HashMap; @@ -38,7 +38,12 @@ public final class LocaleManager { static { Locale locale = Locale.getDefault(); COUNTRY = locale == null ? DEFAULT_COUNTRY : locale.getCountry(); - LANGUAGE = locale == null ? DEFAULT_LANGUAGE : locale.getLanguage(); + String language = locale == null ? DEFAULT_LANGUAGE : locale.getLanguage(); + // Special case Chinese + if (Locale.SIMPLIFIED_CHINESE.getLanguage().equals(language)) { + language += "-r" + COUNTRY; + } + LANGUAGE = language; } /** @@ -104,11 +109,8 @@ public final class LocaleManager { */ private static final Map<String,String> GOOGLE_BOOK_SEARCH_COUNTRY_TLD = GOOGLE_COUNTRY_TLD; - private static final Collection<String> TRANSLATED_HELP_ASSET_LANGUAGES; - static { - TRANSLATED_HELP_ASSET_LANGUAGES = new HashSet<String>(); - TRANSLATED_HELP_ASSET_LANGUAGES.add("en"); - } + private static final Collection<String> TRANSLATED_HELP_ASSET_LANGUAGES = + Arrays.asList("en"); private LocaleManager() {} |