diff options
| author | sdefresne <sdefresne@chromium.org> | 2015-09-17 12:09:37 -0700 |
|---|---|---|
| committer | Commit bot <commit-bot@chromium.org> | 2015-09-17 19:11:34 +0000 |
| commit | f81c7156b931192595f6f3333acde66fdfbaa1b0 (patch) | |
| tree | 45a8096e57065c281015dbb9a26a182b3ee9fc8d /chrome/tools | |
| parent | 79869a857063f10d1a86b7ce9bf32c73aeaf79be (diff) | |
| download | chromium_src-f81c7156b931192595f6f3333acde66fdfbaa1b0.zip chromium_src-f81c7156b931192595f6f3333acde66fdfbaa1b0.tar.gz chromium_src-f81c7156b931192595f6f3333acde66fdfbaa1b0.tar.bz2 | |
Fix translation of IDS_IOS_ACCEPT_LANGUAGES & IDS_IOS_DEFAULT_ENCODING.
Create a new .grd file for locale settings on iOS and move the two
strings there. The file is marked as untranslatable and the strings
to use their name as id (to allow creating the translated version
manually).
Add "manual" translation for those two strings for all the locales
supported by Chrome on iOS by re-using the translation from the
files chrome/app/resources/locale_settings_${locale}.xtb.
Update the repacking scripts chrome/tools/build/repack_locales.py and
ios/chrome/tools/build/ios_repack_locales.py (and fix a bug in the
chrome/tools/build/repack_locales.py on iOS fixed downstream).
BUG=531718
Review URL: https://codereview.chromium.org/1348173005
Cr-Commit-Position: refs/heads/master@{#349463}
Diffstat (limited to 'chrome/tools')
| -rwxr-xr-x | chrome/tools/build/repack_locales.py | 14 |
1 files changed, 12 insertions, 2 deletions
diff --git a/chrome/tools/build/repack_locales.py b/chrome/tools/build/repack_locales.py index 3ed2c84..d6209a4 100755 --- a/chrome/tools/build/repack_locales.py +++ b/chrome/tools/build/repack_locales.py @@ -122,9 +122,19 @@ def calc_inputs(locale): 'app_locale_settings_%s.pak' % locale)) else: - #e.g. '<(SHARED_INTERMEDIATE_DIR)/ios/chrome/ios_strings_resources_da.pak' + #e.g. '<(SHARED_INTERMEDIATE_DIR)/ios/chrome/ios_locale_settings_da.pak' inputs.append(os.path.join(SHARE_INT_DIR, 'ios', 'chrome', - 'ios_strings_resources_%s.pak' % locale)) + 'ios_locale_settings_%s.pak' % locale)) + + #e.g. '<(SHARED_INTERMEDIATE_DIR)/ios/chrome/ios_strings_da.pak' + inputs.append(os.path.join(SHARE_INT_DIR, 'ios', 'chrome', + 'ios_strings_%s.pak' % locale)) + + #e.g. '<(SHARED_INTERMEDIATE_DIR)/ios/chrome/ios_chromium_strings_da.pak' + # or '<(SHARED_INTERMEDIATE_DIR)/ios/chrome/ + # ios_google_chrome_strings_da.pak' + inputs.append(os.path.join(SHARE_INT_DIR, 'ios', 'chrome', + 'ios_%s_strings_%s.pak' % (BRANDING, locale))) if ENABLE_AUTOFILL_DIALOG: #e.g. '<(SHARED_INTERMEDIATE_DIR)/third_party/libaddressinput/ |