Translate activation/romaing state, restricted pool

chrome/browser/resources/options/chromeos/internet_detail.js

 // Copyright (c) 2012 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.
 
 // require: onc_data.js
 
 // NOTE(stevenjb): This code is in the process of being converted to be
 // compatible with the networkingPrivate extension API:
 // * The network property dictionaries are being converted to use ONC values.
 // * chrome.send calls will be replaced with an API object that simulates the
@@ skipping 865 matching lines @@
     var connectable = onc.getActiveValue('Connectable');
     if (connectState != 'Connected' &&
         (!connectable || this.hasSecurity ||
         (onc.type == 'Wimax' || onc.type == 'VPN'))) {
       $('details-internet-configure').hidden = false;
     } else {
       $('details-internet-configure').hidden = true;
     }
   };
 
+  DetailsInternetPage.populateHeader = function(detailsPage, onc) {
+    $('network-details-title').textContent = onc.getTranslatedValue('Name');
+    var connectionState = onc.getActiveValue('ConnectionState');
+    var connectionStateString = onc.getTranslatedValue('ConnectionState');
+    detailsPage.connected = connectionState == 'Connected';
+    $('network-details-subtitle-status').textContent = connectionStateString;
+    var typeKey;
+    if (onc.type == 'Ethernet')
+      typeKey = 'ethernetTitle';
+    else if (onc.type == 'WiFi')
+      typeKey = 'wifiTitle';
+    else if (onc.type == 'Wimax')
+      typeKey = 'wimaxTitle';
+    else if (onc.type == 'Cellular')
+      typeKey = 'cellularTitle';
+    else if (onc.type == 'VPN')
+      typeKey = 'vpnTitle';
+    else
+      typeKey = null;
+    var typeLabel = $('network-details-subtitle-type');
+    var typeSeparator = $('network-details-subtitle-separator');
+    if (typeKey) {
+      typeLabel.textContent = loadTimeData.getString(typeKey);
+      typeLabel.hidden = false;
+      typeSeparator.hidden = false;
+    } else {
+      typeLabel.hidden = true;
+      typeSeparator.hidden = true;
+    }
+  };
+
   DetailsInternetPage.updateConnectionData = function(update) {
     var detailsPage = DetailsInternetPage.getInstance();
     if (!detailsPage.visible)
       return;
 
     var data = $('connection-state').data;
     if (!data)
       return;
 
     if (update.servicePath != data.servicePath)
       return;
 
     // Update our cached data object.
     updateDataObject(data, update);
     var onc = new OncData(data);
 
+    this.populateHeader(detailsPage, onc);
+
     var connectionState = onc.getActiveValue('ConnectionState');
     var connectionStateString = onc.getTranslatedValue('ConnectionState');
     detailsPage.deviceConnected = data.deviceConnected;
     detailsPage.connected = connectionState == 'Connected';
     $('connection-state').textContent = connectionStateString;
 
     this.updateConnectionButtonVisibilty(onc);
 
     if (onc.type == 'WiFi') {
       $('wifi-connection-state').textContent = connectionStateString;
     } else if (onc.type == 'Wimax') {
       $('wimax-connection-state').textContent = connectionStateString;
     } else if (onc.type == 'Cellular') {
-      $('activation-state').textContent = data.activationState;
-
+      $('activation-state').textContent =
+          onc.getTranslatedValue('Cellular.ActivationState');
       $('buyplan-details').hidden = !data.showBuyButton;
       $('view-account-details').hidden = !data.showViewAccountButton;
 
       $('activate-details').hidden = !data.showActivateButton;
       if (data.showActivateButton)
         $('details-internet-login').hidden = true;
 
       if (detailsPage.gsm) {
         var lockEnabled =
             onc.getActiveValue('Cellular.SIMLockStatus.LockEnabled');
         $('sim-card-lock-enabled').checked = lockEnabled;
         $('change-pin').hidden = !lockEnabled;
       }
     }
 
     $('connection-state').data = data;
     $('connection-state').onc = onc;
   };
 
   DetailsInternetPage.showDetailedInfo = function(data) {
     var detailsPage = DetailsInternetPage.getInstance();
 
     var onc = new OncData(data);
     data.type = onc.type;
 
-    // Populate header
-    $('network-details-title').textContent = onc.getTranslatedValue('Name');
+    this.populateHeader(detailsPage, onc);
+
     var connectionState = onc.getActiveValue('ConnectionState');

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

nit: i see only one usage, could be inlined / the variable be removed.

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

Done.

     var connectionStateString = onc.getTranslatedValue('ConnectionState');

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

nit: move it a bit down, nearer to the first usage

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

Done.

-    detailsPage.connected = connectionState == 'Connected';
-    $('network-details-subtitle-status').textContent = connectionStateString;
-    var typeKey = null;
-    switch (onc.type) {
-      case 'Ethernet':
-        typeKey = 'ethernetTitle';
-        break;
-      case 'WiFi':
-        typeKey = 'wifiTitle';
-        break;
-      case 'Wimax':
-        typeKey = 'wimaxTitle';
-        break;
-      case 'Cellular':
-        typeKey = 'cellularTitle';
-        break;
-      case 'VPN':
-        typeKey = 'vpnTitle';
-        break;
-    }
-    var typeLabel = $('network-details-subtitle-type');
-    var typeSeparator = $('network-details-subtitle-separator');
-    if (typeKey) {
-      typeLabel.textContent = loadTimeData.getString(typeKey);
-      typeLabel.hidden = false;
-      typeSeparator.hidden = false;
-    } else {
-      typeLabel.hidden = true;
-      typeSeparator.hidden = true;
-    }
 
     // TODO(stevenjb): Find a more appropriate place to cache data.
     $('connection-state').data = data;
     $('connection-state').onc = onc;
 
     $('buyplan-details').hidden = true;
     $('activate-details').hidden = true;
     $('view-account-details').hidden = true;
 
     this.updateConnectionButtonVisibilty(onc);
@@ skipping 129 matching lines @@
       signalStrength = 0;
     var strengthFormat = loadTimeData.getString('inetSignalStrengthFormat');
     var strengthString = strengthFormat.replace('$1', signalStrength);
 
     detailsPage.type = onc.type;
     if (onc.type == 'WiFi') {
       OptionsPage.showTab($('wifi-network-nav-tab'));
       detailsPage.gsm = false;
       detailsPage.shared = data.shared;
       $('wifi-connection-state').textContent = connectionStateString;
+      $('wifi-restricted-pool').textContent =
+          onc.getTranslatedValue('Restricted');
       var ssid = onc.getActiveValue('WiFi.SSID');
       $('wifi-ssid').textContent = ssid ? ssid : networkName;
       setOrHideParent('wifi-bssid', onc.getActiveValue('WiFi.BSSID'));
       var security = onc.getActiveValue('WiFi.Security');
       if (security == 'None')
         security = undefined;
       setOrHideParent('wifi-security', security);
       // Frequency is in MHz.
       var frequency = onc.getActiveValue('WiFi.Frequency');
       if (!frequency)
@@ skipping 11 matching lines @@
       $('auto-connect-network-wifi').checked =
           onc.getActiveValue('AutoConnect');
       $('auto-connect-network-wifi').disabled = !data.remembered;
       detailsPage.hasSecurity = security != undefined;
     } else if (onc.type == 'Wimax') {
       OptionsPage.showTab($('wimax-network-nav-tab'));
       detailsPage.gsm = false;
       detailsPage.shared = data.shared;
       detailsPage.showPreferred = data.remembered;
       $('wimax-connection-state').textContent = connectionStateString;
+      $('wimax-restricted-pool').textContent =
+          onc.getTranslatedValue('Restricted');
       $('auto-connect-network-wimax').checked =
           onc.getActiveValue('AutoConnect');
       $('auto-connect-network-wimax').disabled = !data.remembered;
       var identity = onc.getActiveValue('Wimax.EAP.Identity');
       setOrHideParent('wimax-eap-identity', identity);
       $('wimax-signal-strength').textContent = strengthString;
     } else if (onc.type == 'Cellular') {
       OptionsPage.showTab($('cellular-conn-nav-tab'));
       if (data.showCarrierSelect && data.currentCarrierIndex != -1) {
         var carrierSelector = $('select-carrier');
         carrierSelector.onchange = DetailsInternetPage.handleCarrierChanged;
         carrierSelector.options.length = 0;
         for (var i = 0; i < data.carriers.length; ++i) {
           var option = document.createElement('option');
           option.textContent = data.carriers[i];
           carrierSelector.add(option);
         }
         carrierSelector.selectedIndex = data.currentCarrierIndex;
       } else {
         $('service-name').textContent = networkName;
       }
 
       $('network-technology').textContent =
           onc.getActiveValue('Cellular.NetworkTechnology');
-      $('activation-state').textContent = data.activationState;
-      $('roaming-state').textContent = data.roamingState;
-      $('restricted-pool').textContent = data.restrictedPool;
+      $('activation-state').textContent =
+          onc.getTranslatedValue('Cellular.ActivationState');
+      $('roaming-state').textContent =
+          onc.getTranslatedValue('Cellular.RoamingState');
+      $('cellular-restricted-pool').textContent =
+          onc.getTranslatedValue('Restricted');
       $('error-state').textContent = data.errorMessage;
       $('manufacturer').textContent =
           onc.getActiveValue('Cellular.Manufacturer');
       $('model-id').textContent = onc.getActiveValue('Cellular.ModelID');
       $('firmware-revision').textContent =
           onc.getActiveValue('Cellular.FirmwareRevision');
       $('hardware-revision').textContent =
           onc.getActiveValue('Cellular.HardwareRevision');
       $('mdn').textContent = onc.getActiveValue('Cellular.MDN');
 
@@ skipping 148 matching lines @@
 
     // Don't show page name in address bar and in history to prevent people
     // navigate here by hand and solve issue with page session restore.
     PageManager.showPageByName('detailsInternetPage', false);
   };
 
   return {
     DetailsInternetPage: DetailsInternetPage
   };
 });