Settings: Internet: I18N

chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.cc

 // 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.
 
 #include "chrome/browser/ui/webui/settings/md_settings_localized_strings_provider.h"
 
 #include <string>
 
 #include "base/command_line.h"
 #include "base/i18n/number_formatting.h"
@@ skipping 651 matching lines @@
       "easyUnlockRequireProximityLabel",
       l10n_util::GetStringFUTF16(
           IDS_SETTINGS_EASY_UNLOCK_REQUIRE_PROXIMITY_LABEL, device_name));
 
   html_source->AddString("easyUnlockLearnMoreURL",
                          chrome::kEasyUnlockLearnMoreUrl);
 }
 
 void AddInternetStrings(content::WebUIDataSource* html_source) {
   LocalizedString localized_strings[] = {
-      {"internetPageTitle", IDS_SETTINGS_INTERNET},
+      {"internetAddConnection", IDS_SETTINGS_INTERNET_ADD_CONNECTION},
+      {"internetAddVPN", IDS_SETTINGS_INTERNET_ADD_VPN},
+      {"internetAddWiFi", IDS_SETTINGS_INTERNET_ADD_WIFI},
       {"internetDetailPageTitle", IDS_SETTINGS_INTERNET_DETAIL},
       {"internetKnownNetworksPageTitle", IDS_SETTINGS_INTERNET_KNOWN_NETWORKS},
+      {"internetPageTitle", IDS_SETTINGS_INTERNET},
+      {"knownNetworksAll", IDS_SETTINGS_INTERNET_KNOWN_NETWORKS_ALL},
       {"knownNetworksButton", IDS_SETTINGS_INTERNET_KNOWN_NETWORKS_BUTTON},
       {"knownNetworksMessage", IDS_SETTINGS_INTERNET_KNOWN_NETWORKS_MESSAGE},
+      {"knownNetworksNoPreferred",
+       IDS_SETTINGS_INTERNET_KNOWN_NETWORKS_NO_PREFERRED},
       {"knownNetworksPreferred",
        IDS_SETTINGS_INTERNET_KNOWN_NETWORKS_PREFFERED},
-      {"knownNetworksNoPreferred",
-       IDS_SETTINGS_INTERNET_KNOWN_NETWORKS_NO_PREFERRED},
-      {"knownNetworksAll", IDS_SETTINGS_INTERNET_KNOWN_NETWORKS_ALL},
+      {"networkAutoConnect", IDS_SETTINGS_INTERNET_NETWORK_AUTO_CONNECT},
+      {"networkButtonActivate", IDS_SETTINGS_INTERNET_BUTTON_ACTIVATE},
+      {"networkButtonConfigure", IDS_SETTINGS_INTERNET_BUTTON_CONFIGURE},
+      {"networkButtonConnect", IDS_SETTINGS_INTERNET_BUTTON_CONNECT},
+      {"networkButtonDisconnect", IDS_SETTINGS_INTERNET_BUTTON_DISCONNECT},
+      {"networkButtonForget", IDS_SETTINGS_INTERNET_BUTTON_FORGET},
+      {"networkButtonSaveApn", IDS_SETTINGS_INTERNET_BUTTON_SAVE_APN},
+      {"networkButtonViewAccount", IDS_SETTINGS_INTERNET_BUTTON_VIEW_ACCOUNT},
+      {"networkIPAddress", IDS_SETTINGS_INTERNET_NETWORK_IP_ADDRESS},
+      {"networkIPConfigAuto",
+       IDS_SETTINGS_INTERNET_NETWORK_IP_CONFIG_AUTO},
+      {"networkPrefer", IDS_SETTINGS_INTERNET_NETWORK_PREFER},
+      {"networkProxy", IDS_SETTINGS_INTERNET_NETWORK_PROXY_PROXY},
+      {"networkProxyAddException",
+       IDS_SETTINGS_INTERNET_NETWORK_PROXY_ADD_EXCEPTION},
+      {"networkProxyAutoConfig",
+       IDS_SETTINGS_INTERNET_NETWORK_PROXY_AUTO_CONFIG},
+      {"networkProxyConnectionType",
+       IDS_SETTINGS_INTERNET_NETWORK_PROXY_CONNECTION_TYPE},
+      {"networkProxyEnforced", IDS_SETTINGS_INTERNET_NETWORK_PROXY_ENFORCED},
+      {"networkProxyExceptionList",
+       IDS_SETTINGS_INTERNET_NETWORK_PROXY_EXCEPTION_LIST},
+      {"networkProxyFtp", IDS_SETTINGS_INTERNET_NETWORK_PROXY_FTP_PROXY},
+      {"networkProxyHttp", IDS_SETTINGS_INTERNET_NETWORK_PROXY_HTTP_PROXY},
+      {"networkProxyPort", IDS_SETTINGS_INTERNET_NETWORK_PROXY_PORT},
+      {"networkProxyShttp", IDS_SETTINGS_INTERNET_NETWORK_PROXY_SHTTP_PROXY},
+      {"networkProxySocks", IDS_SETTINGS_INTERNET_NETWORK_PROXY_SOCKS_HOST},
+      {"networkProxyUseSame", IDS_SETTINGS_INTERNET_NETWORK_PROXY_USE_SAME},
+      {"networkSectionAccessPoint",
+       IDS_SETTINGS_INTERNET_NETWORK_SECTION_ACCESS_POINT},
+      {"networkSectionAdvanced",
+       IDS_SETTINGS_INTERNET_NETWORK_SECTION_ADVANCED},
+      {"networkSectionNameservers",
+       IDS_SETTINGS_INTERNET_NETWORK_SECTION_NAMESERVERS},
+      {"networkSectionNetwork", IDS_SETTINGS_INTERNET_NETWORK_SECTION_NETWORK},
+      {"networkSectionProxy", IDS_SETTINGS_INTERNET_NETWORK_SECTION_PROXY},
+      {"networkSectionWpad", IDS_SETTINGS_INTERNET_NETWORK_SECTION_WPAD},
+      {"networkShared", IDS_SETTINGS_INTERNET_NETWORK_SHARED},
+      {"networkSimCardLocked", IDS_SETTINGS_INTERNET_NETWORK_SIM_CARD_LOCKED},
+      {"networkSimCardMissing", IDS_SETTINGS_INTERNET_NETWORK_SIM_CARD_MISSING},
+      {"networkSimChange",
+       IDS_SETTINGS_INTERNET_NETWORK_SIM_BUTTON_CHANGE},
+      {"networkSimChangePin", IDS_SETTINGS_INTERNET_NETWORK_SIM_CHANGE_PIN},
+      {"networkSimChangePinTitle",
+       IDS_SETTINGS_INTERNET_NETWORK_SIM_CHANGE_PIN_TITLE},
+      {"networkSimEnter", IDS_SETTINGS_INTERNET_NETWORK_SIM_BUTTON_ENTER},
+      {"networkSimEnterNewPin",
+       IDS_SETTINGS_INTERNET_NETWORK_SIM_ENTER_NEW_PIN},
+      {"networkSimEnterOldPin",
+       IDS_SETTINGS_INTERNET_NETWORK_SIM_ENTER_OLD_PIN},
+      {"networkSimEnterPin", IDS_SETTINGS_INTERNET_NETWORK_SIM_ENTER_PIN},
+      {"networkSimEnterPinTitle",
+       IDS_SETTINGS_INTERNET_NETWORK_SIM_ENTER_PIN_TITLE},
+      {"networkSimEnterPuk", IDS_SETTINGS_INTERNET_NETWORK_SIM_ENTER_PUK},
+      {"networkSimLockEnable", IDS_SETTINGS_INTERNET_NETWORK_SIM_LOCK_ENABLE},
+      {"networkSimLockedTitle", IDS_SETTINGS_INTERNET_NETWORK_SIM_LOCKED_TITLE},
+      {"networkSimLockedWarning",
+       IDS_SETTINGS_INTERNET_NETWORK_SIM_LOCKED_WARNING},
+      {"networkSimReEnterNewPin",
+       IDS_SETTINGS_INTERNET_NETWORK_SIM_RE_ENTER_NEW_PIN},
+      {"networkSimReEnterNewPin",
+       IDS_SETTINGS_INTERNET_NETWORK_SIM_RE_ENTER_NEW_PIN},
+      {"networkSimUnlock",
+       IDS_SETTINGS_INTERNET_NETWORK_SIM_BUTTON_UNLOCK},
   };
   AddLocalizedStringsBulk(html_source, localized_strings,
                           arraysize(localized_strings));
 }
 #endif
 
 void AddLanguagesStrings(content::WebUIDataSource* html_source) {
   LocalizedString localized_strings[] = {
       {"languagesPageTitle", IDS_SETTINGS_LANGUAGES_PAGE_TITLE},
       {"languagesListTitle", IDS_SETTINGS_LANGUAGES_LANGUAGES_LIST_TITLE},
@@ skipping 668 matching lines @@
   };
   AddLocalizedStringsBulk(html_source, localized_strings,
                           arraysize(localized_strings));
 }
 
 }  // namespace
 
 #if defined(OS_CHROMEOS)
 void AddCrNetworkStrings(content::WebUIDataSource* html_source) {
   LocalizedString localized_strings[] = {
-      {"networkConnecting", IDS_SETTINGS_INTERNET_NETWORK_CONNECTING},
-      {"networkDisabled", IDS_SETTINGS_INTERNET_NETWORK_DISABLED},
-      {"networkNotConnected", IDS_SETTINGS_INTERNET_NETWORK_NOT_CONNECTED},
-      {"networkListItemConnected",
-       IDS_SETTINGS_INTERNET_NETWORK_LIST_ITEM_CONNECTED},
+      {"networkDisabled", IDS_NETWORK_LIST_DISABLED},
+      {"networkListItemConnected", IDS_NETWORK_LIST_CONNECTED},
+      {"networkListItemConnecting", IDS_NETWORK_LIST_CONNECTING},
+      {"networkListItemNotConnected", IDS_NETWORK_LIST_NOT_CONNECTED},
+      {"vpnNameTemplate", IDS_NETWORK_LIST_THIRD_PARTY_VPN_NAME_TEMPLATE},
+  };
+  AddLocalizedStringsBulk(html_source, localized_strings,
+                          arraysize(localized_strings));
+  LocalizedString onc_property_strings[] = {
+      // Thes strings are generated by prepending 'Onc' to the ONC property
+      // name. Any '.' in the property name is replaced with '-'. Properties
+      // with translatable enumerated values have the value appended after '_'.

[dschuyler, 2016/08/26 18:32:17]

I'm still hoping to get to the point were the i18n
tag names are auto-generated from the IDS names.
Will this will make that transition harder?

[stevenjb, 2016/08/26 19:30:26]

Possibly. We will have to figure something out if/when we do that, either a
translation table maintained separately (ugh) or a different conversion scheme.
As long as these are macros we are very limited in what characters we can use.

[stevenjb, 2016/08/26 20:25:18]

Actually this shouldn't be a problem. These are already auto generated using _
instead of ., we can just apply whatever convention we use when we convert these
in the corresponding JS.

+      {"OncCellular-APN-AccessPointName",
+       IDS_ONC_CELLULAR_APN_ACCESS_POINT_NAME},
+      {"OncCellular-APN-AccessPointName_none",
+       IDS_ONC_CELLULAR_APN_ACCESS_POINT_NAME_NONE},
+      {"OncCellular-APN-Password", IDS_ONC_CELLULAR_APN_PASSWORD},
+      {"OncCellular-APN-Username", IDS_ONC_CELLULAR_APN_USERNAME},
+      {"OncCellular-ActivationState", IDS_ONC_CELLULAR_ACTIVATION_STATE},
+      {"OncCellular-ActivationState_Activated",
+       IDS_ONC_CELLULAR_ACTIVATION_STATE_ACTIVATED},
+      {"OncCellular-ActivationState_Activating",
+       IDS_ONC_CELLULAR_ACTIVATION_STATE_ACTIVATING},
+      {"OncCellular-ActivationState_NotActivated",
+       IDS_ONC_CELLULAR_ACTIVATION_STATE_NOT_ACTIVATED},
+      {"OncCellular-ActivationState_PartiallyActivated",
+       IDS_ONC_CELLULAR_ACTIVATION_STATE_PARTIALLY_ACTIVATED},
+      {"OncCellular-Carrier", IDS_ONC_CELLULAR_CARRIER},
+      {"OncCellular-Family", IDS_ONC_CELLULAR_FAMILY},
+      {"OncCellular-FirmwareRevision", IDS_ONC_CELLULAR_FIRMWARE_REVISION},
+      {"OncCellular-HardwareRevision", IDS_ONC_CELLULAR_HARDWARE_REVISION},
+      {"OncCellular-HomeProvider-Code", IDS_ONC_CELLULAR_HOME_PROVIDER_CODE},
+      {"OncCellular-HomeProvider-Country",
+       IDS_ONC_CELLULAR_HOME_PROVIDER_COUNTRY},
+      {"OncCellular-HomeProvider-Name", IDS_ONC_CELLULAR_HOME_PROVIDER_NAME},
+      {"OncCellular-Manufacturer", IDS_ONC_CELLULAR_MANUFACTURER},
+      {"OncCellular-ModelID", IDS_ONC_CELLULAR_MODEL_ID},
+      {"OncCellular-NetworkTechnology", IDS_ONC_CELLULAR_NETWORK_TECHNOLOGY},
+      {"OncCellular-PRLVersion", IDS_ONC_CELLULAR_PRL_VERSION},
+      {"OncCellular-RoamingState", IDS_ONC_CELLULAR_ROAMING_STATE},
+      {"OncCellular-RoamingState_Home", IDS_ONC_CELLULAR_ROAMING_STATE_HOME},
+      {"OncCellular-RoamingState_Roaming",
+       IDS_ONC_CELLULAR_ROAMING_STATE_ROAMING},
+      {"OncCellular-ServingOperator-Code",
+       IDS_ONC_CELLULAR_SERVING_OPERATOR_CODE},
+      {"OncCellular-ServingOperator-Name",
+       IDS_ONC_CELLULAR_SERVING_OPERATOR_NAME},
+      {"OncConnected", IDS_ONC_CONNECTED},
+      {"OncConnecting", IDS_ONC_CONNECTING},
+      {"OncMacAddress", IDS_ONC_MAC_ADDRESS},
+      {"OncNotConnected", IDS_ONC_NOT_CONNECTED},
+      {"OncRestrictedConnectivity", IDS_ONC_RESTRICTED_CONNECTIVITY},
       {"OncTypeCellular", IDS_SETTINGS_NETWORK_TYPE_CELLULAR},
       {"OncTypeEthernet", IDS_SETTINGS_NETWORK_TYPE_ETHERNET},
       {"OncTypeVPN", IDS_SETTINGS_NETWORK_TYPE_VPN},
       {"OncTypeWiFi", IDS_SETTINGS_NETWORK_TYPE_WIFI},
       {"OncTypeWiMAX", IDS_SETTINGS_NETWORK_TYPE_WIMAX},
-      {"vpnNameTemplate", IDS_SETTINGS_THIRD_PARTY_VPN_NAME_TEMPLATE},
+      {"OncVPN-Host", IDS_ONC_VPN_HOST},
+      {"OncVPN-L2TP-Username", IDS_ONC_VPN_L2TP_USERNAME},
+      {"OncVPN-OpenVPN-Username", IDS_ONC_VPN_OPEN_VPN_USERNAME},
+      {"OncVPN-ThirdPartyVPN-ProviderName",
+       IDS_ONC_VPN_THIRD_PARTY_VPN_PROVIDER_NAME},
+      {"OncVPN-Type", IDS_ONC_VPN_TYPE},
+      {"OncWiFi-Frequency", IDS_ONC_WIFI_FREQUENCY},
+      {"OncWiFi-Security", IDS_ONC_WIFI_SECURITY},
+      {"OncWiFi-SignalStrength", IDS_ONC_WIFI_SIGNAL_STRENGTH},
+      {"OncWiMAX-EAP-Identity", IDS_ONC_WIMAX_EAP_IDENTITY},
+      {"Oncipv4-Gateway", IDS_ONC_IPV4_GATEWAY},
+      {"Oncipv4-IPAddress", IDS_ONC_IPV4_ADDRESS},
+      {"Oncipv4-RoutingPrefix", IDS_ONC_IPV4_ROUTING_PREFIX},
+      {"Oncipv6-IPAddress", IDS_ONC_IPV6_ADDRESS},
   };
-  AddLocalizedStringsBulk(html_source, localized_strings,
-                          arraysize(localized_strings));
+  AddLocalizedStringsBulk(html_source, onc_property_strings,
+                          arraysize(onc_property_strings));
 }
 #endif  // OS_CHROMEOS
 
 void AddLocalizedStrings(content::WebUIDataSource* html_source,
                          Profile* profile) {
   AddCommonStrings(html_source, profile);
 
   AddA11yStrings(html_source);
   AddAboutStrings(html_source);
 #if defined(OS_CHROMEOS)
@@ skipping 40 matching lines @@
 #endif
   AddUsersStrings(html_source);
   AddWebContentStrings(html_source);
 
   policy_indicator::AddLocalizedStrings(html_source);
 
   html_source->SetJsonPath(kLocalizedStringsFile);
 }
 
 }  // namespace settings