Mapped es-419 to es-MX for iOS.
Used a script that:
1/ searches for all files with a "grd" extension that contain "<!-- iOS uses pt for pt-BR -->".
2/ in those files, replaces all occurrences of '.*<output filename="(.*)_es-419.pak" type="(.*)" lang="es-419.*'
with:
<if expr="is_ios">
<!-- iOS uses es-MX for es-419 -->
<output filename="%s_es-MX.pak" type="%s" lang="es-419" />
</if>
<if expr="not is_ios">
<output filename="%s_es-419.pak" type="%s" lang="es-419" />
</if>
BUG=None
Review URL: https://chromiumcodereview.appspot.com/23704006
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@221038 0039d316-1c4b-4281-b951-d872f2087c98
diff --git a/build/common.gypi b/build/common.gypi
index 902be33..ef7100f 100644
--- a/build/common.gypi
+++ b/build/common.gypi
@@ -1189,10 +1189,10 @@
'use_system_libxml%': 1,
'use_system_sqlite%': 1,
'locales==': [
- 'ar', 'ca', 'cs', 'da', 'de', 'el', 'en-GB', 'en-US', 'es', 'fi',
- 'fr', 'he', 'hr', 'hu', 'id', 'it', 'ja', 'ko', 'ms', 'nb', 'nl',
- 'pl', 'pt', 'pt-PT', 'ro', 'ru', 'sk', 'sv', 'th', 'tr', 'uk', 'vi',
- 'zh-CN', 'zh-TW',
+ 'ar', 'ca', 'cs', 'da', 'de', 'el', 'en-GB', 'en-US', 'es', 'es-MX',
+ 'fi', 'fr', 'he', 'hr', 'hu', 'id', 'it', 'ja', 'ko', 'ms', 'nb',
+ 'nl', 'pl', 'pt', 'pt-PT', 'ro', 'ru', 'sk', 'sv', 'th', 'tr', 'uk',
+ 'vi', 'zh-CN', 'zh-TW',
],
# The Mac SDK is set for iOS builds and passed through to Mac
diff --git a/chrome/app/chromium_strings.grd b/chrome/app/chromium_strings.grd
index 121606f..e07ccaa 100644
--- a/chrome/app/chromium_strings.grd
+++ b/chrome/app/chromium_strings.grd
@@ -36,7 +36,13 @@
<output filename="chromium_strings_eo.pak" type="data_package" lang="eo" />
</if>
<output filename="chromium_strings_es.pak" type="data_package" lang="es" />
- <output filename="chromium_strings_es-419.pak" type="data_package" lang="es-419" />
+ <if expr="is_ios">
+ <!-- iOS uses es-MX for es-419 -->
+ <output filename="chromium_strings_es-MX.pak" type="data_package" lang="es-419" />
+ </if>
+ <if expr="not is_ios">
+ <output filename="chromium_strings_es-419.pak" type="data_package" lang="es-419" />
+ </if>
<output filename="chromium_strings_et.pak" type="data_package" lang="et" />
<if expr="pp_ifdef('use_third_party_translations')">
<output filename="chromium_strings_eu.pak" type="data_package" lang="eu" />
diff --git a/chrome/app/generated_resources.grd b/chrome/app/generated_resources.grd
index 6a3af14f..d3db0cec 100644
--- a/chrome/app/generated_resources.grd
+++ b/chrome/app/generated_resources.grd
@@ -40,7 +40,13 @@
<output filename="generated_resources_eo.pak" type="data_package" lang="eo" />
</if>
<output filename="generated_resources_es.pak" type="data_package" lang="es" />
- <output filename="generated_resources_es-419.pak" type="data_package" lang="es-419" />
+ <if expr="is_ios">
+ <!-- iOS uses es-MX for es-419 -->
+ <output filename="generated_resources_es-MX.pak" type="data_package" lang="es-419" />
+ </if>
+ <if expr="not is_ios">
+ <output filename="generated_resources_es-419.pak" type="data_package" lang="es-419" />
+ </if>
<output filename="generated_resources_et.pak" type="data_package" lang="et" />
<if expr="pp_ifdef('use_third_party_translations')">
<output filename="generated_resources_eu.pak" type="data_package" lang="eu" />
diff --git a/chrome/app/google_chrome_strings.grd b/chrome/app/google_chrome_strings.grd
index ec0a145d..3898018 100644
--- a/chrome/app/google_chrome_strings.grd
+++ b/chrome/app/google_chrome_strings.grd
@@ -21,7 +21,13 @@
<output filename="google_chrome_strings_en-GB.pak" type="data_package" lang="en-GB" />
<output filename="google_chrome_strings_en-US.pak" type="data_package" lang="en" />
<output filename="google_chrome_strings_es.pak" type="data_package" lang="es" />
- <output filename="google_chrome_strings_es-419.pak" type="data_package" lang="es-419" />
+ <if expr="is_ios">
+ <!-- iOS uses es-MX for es-419 -->
+ <output filename="google_chrome_strings_es-MX.pak" type="data_package" lang="es-419" />
+ </if>
+ <if expr="not is_ios">
+ <output filename="google_chrome_strings_es-419.pak" type="data_package" lang="es-419" />
+ </if>
<output filename="google_chrome_strings_et.pak" type="data_package" lang="et" />
<output filename="google_chrome_strings_fa.pak" type="data_package" lang="fa" />
<output filename="google_chrome_strings_fi.pak" type="data_package" lang="fi" />
diff --git a/chrome/app/resources/locale_settings.grd b/chrome/app/resources/locale_settings.grd
index 8033ab16..98f7e0c 100644
--- a/chrome/app/resources/locale_settings.grd
+++ b/chrome/app/resources/locale_settings.grd
@@ -31,7 +31,13 @@
<output filename="locale_settings_eo.pak" type="data_package" lang="eo" />
</if>
<output filename="locale_settings_es.pak" type="data_package" lang="es" />
- <output filename="locale_settings_es-419.pak" type="data_package" lang="es-419" />
+ <if expr="is_ios">
+ <!-- iOS uses es-MX for es-419 -->
+ <output filename="locale_settings_es-MX.pak" type="data_package" lang="es-419" />
+ </if>
+ <if expr="not is_ios">
+ <output filename="locale_settings_es-419.pak" type="data_package" lang="es-419" />
+ </if>
<output filename="locale_settings_et.pak" type="data_package" lang="et" />
<if expr="pp_ifdef('use_third_party_translations')">
<output filename="locale_settings_eu.pak" type="data_package" lang="eu" />
diff --git a/chrome/app/resources/locale_settings_mac.grd b/chrome/app/resources/locale_settings_mac.grd
index e1635cd..c48c590b 100644
--- a/chrome/app/resources/locale_settings_mac.grd
+++ b/chrome/app/resources/locale_settings_mac.grd
@@ -16,7 +16,13 @@
<output filename="platform_locale_settings_en-GB.pak" type="data_package" lang="en-GB" />
<output filename="platform_locale_settings_en-US.pak" type="data_package" lang="en" />
<output filename="platform_locale_settings_es.pak" type="data_package" lang="es" />
- <output filename="platform_locale_settings_es-419.pak" type="data_package" lang="es-419" />
+ <if expr="is_ios">
+ <!-- iOS uses es-MX for es-419 -->
+ <output filename="platform_locale_settings_es-MX.pak" type="data_package" lang="es-419" />
+ </if>
+ <if expr="not is_ios">
+ <output filename="platform_locale_settings_es-419.pak" type="data_package" lang="es-419" />
+ </if>
<output filename="platform_locale_settings_et.pak" type="data_package" lang="et" />
<output filename="platform_locale_settings_fa.pak" type="data_package" lang="fa" />
<output filename="platform_locale_settings_fi.pak" type="data_package" lang="fi" />
diff --git a/components/component_strings.grd b/components/component_strings.grd
index b50c4da0..85b5d61 100644
--- a/components/component_strings.grd
+++ b/components/component_strings.grd
@@ -33,7 +33,13 @@
<output filename="component_strings_eo.pak" type="data_package" lang="eo" />
</if>
<output filename="component_strings_es.pak" type="data_package" lang="es" />
- <output filename="component_strings_es-419.pak" type="data_package" lang="es-419" />
+ <if expr="is_ios">
+ <!-- iOS uses es-MX for es-419 -->
+ <output filename="component_strings_es-MX.pak" type="data_package" lang="es-419" />
+ </if>
+ <if expr="not is_ios">
+ <output filename="component_strings_es-419.pak" type="data_package" lang="es-419" />
+ </if>
<output filename="component_strings_et.pak" type="data_package" lang="et" />
<if expr="pp_ifdef('use_third_party_translations')">
<output filename="component_strings_eu.pak" type="data_package" lang="eu" />
diff --git a/ui/base/strings/app_locale_settings.grd b/ui/base/strings/app_locale_settings.grd
index eb64af3..d285e927 100644
--- a/ui/base/strings/app_locale_settings.grd
+++ b/ui/base/strings/app_locale_settings.grd
@@ -31,7 +31,13 @@
<output filename="app_locale_settings_eo.pak" type="data_package" lang="eo" />
</if>
<output filename="app_locale_settings_es.pak" type="data_package" lang="es" />
- <output filename="app_locale_settings_es-419.pak" type="data_package" lang="es-419" />
+ <if expr="is_ios">
+ <!-- iOS uses es-MX for es-419 -->
+ <output filename="app_locale_settings_es-MX.pak" type="data_package" lang="es-419" />
+ </if>
+ <if expr="not is_ios">
+ <output filename="app_locale_settings_es-419.pak" type="data_package" lang="es-419" />
+ </if>
<output filename="app_locale_settings_et.pak" type="data_package" lang="et" />
<if expr="pp_ifdef('use_third_party_translations')">
<output filename="app_locale_settings_eu.pak" type="data_package" lang="eu" />
diff --git a/ui/base/strings/ui_strings.grd b/ui/base/strings/ui_strings.grd
index e412ed6..8ce982d 100644
--- a/ui/base/strings/ui_strings.grd
+++ b/ui/base/strings/ui_strings.grd
@@ -42,7 +42,13 @@
<output filename="ui_strings_eo.pak" type="data_package" lang="eo" />
</if>
<output filename="ui_strings_es.pak" type="data_package" lang="es" />
- <output filename="ui_strings_es-419.pak" type="data_package" lang="es-419" />
+ <if expr="is_ios">
+ <!-- iOS uses es-MX for es-419 -->
+ <output filename="ui_strings_es-MX.pak" type="data_package" lang="es-419" />
+ </if>
+ <if expr="not is_ios">
+ <output filename="ui_strings_es-419.pak" type="data_package" lang="es-419" />
+ </if>
<output filename="ui_strings_et.pak" type="data_package" lang="et" />
<if expr="pp_ifdef('use_third_party_translations')">
<output filename="ui_strings_eu.pak" type="data_package" lang="eu" />
