Fix packing localized strings for //remoting.

remoting/remoting_locales.gni

 # Copyright 2015 The Chromium Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 webapp_locale_dir = "$root_gen_dir/remoting/webapp/_locales"
 
 # See also remoting_locales_with_underscores below.
 remoting_locales = [
   "am",
   "ar",
@@ skipping 74 matching lines @@
   "en_GB",
   "es_419",
 
   "fake_bidi",
   "pt_BR",
   "pt_PT",
   "zh_CN",
   "zh_TW",
 ]
 
-if (is_chromeos) {
+if (is_chromeos || is_ios) {

[Wez, 2017/04/18 18:05:26]

nit: Let's make sure to retain comments that explain why we need these ugly
special-cases.

[sdefresne, 2017/04/19 08:59:03]

Done.

BTW, do you know why remoting uses "en-GB", "en" and "en-US" (only for ChromeOS
and Chrome on iOS) while Chrome itself only "en-GB" and "en-US" (for all
platforms).

[Wez, 2017/04/20 03:41:21]

No, I'm afraid you will need to ask jamiewalch@ or sergeyu@ about that (I am
OWNERS alumnus so wasn't expecting tough questions ;)

   remoting_locales += [ "en-US" ]
   remoting_locales_with_underscores += [ "en_US" ]
 }
 
+if (is_ios) {

[Wez, 2017/04/18 18:05:26]

nit: This might be more readable as an if...else with just += clauses for the
two cases.

[sdefresne, 2017/04/19 08:59:03]

Done.

+  remoting_locales -= [
+    "pt-BR",
+    "es-419",
+  ]
+  remoting_locales += [
+    "pt",
+    "es-MX",
+  ]
+
+  remoting_locales_with_underscores -= [
+    "pt_BR",
+    "es_419",
+  ]
+  remoting_locales_with_underscores += [
+    "pt",
+    "es_MX",
+  ]
+}
+
 messages_locales = remoting_locales_with_underscores
-if (!is_chromeos) {
-  # The messages output includes a separate one for en-US that the pak ones
-  # don't have. We don't need to do this on ChromeOS since en_US is in the
-  # locales list be default there.
-  messages_locales += [ "en_US" ]
-}
 
 remoting_android_locales = [
   "am",
   "ar",
   "bg",
   "ca",
   "cs",
   "da",
   "de",
   "el",
@@ skipping 32 matching lines @@
   "vi",
   "zh-rCN",
   "zh-rTW",
 ]
 
 # The list of .json files generated by remoting_strings.grd.
 remoting_webapp_locale_files =
     process_file_template(
         messages_locales,
         [ "remoting/webapp/_locales/{{source_name_part}}/messages.json" ])