Chromium Code Reviews| Index: chrome/browser/resources/chromeos/login/oobe_welcome.js |
| diff --git a/chrome/browser/resources/chromeos/login/oobe_welcome.js b/chrome/browser/resources/chromeos/login/oobe_welcome.js |
| index aeaba1a63b61b01e7d01a541a52fe440aeee76c6..3e95e5eded1d6ff4e0ab4b6825caac2329d5634e 100644 |
| --- a/chrome/browser/resources/chromeos/login/oobe_welcome.js |
| +++ b/chrome/browser/resources/chromeos/login/oobe_welcome.js |
| @@ -9,6 +9,8 @@ |
| Polymer({ |
| is: 'oobe-welcome-md', |
| + behaviors: [I18nBehavior], |
| + |
| properties: { |
| /** |
| * Currently selected system language (display name). |
| @@ -32,7 +34,7 @@ Polymer({ |
| */ |
| languages: { |
| type: Array, |
| - observer: "onLanguagesChanged_", |
| + observer: 'onLanguagesChanged_', |
| }, |
| /** |
| @@ -41,7 +43,7 @@ Polymer({ |
| */ |
| keyboards: { |
| type: Array, |
| - observer: "onKeyboardsChanged_", |
| + observer: 'onKeyboardsChanged_', |
| }, |
| /** |
| @@ -89,7 +91,7 @@ Polymer({ |
| /** |
| * Controls displaying of "Enable debugging features" link. |
| */ |
| - debuggingLinkVisible: Boolean, |
| + debuggingLinkVisible: Boolean, |
| }, |
| /** |
| @@ -130,6 +132,8 @@ Polymer({ |
| addWiFiNetworkMenuName: loadTimeData.getString('addWiFiNetworkMenuName'), |
| proxySettingsMenuName: loadTimeData.getString('proxySettingsMenuName'), |
| }; |
| + |
| + I18nBehavior.updateLocalizedContent.call(this); |
|
Dan Beam
2017/05/22 23:15:56
why are you overriding the same name in the behavi
dschuyler
2017/05/22 23:30:17
It's a function rather than setting this.locale fo
Dan Beam
2017/05/22 23:38:05
but we still have to expose locale publicly anyway
dschuyler
2017/05/23 00:03:18
Went with this.i18nUpdateLocale();
done.
|
| }, |
| /** |
| @@ -139,7 +143,7 @@ Polymer({ |
| hideAllScreens_: function() { |
| this.$.welcomeScreen.hidden = true; |
| - var screens = Polymer.dom(this.root).querySelectorAll('oobe-dialog') |
| + var screens = Polymer.dom(this.root).querySelectorAll('oobe-dialog'); |
| for (var i = 0; i < screens.length; ++i) { |
| screens[i].hidden = true; |
| } |
| @@ -164,7 +168,7 @@ Polymer({ |
| * @private |
| */ |
| getActiveScreen_: function() { |
| - var screens = Polymer.dom(this.root).querySelectorAll('oobe-dialog') |
| + var screens = Polymer.dom(this.root).querySelectorAll('oobe-dialog'); |
| for (var i = 0; i < screens.length; ++i) { |
| if (!screens[i].hidden) |
| return screens[i]; |
| @@ -207,21 +211,27 @@ Polymer({ |
| customItemName: 'proxySettingsMenuName', |
| polymerIcon: 'oobe-welcome-20:add-proxy', |
| customData: { |
| - onTap: function() { self.OpenProxySettingsDialog_(); }, |
| + onTap: function() { |
| + self.OpenProxySettingsDialog_(); |
| + }, |
| }, |
| }, |
| { |
| customItemName: 'addWiFiNetworkMenuName', |
| polymerIcon: 'oobe-welcome-20:add-wifi', |
| customData: { |
| - onTap: function() { self.OpenAddWiFiNetworkDialog_(); }, |
| + onTap: function() { |
| + self.OpenAddWiFiNetworkDialog_(); |
| + }, |
| }, |
| }, |
| { |
| customItemName: 'addMobileNetworkMenuName', |
| polymerIcon: 'oobe-welcome-20:add-cellular', |
| customData: { |
| - onTap: function() { self.OpenAddWiFiNetworkDialog_(); }, |
| + onTap: function() { |
| + self.OpenAddWiFiNetworkDialog_(); |
| + }, |
| }, |
| }, |
| ]; |
| @@ -275,7 +285,7 @@ Polymer({ |
| }, |
| /** |
| - * Handle Networwork Setup screen "Proxy settings" button. |
| + * Handle Network Setup screen "Proxy settings" button. |
| * |
| * @private |
| */ |
| @@ -284,7 +294,7 @@ Polymer({ |
| }, |
| /** |
| - * Handle Networwork Setup screen "Add WiFi network" button. |
| + * Handle Network Setup screen "Add WiFi network" button. |
| * |
| * @private |
| */ |
| @@ -293,7 +303,7 @@ Polymer({ |
| }, |
| /** |
| - * Handle Networwork Setup screen "Add cellular network" button. |
| + * Handle Network Setup screen "Add cellular network" button. |
| * |
| * @private |
| */ |