Commit edc58914 authored by Denis Kuznetsov's avatar Denis Kuznetsov Committed by Commit Bot

Reland: Replace i18n-content with i18nDynamic in ARC TOS and SAML password screens

Initially reviewed on: https://chromium-review.googlesource.com/c/chromium/src/+/1958136

Bug: 955194
Change-Id: I061c4d0fe4c54c9c1bfb58ca741ed1cce5bc475c
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1980177Reviewed-by: default avatarRoman Aleksandrov <raleksandrov@google.com>
Commit-Queue: Denis Kuznetsov [CET] <antrim@chromium.org>
Cr-Commit-Position: refs/heads/master@{#727185}
parent 20c3c342
...@@ -318,6 +318,9 @@ js_library("recommend_apps") { ...@@ -318,6 +318,9 @@ js_library("recommend_apps") {
} }
js_library("saml_confirm_password") { js_library("saml_confirm_password") {
deps = [
":oobe_i18n_behavior",
]
} }
js_library("sync_consent") { js_library("sync_consent") {
......
...@@ -29,7 +29,7 @@ ...@@ -29,7 +29,7 @@
</div> </div>
<div id="arc-tos-metrics-demo-apps" <div id="arc-tos-metrics-demo-apps"
class="parameter-section arc-tos-content"> class="parameter-section arc-tos-content">
<p i18n-content="arcTextMetricsDemoApps"></p> <p>[[i18nDynamic(locale, 'arcTextMetricsDemoApps')]]</p>
</div> </div>
<div id="arc-backup-service" class="parameter-section arc-tos-content"> <div id="arc-backup-service" class="parameter-section arc-tos-content">
<cr-checkbox id="arc-enable-backup-restore"> <cr-checkbox id="arc-enable-backup-restore">
...@@ -56,10 +56,10 @@ ...@@ -56,10 +56,10 @@
</cr-checkbox> </cr-checkbox>
</div> </div>
<div class="arc-tos-loading"> <div class="arc-tos-loading">
<p i18n-content="arcTermsOfServiceLoading"></p> <p>[[i18nDynamic(locale, 'arcTermsOfServiceLoading')]]</p>
</div> </div>
<div class="arc-tos-error"> <div class="arc-tos-error">
<p i18n-content="arcTermsOfServiceError"></p> <p>[[i18nDynamic(locale, 'arcTermsOfServiceError')]]</p>
</div> </div>
</div> </div>
<div slot="bottom-buttons" class="flex layout horizontal"> <div slot="bottom-buttons" class="flex layout horizontal">
......
...@@ -10,7 +10,7 @@ ...@@ -10,7 +10,7 @@
Polymer({ Polymer({
is: 'arc-tos-root', is: 'arc-tos-root',
behaviors: [OobeDialogHostBehavior], behaviors: [OobeI18nBehavior, OobeDialogHostBehavior],
properties: { properties: {
/** /**
......
...@@ -88,14 +88,15 @@ ...@@ -88,14 +88,15 @@
<cr-dialog id="cancelConfirmDlg" <cr-dialog id="cancelConfirmDlg"
on-close="onDialogOverlayClosed_"> on-close="onDialogOverlayClosed_">
<div slot="body" <div slot="body">
i18n-content="accountSetupCancelDialogTitle"></div> [[i18nDynamic(locale, 'accountSetupCancelDialogTitle')]]
</div>
<div slot="button-container"> <div slot="button-container">
<cr-button class="action-button" <cr-button class="action-button" on-click="onCancelNo_">
i18n-content="accountSetupCancelDialogNo" on-click="onCancelNo_"> [[i18nDynamic(locale, 'accountSetupCancelDialogNo')]]
</cr-button> </cr-button>
<cr-button class="cancel-button" <cr-button class="cancel-button" on-click="onCancelYes_">
i18n-content="accountSetupCancelDialogYes" on-click="onCancelYes_"> [[i18nDynamic(locale, 'accountSetupCancelDialogYes')]]
</cr-button> </cr-button>
</div> </div>
</cr-dialog> </cr-dialog>
......
...@@ -5,6 +5,8 @@ ...@@ -5,6 +5,8 @@
Polymer({ Polymer({
is: 'saml-confirm-password', is: 'saml-confirm-password',
behaviors: [OobeI18nBehavior],
properties: { properties: {
email: String, email: 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