Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(1891)

Unified Diff: chrome/browser/resources/chromeos/login/oobe_welcome.js

Issue 2886843005: [i18n] use Polymer data binding to change locale strings (Closed)
Patch Set: use str_() to update i18n Created 3 years, 7 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « chrome/browser/resources/chromeos/login/oobe_welcome.html ('k') | no next file » | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
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..fa66c580d9b6304c95e260fd76480d7a4689e3f0 100644
--- a/chrome/browser/resources/chromeos/login/oobe_welcome.js
+++ b/chrome/browser/resources/chromeos/login/oobe_welcome.js
@@ -32,7 +32,7 @@ Polymer({
*/
languages: {
type: Array,
- observer: "onLanguagesChanged_",
+ observer: 'onLanguagesChanged_',
},
/**
@@ -41,7 +41,7 @@ Polymer({
*/
keyboards: {
type: Array,
- observer: "onKeyboardsChanged_",
+ observer: 'onKeyboardsChanged_',
},
/**
@@ -77,6 +77,17 @@ Polymer({
value: '',
},
+ /*
+ * Signal dynamic language change.
+ * Note: the type and value are arbitrary, but the value does need to change
+ * to cause a str('...', i18n_) update.
+ * @private
+ */
+ i18n_: {
+ type: Number,
+ value: 0,
+ },
+
/**
* True when connected to a network.
* @private
@@ -89,7 +100,7 @@ Polymer({
/**
* Controls displaying of "Enable debugging features" link.
*/
- debuggingLinkVisible: Boolean,
+ debuggingLinkVisible: Boolean,
},
/**
@@ -130,6 +141,8 @@ Polymer({
addWiFiNetworkMenuName: loadTimeData.getString('addWiFiNetworkMenuName'),
proxySettingsMenuName: loadTimeData.getString('proxySettingsMenuName'),
};
+
+ this.set('i18n_', this.i18n_ + 1);
Alexander Alekseev 2017/05/20 01:21:12 I don't like the idea of per-screen JS depencence.
dschuyler 2017/05/20 01:44:48 I agree that it is not pretty, but it's a special
Alexander Alekseev 2017/05/20 01:50:57 I believe that OOBE/Login is likely a half of Chro
Dan Beam 2017/05/20 02:03:29 i don't know how a behavior would help that the bi
Dan Beam 2017/05/20 02:03:29 fwiw: this could also just be this.i18n_++;
Alexander Alekseev 2017/05/20 02:25:21 updateLocalizedContent should go into the behavior
dschuyler 2017/05/23 00:03:18 Acknowledged.
dschuyler 2017/05/23 00:03:18 Acknowledged.
dschuyler 2017/05/23 00:03:18 I'd like that (moving the existing code) to be a s
dschuyler 2017/05/23 00:03:18 Done.
},
/**
@@ -139,7 +152,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;
}
@@ -160,11 +173,20 @@ Polymer({
},
/**
+ * Get the i18n string for the given tag.
+ * @return {string}
+ * @private
+ */
+ str_: function(tag) {
+ return loadTimeData.getString(tag);
+ },
+
+ /**
* Returns active screen object.
* @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 +229,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 +303,7 @@ Polymer({
},
/**
- * Handle Networwork Setup screen "Proxy settings" button.
+ * Handle Network Setup screen "Proxy settings" button.
*
* @private
*/
@@ -284,7 +312,7 @@ Polymer({
},
/**
- * Handle Networwork Setup screen "Add WiFi network" button.
+ * Handle Network Setup screen "Add WiFi network" button.
*
* @private
*/
@@ -293,7 +321,7 @@ Polymer({
},
/**
- * Handle Networwork Setup screen "Add cellular network" button.
+ * Handle Network Setup screen "Add cellular network" button.
*
* @private
*/
« no previous file with comments | « chrome/browser/resources/chromeos/login/oobe_welcome.html ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698