Chromium Code Reviews| Index: ui/webui/resources/cr_elements/v1_0/network/cr_network_list_item.js |
| diff --git a/chrome/browser/resources/settings/internet_page/network_list_item.js b/ui/webui/resources/cr_elements/v1_0/network/cr_network_list_item.js |
| similarity index 82% |
| rename from chrome/browser/resources/settings/internet_page/network_list_item.js |
| rename to ui/webui/resources/cr_elements/v1_0/network/cr_network_list_item.js |
| index fb668450205f30d54c8a5c683dbb03c7badc6585..5a0097f720d67152d8303af4f744b223000f83f2 100644 |
| --- a/chrome/browser/resources/settings/internet_page/network_list_item.js |
| +++ b/ui/webui/resources/cr_elements/v1_0/network/cr_network_list_item.js |
| @@ -17,11 +17,16 @@ |
| * @param {?Array<string>} args The arguments to replace %1, %2, etc with. |
|
michaelpg
2015/08/10 07:35:03
ditto
stevenjb
2015/08/10 19:19:47
Done.
|
| */ |
| function getText(text, args) { |
| - var res = text; |
| + var res; |
| + if (loadTimeData && loadTimeData.data_) { |
|
michaelpg
2015/08/10 07:35:03
nit: no brackets
stevenjb
2015/08/10 19:19:47
Done.
|
| + res = loadTimeData.getString(text) || text; |
| + } else { |
| + res = text; |
| + } |
| if (!args) |
| return res; |
| for (var i = 0; i < args.length; ++i) { |
| - var key = '%' + (i + 1); |
| + var key = '$' + (i + 1); |
| res = res.replace(key, args[i]); |
| } |
| return res; |
| @@ -34,20 +39,20 @@ function getText(text, args) { |
| */ |
| function getConnectionStateText(state, name) { |
| if (state == CrOnc.ConnectionState.CONNECTED) |
| - return getText('Connected to %1', [name]); |
| + return getText('networkConnected', [name]); |
| if (state == CrOnc.ConnectionState.CONNECTING) |
| - return getText('Connecting to %1...', [name]); |
| + return getText('networkConnecting', [name]); |
| if (state == CrOnc.ConnectionState.NOT_CONNECTED) |
| - return getText('Not Connected'); |
| + return getText('networkNotConnected'); |
| return getText(state); |
| }; |
| /** |
| - * Polymer class definition for 'network-list-item'. |
| - * @element network-list-item |
| + * Polymer class definition for 'cr-network-list-item'. |
| + * @element cr-network-list-item |
| */ |
| Polymer({ |
| - is: 'network-list-item', |
| + is: 'cr-network-list-item', |
| properties: { |
| /** |
| @@ -86,27 +91,27 @@ Polymer({ |
| var isDisconnected = |
| network.ConnectionState == CrOnc.ConnectionState.NOT_CONNECTED; |
| if (this.isListItem) { |
| - var name = getText(network.Name) || getText(network.Type); |
| + var name = network.Name || getText('OncType' + network.Type); |
| this.$.networkName.textContent = name; |
| this.$.networkName.classList.toggle('connected', !isDisconnected); |
| return; |
| } |
| if (network.Name && network.ConnectionState) { |
| - this.$.networkName.textContent = getText(network.Type); |
| + this.$.networkName.textContent = getText('OncType' + network.Type); |
| this.$.networkName.classList.toggle('connected', false); |
| this.$.networkStateText.textContent = |
| getConnectionStateText(network.ConnectionState, network.Name); |
| this.$.networkStateText.classList.toggle('connected', !isDisconnected); |
| return; |
| } |
| - this.$.networkName.textContent = getText(network.Type); |
| + this.$.networkName.textContent = getText('OncType' + network.Type); |
| this.$.networkName.classList.toggle('connected', false); |
| this.$.networkStateText.textContent = getText('Disabled'); |
| this.$.networkStateText.classList.toggle('connected', false); |
| if (network.Type == CrOnc.Type.CELLULAR) { |
| if (!network.GUID) |
| - this.$.networkStateText.textContent = getText('Uninitialized'); |
| + this.$.networkStateText.textContent = getText('Disabled'); |
| } |
| }, |