diff options
author | dcaiafa <dcaiafa@google.com> | 2015-05-04 19:52:26 -0700 |
---|---|---|
committer | Commit bot <commit-bot@chromium.org> | 2015-05-05 02:53:55 +0000 |
commit | 32587b7745a96943cfbb49041eb37ea5b5724783 (patch) | |
tree | 58e624fcbf56740347d8d7d9616acd4d4f4253ee | |
parent | f0ebecee83117f2bf62b4124491910c4654491d0 (diff) | |
download | chromium_src-32587b7745a96943cfbb49041eb37ea5b5724783.zip chromium_src-32587b7745a96943cfbb49041eb37ea5b5724783.tar.gz chromium_src-32587b7745a96943cfbb49041eb37ea5b5724783.tar.bz2 |
[Chromoting] Update list of webapp locales to match Chrome's locales.
With this change the GN and GYP webapp builds will once again produce
identical results.
The remoting_localize.py change is necessary to avoid having Fake-bidi
conflict with Hebrew.
BUG=
Review URL: https://codereview.chromium.org/1126683003
Cr-Commit-Position: refs/heads/master@{#328259}
-rw-r--r-- | remoting/remoting_locales.gypi | 10 | ||||
-rwxr-xr-x | remoting/tools/build/remoting_localize.py | 2 |
2 files changed, 6 insertions, 6 deletions
diff --git a/remoting/remoting_locales.gypi b/remoting/remoting_locales.gypi index a007dd5..cedb5be 100644 --- a/remoting/remoting_locales.gypi +++ b/remoting/remoting_locales.gypi @@ -10,11 +10,11 @@ 'remoting_locales': [ # Note: list duplicated in GN build. See //remoting/remoting_locales.gni - 'ar', 'bg', 'ca', 'cs', 'da', 'de', 'el', 'en', 'en-GB', 'es', - 'es-419', 'et', 'fi', 'fil', 'fr', 'he', 'hi', 'hr', 'hu', 'id', - 'it', 'ja', 'ko', 'lt', 'lv', 'nb', 'nl', 'pl', 'pt-BR', 'pt-PT', - 'ro', 'ru', 'sk', 'sl', 'sr', 'sv', 'th', 'tr', 'uk', 'vi', - 'zh-CN', 'zh-TW', + 'am', 'ar', 'bg', 'bn', 'ca', 'cs', 'da', 'de', 'el', 'en', 'en-GB', 'es', + 'es-419', 'et', 'fa', 'fake-bidi', 'fi', 'fil', 'fr', 'gu', 'he', 'hi', + 'hr', 'hu', 'id', 'it', 'ja', 'kn', 'ko', 'lt', 'lv', 'ml', 'mr', 'ms', + 'nb', 'nl', 'pl', 'pt-BR', 'pt-PT', 'ro', 'ru', 'sk', 'sl', 'sr', 'sv', + 'sw', 'ta', 'te', 'th', 'tr', 'uk', 'vi', 'zh-CN', 'zh-TW', ], 'remoting_webapp_locale_files': [ # Build the list of .json files generated from remoting_strings.grd. diff --git a/remoting/tools/build/remoting_localize.py b/remoting/tools/build/remoting_localize.py index 4b6c901..db4d58c 100755 --- a/remoting/tools/build/remoting_localize.py +++ b/remoting/tools/build/remoting_localize.py @@ -418,7 +418,7 @@ _LANGUAGE_MAP = { 'neutral' : [ 1200, 'LANG_NEUTRAL', 'SUBLANG_NEUTRAL' ], # LANG_USER_DEFAULT LCID, unicode(1200) code page. 'userdefault' : [ 1200, 'LANG_NEUTRAL', 'SUBLANG_DEFAULT' ], - 'fake-bidi' : [ 1255, 'LANG_HEBREW', 'SUBLANG_DEFAULT' ], + 'fake-bidi' : [ 1255, 'LANG_HEBREW', 'SUBLANG_NEUTRAL' ], 'af' : [ 1252, 'LANG_AFRIKAANS', 'SUBLANG_DEFAULT' ], 'am' : [ 1200, 'LANG_AMHARIC', 'SUBLANG_DEFAULT' ], 'ar' : [ 1256, 'LANG_ARABIC', 'SUBLANG_DEFAULT' ], |