mudhorn/zxing
1
0
Fork 0
mirror of https://github.com/zxing/zxing.git synced 2025-03-05 20:48:51 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Remove obsolete html-zh-rHK symlink

Browse source
This commit is contained in:
Sean Owen 2016-11-11 20:23:20 +00:00
parent 28f8bd37f3
commit 08a9d74062
No known key found for this signature in database
GPG key ID: F6CE9695C9318406
9 changed files with 4 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
android/assets/html-zh-rHK
View file

@ -1 +0,0 @@
html-zh-rTW/

0
android/assets/html-zh-rTW/about1d.html → android/assets/html-zh/about1d.html
View file

0
android/assets/html-zh-rTW/about2d.html → android/assets/html-zh/about2d.html
View file

0
android/assets/html-zh-rTW/index.html → android/assets/html-zh/index.html
View file

0
android/assets/html-zh-rTW/license.html → android/assets/html-zh/license.html
View file

0
android/assets/html-zh-rTW/scanning.html → android/assets/html-zh/scanning.html
View file

0
android/assets/html-zh-rTW/sharing.html → android/assets/html-zh/sharing.html
View file

0
android/assets/html-zh-rTW/whatsnew.html → android/assets/html-zh/whatsnew.html
View file

9
android/src/com/google/zxing/client/android/LocaleManager.java
View file

@ -105,7 +105,7 @@ public final class LocaleManager {
private static final Map<String,String> GOOGLE_BOOK_SEARCH_COUNTRY_TLD = GOOGLE_COUNTRY_TLD; private static final Map<String,String> GOOGLE_BOOK_SEARCH_COUNTRY_TLD = GOOGLE_COUNTRY_TLD;
private static final Collection<String> TRANSLATED_HELP_ASSET_LANGUAGES = private static final Collection<String> TRANSLATED_HELP_ASSET_LANGUAGES =
Arrays.asList("de", "en", "es", "fr", "it", "ja", "ko", "nl", "pt", "ru", "uk", "zh-rCN", "zh-rTW", "zh-rHK"); Arrays.asList("de", "en", "es", "fr", "it", "ja", "ko", "nl", "pt", "ru", "uk", "zh-rCN", "zh");
private LocaleManager() {} private LocaleManager() {}
@ -158,12 +158,11 @@ public final class LocaleManager {
if (locale == null) { if (locale == null) {
return DEFAULT_LANGUAGE; return DEFAULT_LANGUAGE;
} }
String language = locale.getLanguage();
// Special case Chinese // Special case Chinese
if (Locale.SIMPLIFIED_CHINESE.getLanguage().equals(language)) { if (Locale.SIMPLIFIED_CHINESE.equals(locale)) {
return language + "-r" + getSystemCountry(); return "zh-rCN";
} }
return language; return locale.getLanguage();
} }
static String getTranslatedAssetLanguage() { static String getTranslatedAssetLanguage() {