Commit 439dbad9 authored by Denis Kuznetsov's avatar Denis Kuznetsov Committed by Commit Bot

Reland of: Use proper localization mechanism for throbber-notice element.

Bug: 955194

Previously reviewed on: https://chromium-review.googlesource.com/c/chromium/src/+/1953626

Change-Id: I4408d126089be1c32710d9f4e564a84ef2f3ec7d
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1980176Reviewed-by: default avatarRoman Aleksandrov <raleksandrov@google.com>
Commit-Queue: Denis Kuznetsov [CET] <antrim@chromium.org>
Cr-Commit-Position: refs/heads/master@{#727174}
parent 48a04499
...@@ -70,7 +70,7 @@ ...@@ -70,7 +70,7 @@
</gaia-card> </gaia-card>
</neon-animatable> </neon-animatable>
<neon-animatable class="fit"> <neon-animatable class="fit">
<throbber-notice class="fit" i18n-values="text:gaiaLoading"> <throbber-notice class="fit" text-key="gaiaLoading">
</throbber-notice> </throbber-notice>
</neon-animatable> </neon-animatable>
</neon-animated-pages> </neon-animated-pages>
......
...@@ -35,7 +35,8 @@ ...@@ -35,7 +35,8 @@
<oobe-dialog id="loading" role="dialog" no-header no-footer-padding <oobe-dialog id="loading" role="dialog" no-header no-footer-padding
hidden="[[isStepHidden_(step_, 'loading')]]"> hidden="[[isStepHidden_(step_, 'loading')]]">
<div slot="footer" class="flex layout vertical center center-justified"> <div slot="footer" class="flex layout vertical center center-justified">
<throbber-notice text="Please wait"> <!--TODO(crbug.com/955194): use proper localization key -->
<throbber-notice text-key="gaiaLoading">
</throbber-notice> </throbber-notice>
</div> </div>
</oobe-dialog> </oobe-dialog>
......
...@@ -19,8 +19,7 @@ ...@@ -19,8 +19,7 @@
<template is="dom-if" if="[[isMigratingMinimal_(uiState)]]"> <template is="dom-if" if="[[isMigratingMinimal_(uiState)]]">
<oobe-dialog id="minimal-migration-dialog" tabindex="0" has-buttons> <oobe-dialog id="minimal-migration-dialog" tabindex="0" has-buttons>
<div slot="footer" class="layout vertical"> <div slot="footer" class="layout vertical">
<throbber-notice <throbber-notice text-key="gaiaLoading"></throbber-notice>
text="[[i18nDynamic(locale,'gaiaLoading')]]"></throbber-notice>
</div> </div>
</oobe-dialog> </oobe-dialog>
</template> </template>
......
...@@ -96,7 +96,7 @@ ...@@ -96,7 +96,7 @@
</gaia-card> </gaia-card>
</neon-animatable> </neon-animatable>
<neon-animatable class="fit"> <neon-animatable class="fit">
<throbber-notice class="fit" i18n-values="text:gaiaLoading"> <throbber-notice class="fit" text-key="gaiaLoading">
</throbber-notice> </throbber-notice>
</neon-animatable> </neon-animatable>
</neon-animated-pages> </neon-animated-pages>
......
...@@ -118,7 +118,7 @@ ...@@ -118,7 +118,7 @@
<div class="multidevice-help-overlay-webview-loading <div class="multidevice-help-overlay-webview-loading
layout horizontal center-center" layout horizontal center-center"
hidden$="[[!isWebviewLoading_]]"> hidden$="[[!isWebviewLoading_]]">
<throbber-notice i18n-values="text:gaiaLoading"></throbber-notice> <throbber-notice text-key="gaiaLoading"></throbber-notice>
</div> </div>
<webview id="multideviceHelpOverlayWebview" <webview id="multideviceHelpOverlayWebview"
hidden$="[[isWebviewLoading_]]" hidden$="[[isWebviewLoading_]]"
......
...@@ -49,8 +49,7 @@ ...@@ -49,8 +49,7 @@
</div> </div>
<div slot="footer" class="flex layout center-justified vertical"> <div slot="footer" class="flex layout center-justified vertical">
<div hidden="[[!isLoading_(uiState)]]"> <div hidden="[[!isLoading_(uiState)]]">
<throbber-notice id="termsOfServiceLoadingThrobber" <throbber-notice text-key="termsOfServiceLoading">
text="[[i18nDynamic(locale, termsOfServiceLoading)]]">
</throbber-notice> </throbber-notice>
</div> </div>
<webview id="termsOfServiceFrame" hidden="[[isLoading_(uiState)]]" <webview id="termsOfServiceFrame" hidden="[[isLoading_(uiState)]]"
......
...@@ -77,7 +77,7 @@ ...@@ -77,7 +77,7 @@
</gaia-card> </gaia-card>
</neon-animatable> </neon-animatable>
<neon-animatable class="fit"> <neon-animatable class="fit">
<throbber-notice i18n-values="text:gaiaLoading" class="fit"> <throbber-notice text-key="gaiaLoading" class="fit">
</throbber-notice> </throbber-notice>
</neon-animatable> </neon-animatable>
</neon-animated-pages> </neon-animated-pages>
......
...@@ -79,7 +79,7 @@ ...@@ -79,7 +79,7 @@
</oobe-dialog> </oobe-dialog>
<div id="gaia-loading" class="step-loading gaia-dialog" <div id="gaia-loading" class="step-loading gaia-dialog"
hidden="[[!isStep_(step_, 'loading', 'gaia-loading')]]"> hidden="[[!isStep_(step_, 'loading', 'gaia-loading')]]">
<throbber-notice i18n-values="text:gaiaLoading"></throbber-notice> <throbber-notice text-key="gaiaLoading"></throbber-notice>
</div> </div>
<notification-card id="gaia-whitelist-error" type="fail" class="gaia-dialog" <notification-card id="gaia-whitelist-error" type="fail" class="gaia-dialog"
hidden="[[!isStep_(step_, 'whitelist-error')]]" hidden="[[!isStep_(step_, 'whitelist-error')]]"
......
...@@ -8,7 +8,7 @@ ...@@ -8,7 +8,7 @@
<oobe-dialog id="recommend-apps-loading" role="dialog" no-header <oobe-dialog id="recommend-apps-loading" role="dialog" no-header
no-footer-padding> no-footer-padding>
<div slot="footer" class="flex layout vertical center center-justified"> <div slot="footer" class="flex layout vertical center center-justified">
<throbber-notice i18n-values="text:recommendAppsLoading"> <throbber-notice text-key="recommendAppsLoading">
</throbber-notice> </throbber-notice>
</div> </div>
</oobe-dialog> </oobe-dialog>
......
...@@ -9,7 +9,7 @@ ...@@ -9,7 +9,7 @@
<oobe-dialog id="sync-loading" role="dialog" no-header no-footer-padding <oobe-dialog id="sync-loading" role="dialog" no-header no-footer-padding
hidden> hidden>
<div slot="footer" class="flex layout vertical center center-justified"> <div slot="footer" class="flex layout vertical center center-justified">
<throbber-notice i18n-values="text:gaiaLoading"> <throbber-notice text-key="gaiaLoading">
</throbber-notice> </throbber-notice>
</div> </div>
</oobe-dialog> </oobe-dialog>
......
...@@ -16,7 +16,7 @@ paper-spinner-lite { ...@@ -16,7 +16,7 @@ paper-spinner-lite {
width: 38px; width: 38px;
} }
#spinner-comment { #comment {
@apply --oobe-default-font;
color: #747474; color: #747474;
font-size: 13px;
} }
...@@ -11,8 +11,9 @@ ...@@ -11,8 +11,9 @@
<link rel="stylesheet" href="throbber_notice.css"> <link rel="stylesheet" href="throbber_notice.css">
<template> <template>
<paper-spinner-lite dir="ltr" active></paper-spinner-lite> <paper-spinner-lite dir="ltr" active></paper-spinner-lite>
<div id="spinner-comment" aria-live="polite" aria-label="[[text]]" <div id="comment" aria-live="polite"
[[text]] aria-label$="[[i18nDynamic(locale, textKey)]]">
[[i18nDynamic(locale, textKey)]]
</div> </div>
</template> </template>
</dom-module> </dom-module>
...@@ -5,5 +5,7 @@ ...@@ -5,5 +5,7 @@
Polymer({ Polymer({
is: 'throbber-notice', is: 'throbber-notice',
properties: {text: String} behaviors: [OobeI18nBehavior],
properties: {textKey: String}
}); });
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment