Fix 18n-content for reset screen

Bug: 955194
Change-Id: Ie12def6987bbbf7b4ff5bdc738bcdb40b87e53fc
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1912359
Commit-Queue: Denis Kuznetsov [CET] <antrim@chromium.org>
Reviewed-by: Roman Sorokin [CET] <rsorokin@chromium.org>
Cr-Commit-Position: refs/heads/master@{#714916}

chrome/browser/resources/chromeos/login/BUILD.gn

@@ -289,13 +289,14 @@ js_library("oobe_network") {
 
 js_library("oobe_reset_confirmation_overlay") {
   deps = [
-    ":oobe_dialog_host_behavior",
+    "//ui/webui/resources/js:i18n_behavior",
   ]
 }
 
 js_library("oobe_reset") {
   deps = [
     ":oobe_dialog_host_behavior",
+    "//ui/webui/resources/js:i18n_behavior",
   ]
 }
 

chrome/browser/resources/chromeos/login/oobe_reset.html

@@ -3,6 +3,7 @@
      found in the LICENSE file. -->
 
 <link rel="import" href="chrome://resources/cr_elements/cr_checkbox/cr_checkbox.html">
+<link rel="import" href="chrome://resources/html/i18n_behavior.html">
 <link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html">
 
 <dom-module id="oobe-reset-md">
@@ -16,26 +17,39 @@
       <hd-iron-icon slot="oobe-icon"
           icon1x="oobe-32:alert" icon2x="oobe-64:alert">
       </hd-iron-icon>
-      <h1 slot="title" i18n-content="resetWarningTitle"></h1>
+      <h1 slot="title">
+        [[i18nDynamic(locale, 'resetWarningTitle')]]
+      </h1>
       <div slot="subtitle" class="powerwash-warning">
-        <div hidden="[[!isState_(uiState_, 'powerwash-proposal-view')]]"
-            i18n-content="resetPowerwashWarningDetails"></div>
-        <div hidden="[[!isState_(uiState_, 'powerwash-proposal-view')]]"
-            i18n-content="resetWarningDataDetails"></div>
-        <div hidden="[[!isState_(uiState_, 'rollback-proposal-view')]]"
-            i18n-content="resetPowerwashRollbackWarningDetails"></div>
-        <div hidden="[[!isState_(uiState_, 'rollback-proposal-view')]]"
-            i18n-content="resetWarningDataDetails"></div>
-        <div hidden="[[!isState_(uiState_, 'restart-required-view')]]"
-            i18n-content="resetRestartMessage"></div>
+        <div hidden="[[!isState_(uiState_, 'powerwash-proposal-view')]]">
+          [[i18nDynamic(locale, 'resetPowerwashWarningDetails')]]
+        </div>
+        <div hidden="[[!isState_(uiState_, 'powerwash-proposal-view')]]">
+          [[i18nDynamic(locale, 'resetWarningDataDetails')]]
+        </div>
+        <div hidden="[[!isState_(uiState_, 'rollback-proposal-view')]]">
+          [[i18nDynamic(locale, 'resetPowerwashRollbackWarningDetails')]]
+        </div>
+        <div hidden="[[!isState_(uiState_, 'rollback-proposal-view')]]">
+          [[i18nDynamic(locale, 'resetWarningDataDetails')]]
+        </div>
+        <div hidden="[[!isState_(uiState_, 'restart-required-view')]]">
+          [[i18nDynamic(locale, 'resetRestartMessage')]]
+        </div>
         <a id="powerwash-help-link-md" href="#"
             hidden="[[isHelpLinkHidden_(uiState_, isOfficial_)]]"
-            on-tap="onLearnMoreTap_" i18n-content="learnMore"></a>
+            on-tap="onLearnMoreTap_">
+          [[i18nDynamic(locale, 'learnMore')]]
+        </a>
         <div hidden="[[!isState_(uiState_, 'revert-promise-view')]]">
-          <div i18n-content="resetRevertPromise"></div>
+          <div>
+            [[i18nDynamic(locale, 'resetRevertPromise')]]
+          </div>
           <div class="flex horizontal layout">
             <div id="reset-revert-spinner" class="throbber"></div>
-            <div i18n-content="resetRevertSpinnerMessage"></div>
+            <div>
+              [[i18nDynamic(locale, 'resetRevertSpinnerMessage')]]
+            </div>
           </div>
         </div>
       </div>
@@ -52,10 +66,13 @@
               on-change="onTPMFirmwareUpdateChanged_">
           </cr-checkbox>
           <div id="tpmFirmwareUpdateContainer">
-            <span i18n-content="resetTPMFirmwareUpdate"></span>
+            <span>
+              [[i18nDynamic(locale, 'resetTPMFirmwareUpdate')]]
+            </span>
             <a href="#" hidden="[[isHelpLinkHidden_(uiState_, isOfficial_)]]"
-                on-tap="onTPMFirmwareUpdateLearnMore_"
-                i18n-content="learnMore"></a>
+                on-tap="onTPMFirmwareUpdateLearnMore_">
+              [[i18nDynamic(locale, 'learnMore')]]
+            </a>
           </div>
         </div>
       </div>
@@ -63,20 +80,20 @@
         <div class="flex"></div>
         <oobe-text-button border on-tap="onCancelTap_"
             hidden="[[isCancelHidden_(uiState_)]]">
-          <div i18n-content="cancelButton"></div>
+          <div>[[i18nDynamic(locale, 'cancelButton')]]</div>
         </oobe-text-button>
         <oobe-text-button inverse on-tap="onRestartTap_" class="focus-on-show"
             hidden="[[!isState_(uiState_, 'restart-required-view')]]">
-          <div i18n-content="resetButtonRestart"></div>
+          <div>[[i18nDynamic(locale, 'resetButtonRestart')]]</div>
         </oobe-text-button>
         <oobe-text-button inverse on-tap="onPowerwashTap_" class="focus-on-show"
             hidden="[[!isState_(uiState_, 'rollback-proposal-view')]]"
             disabled="[[tpmFirmwareUpdateChecked_]]">
-          <div i18n-content="resetButtonPowerwashAndRollback"></div>
+          <div>[[i18nDynamic(locale, 'resetButtonPowerwashAndRollback')]]</div>
         </oobe-text-button>
         <oobe-text-button inverse on-tap="onPowerwashTap_" class="focus-on-show"
             hidden="[[!isState_(uiState_, 'powerwash-proposal-view')]]">
-          <div i18n-content="resetButtonPowerwash"></div>
+          <div>[[i18nDynamic(locale, 'resetButtonPowerwash')]]</div>
         </oobe-text-button>
       </div>
     </oobe-dialog>

chrome/browser/resources/chromeos/login/oobe_reset.js

@@ -9,7 +9,7 @@
 Polymer({
   is: 'oobe-reset-md',
 
-  behaviors: [OobeDialogHostBehavior],
+  behaviors: [I18nBehavior, OobeDialogHostBehavior],
 
   properties: {
     /**

chrome/browser/resources/chromeos/login/oobe_reset_confirmation_overlay.html

@@ -7,23 +7,27 @@
     <link rel="stylesheet" href="oobe_flex_layout.css">
     <link rel="stylesheet" href="oobe_reset_confirmation_overlay.css">
     <dialog id="dialog" class="reset-popup not-resizable">
-        <h1 i18n-content="confirmPowerwashTitle" hidden="[[!isPowerwashView_]]">
+        <h1 hidden="[[!isPowerwashView_]]">
+          [[i18nDynamic(locale, 'confirmPowerwashTitle')]]
         </h1>
-        <h1 i18n-content="confirmRollbackTitle" hidden="[[isPowerwashView_]]">
+        <h1 hidden="[[isPowerwashView_]]">
+          [[i18nDynamic(locale, 'confirmRollbackTitle')]]
         </h1>
       <div class="reset-popup-content-area">
-        <div i18n-content="confirmPowerwashMessage"
-            hidden="[[!isPowerwashView_]]"></div>
-        <div i18n-content="confirmRollbackMessage"
-            hidden="[[isPowerwashView_]]"></div>
+        <div hidden="[[!isPowerwashView_]]">
+          [[i18nDynamic(locale, 'confirmPowerwashMessage')]]
+        </div>
+        <div hidden="[[isPowerwashView_]]">
+          [[i18nDynamic(locale, 'confirmRollbackMessage')]]
+        </div>
       </div>
       <div slot="bottom-buttons" class="flex layout horizontal">
         <div class="flex"></div>
         <oobe-text-button id="cancelButton" border on-tap="onCancelTap_">
-          <div i18n-content="cancel"></div>
+          <div>[[i18nDynamic(locale, 'cancel')]]</div>
         </oobe-text-button>
         <oobe-text-button inverse on-tap="onContinueTap_">
-          <div i18n-content="confirmResetButton"></div>
+          <div>[[i18nDynamic(locale, 'confirmResetButton')]]</div>
         </oobe-text-button>
       </div>
     </dialog>

chrome/browser/resources/chromeos/login/oobe_reset_confirmation_overlay.js

@@ -10,6 +10,8 @@
 Polymer({
   is: 'reset-confirm-overlay-md',
 
+  behaviors: [I18nBehavior],
+
   properties: {
     isPowerwashView_: Boolean,
   },

chrome/browser/resources/chromeos/login/oobe_screen_reset.js

@@ -221,6 +221,14 @@ login.createScreen('ResetScreen', 'reset', function() {
 
     onTPMFirmwareUpdateChanged_: function(value) {
       chrome.send('ResetScreen.setTpmFirmwareUpdateChecked', [value]);
-    }
+    },
+
+    /**
+     * Updates localized content of the screen that is not updated via template.
+     */
+    updateLocalizedContent: function() {
+      $('oobe-reset-md').i18nUpdateLocale();
+      $('reset-confirm-overlay-md').i18nUpdateLocale();
+    },
   };
 });