Translate activation/romaing state, restricted pool

chrome/browser/ui/webui/options/chromeos/internet_options_handler_strings.cc

Index: chrome/browser/ui/webui/options/chromeos/internet_options_handler_strings.cc
diff --git a/chrome/browser/ui/webui/options/chromeos/internet_options_handler_strings.cc b/chrome/browser/ui/webui/options/chromeos/internet_options_handler_strings.cc
index f87e73458fa6fc4dee100752ee7888a72e5f5900..5cb5638d1b6733f40e92f7359233789650e73c61 100644
--- a/chrome/browser/ui/webui/options/chromeos/internet_options_handler_strings.cc
+++ b/chrome/browser/ui/webui/options/chromeos/internet_options_handler_strings.cc
@@ -8,7 +8,6 @@
 #include "base/values.h"
 #include "chrome/grit/generated_resources.h"
 #include "grit/ash_strings.h"
-#include "third_party/cros_system_api/dbus/service_constants.h"
 #include "ui/base/l10n/l10n_util.h"
 
 namespace chromeos {
@@ -50,11 +49,23 @@ StringResource kStringResources[] = {
 
     // ONC network states. Format is 'Onc' + key + value.
     // Note: '.' must be replaced with '-', e.g. VPN.Type -> OncVPN-Type
+    {"OncCellular-ActivationStateActivated",
+     IDS_CHROMEOS_NETWORK_ACTIVATION_STATE_ACTIVATED},
+    {"OncCellular-ActivationStateActivating",
+     IDS_CHROMEOS_NETWORK_ACTIVATION_STATE_ACTIVATING},
+    {"OncCellular-ActivationStateNotActivated",
+     IDS_CHROMEOS_NETWORK_ACTIVATION_STATE_NOT_ACTIVATED},
+    {"OncCellular-ActivationStatePartiallyActivated",
+     IDS_CHROMEOS_NETWORK_ACTIVATION_STATE_PARTIALLY_ACTIVATED},
     {"OncConnectionStateConnected", IDS_CHROMEOS_NETWORK_STATE_CONNECTED},
     {"OncConnectionStateConnecting", IDS_CHROMEOS_NETWORK_STATE_CONNECTING},
     {"OncConnectionStateNotConnected",
      IDS_CHROMEOS_NETWORK_STATE_NOT_CONNECTED},
-    {"OncConnectionStateUnknown", IDS_CHROMEOS_NETWORK_STATE_UNKNOWN},
+    {"OncRestrictedFalse", IDS_CONFIRM_MESSAGEBOX_NO_BUTTON_LABEL},

[pneubeck (no reviews), 2014/09/05 16:05:44]

This is a bit irritating.
Why not making the decision in Javascript, to show a 'Yes'/'No' (button) label?

If it were a translation, then the right sight should somehow be related to
'RestrictedPool', e.g.
  for yes: "Internet connectivity is restricted."
  for no: "Internet has full connectivity."

[stevenjb, 2014/09/05 16:54:21]

Let's leave this as-is for now. If we re design it and still want to say 'YES'
or 'NO' for restricted pool, we should add context specific strings here. I will
add a TODO.

+    {"OncRestrictedTrue", IDS_CONFIRM_MESSAGEBOX_YES_BUTTON_LABEL},
+    {"OncCellular-RoamingStateHome", IDS_CHROMEOS_NETWORK_ROAMING_STATE_HOME},
+    {"OncCellular-RoamingStateRoaming",
+     IDS_CHROMEOS_NETWORK_ROAMING_STATE_ROAMING},
     {"OncTypeCellular", IDS_NETWORK_TYPE_CELLULAR},
     {"OncTypeEthernet", IDS_NETWORK_TYPE_ETHERNET},
     {"OncTypeWiFi", IDS_NETWORK_TYPE_WIFI},
@@ -75,6 +86,7 @@ StringResource kStringResources[] = {
     {"securityTabLabel", IDS_OPTIONS_SETTINGS_INTERNET_TAB_SECURITY},
     {"proxyTabLabel", IDS_OPTIONS_SETTINGS_INTERNET_TAB_PROXY},
     {"connectionState", IDS_OPTIONS_SETTINGS_INTERNET_CONNECTION_STATE},
+    {"restrictedPool", IDS_OPTIONS_SETTINGS_INTERNET_CELLULAR_RESTRICTED_POOL},

[pneubeck (no reviews), 2014/09/05 16:05:44]

The '_CELLULAR' part on right side should be removed from the constant name.

[stevenjb, 2014/09/05 16:54:21]

Added a TODO here.

     {"inetAddress", IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_ADDRESS},
     {"inetNetmask", IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_SUBNETMASK},
     {"inetGateway", IDS_OPTIONS_SETTINGS_INTERNET_OPTIONS_GATEWAY},
@@ -135,7 +147,6 @@ StringResource kStringResources[] = {
     {"activationState",
      IDS_OPTIONS_SETTINGS_INTERNET_CELLULAR_ACTIVATION_STATE},
     {"roamingState", IDS_OPTIONS_SETTINGS_INTERNET_CELLULAR_ROAMING_STATE},
-    {"restrictedPool", IDS_OPTIONS_SETTINGS_INTERNET_CELLULAR_RESTRICTED_POOL},
     {"errorState", IDS_OPTIONS_SETTINGS_INTERNET_CELLULAR_ERROR_STATE},
     {"cellularManufacturer",
      IDS_OPTIONS_SETTINGS_INTERNET_CELLULAR_MANUFACTURER},
@@ -176,53 +187,5 @@ void RegisterLocalizedStrings(base::DictionaryValue* localized_strings) {
   }
 }
 
-std::string ActivationStateString(const std::string& activation_state) {
-  int id;
-  if (activation_state == shill::kActivationStateActivated)
-    id = IDS_CHROMEOS_NETWORK_ACTIVATION_STATE_ACTIVATED;
-  else if (activation_state == shill::kActivationStateActivating)
-    id = IDS_CHROMEOS_NETWORK_ACTIVATION_STATE_ACTIVATING;
-  else if (activation_state == shill::kActivationStateNotActivated)
-    id = IDS_CHROMEOS_NETWORK_ACTIVATION_STATE_NOT_ACTIVATED;
-  else if (activation_state == shill::kActivationStatePartiallyActivated)
-    id = IDS_CHROMEOS_NETWORK_ACTIVATION_STATE_PARTIALLY_ACTIVATED;
-  else
-    id = IDS_CHROMEOS_NETWORK_ACTIVATION_STATE_UNKNOWN;
-  return l10n_util::GetStringUTF8(id);
-}
-
-std::string RoamingStateString(const std::string& roaming_state) {
-  int id;
-  if (roaming_state == shill::kRoamingStateHome)
-    id = IDS_CHROMEOS_NETWORK_ROAMING_STATE_HOME;
-  else if (roaming_state == shill::kRoamingStateRoaming)
-    id = IDS_CHROMEOS_NETWORK_ROAMING_STATE_ROAMING;
-  else
-    id = IDS_CHROMEOS_NETWORK_ROAMING_STATE_UNKNOWN;
-  return l10n_util::GetStringUTF8(id);
-}
-
-std::string RestrictedStateString(const std::string& connection_state) {
-  int id;
-  if (connection_state == shill::kStatePortal)
-    id = IDS_CONFIRM_MESSAGEBOX_YES_BUTTON_LABEL;
-  else
-    id = IDS_CONFIRM_MESSAGEBOX_NO_BUTTON_LABEL;
-  return l10n_util::GetStringUTF8(id);
-}
-
-std::string NetworkDeviceTypeString(const std::string& network_type) {
-  int id;
-  if (network_type == shill::kTypeEthernet)
-    id = IDS_STATUSBAR_NETWORK_DEVICE_ETHERNET;
-  else if (network_type == shill::kTypeWifi)
-    id = IDS_STATUSBAR_NETWORK_DEVICE_WIFI;
-  else if (network_type == shill::kTypeCellular)
-    id = IDS_STATUSBAR_NETWORK_DEVICE_CELLULAR;
-  else
-    id = IDS_STATUSBAR_NETWORK_DEVICE_UNKNOWN;
-  return l10n_util::GetStringUTF8(id);
-}
-
 }  // namespace internet_options_strings
 }  // namespace chromeos