Commit 542ab4db authored by Denis Kuznetsov's avatar Denis Kuznetsov Committed by Commit Bot

Replace i18n-content with I18nDynamic on OOBE Eula screen

Bug: 955194
Change-Id: I07ec25a8d87cbfc446155825c501469da6624003
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/1912202Reviewed-by: default avatarRoman Sorokin [CET] <rsorokin@chromium.org>
Commit-Queue: Denis Kuznetsov [CET] <antrim@chromium.org>
Cr-Commit-Position: refs/heads/master@{#714895}
parent d1396264
...@@ -16,7 +16,7 @@ ...@@ -16,7 +16,7 @@
role="dialog" i18n-values="aria-label:termsOfServiceLoading" role="dialog" i18n-values="aria-label:termsOfServiceLoading"
has-buttons> has-buttons>
<iron-icon icon="oobe-eula:googleg" slot="oobe-icon"></iron-icon> <iron-icon icon="oobe-eula:googleg" slot="oobe-icon"></iron-icon>
<h1 slot="title" i18n-content="termsOfServiceLoading"></h1> <h1 slot="title">[[i18nDynamic(locale, 'termsOfServiceLoading')]]</h1>
</oobe-dialog> </oobe-dialog>
<oobe-dialog id="eulaDialog" hidden="[[eulaLoadingScreenShown]]" <oobe-dialog id="eulaDialog" hidden="[[eulaLoadingScreenShown]]"
role="dialog" i18n-values="aria-label:oobeEulaSectionTitle" role="dialog" i18n-values="aria-label:oobeEulaSectionTitle"
...@@ -24,7 +24,7 @@ ...@@ -24,7 +24,7 @@
<hd-iron-icon slot="oobe-icon" <hd-iron-icon slot="oobe-icon"
icon1x="oobe-32:googleg" icon2x="oobe-64:googleg"> icon1x="oobe-32:googleg" icon2x="oobe-64:googleg">
</hd-iron-icon> </hd-iron-icon>
<h1 slot="title" i18n-content="oobeEulaSectionTitle"></h1> <h1 slot="title">[[i18nDynamic(locale, 'oobeEulaSectionTitle')]]</h1>
<div slot="footer" class="flex layout vertical"> <div slot="footer" class="flex layout vertical">
<webview id="crosEulaFrame" <webview id="crosEulaFrame"
role="document" class="focus-on-show" role="document" class="focus-on-show"
...@@ -32,18 +32,19 @@ ...@@ -32,18 +32,19 @@
on-contentload="onFrameLoad_"> on-contentload="onFrameLoad_">
</webview> </webview>
<a id="installationSettings" href="#" <a id="installationSettings" href="#"
on-tap="onInstallationSettingsClicked_" on-tap="onInstallationSettingsClicked_">
i18n-content="eulaSystemInstallationSettings"> [[i18nDynamic(locale, 'eulaSystemInstallationSettings')]]
</a> </a>
<div id="logging" class="layout horizontal"> <div id="logging" class="layout horizontal">
<cr-toggle id="usageStats" checked="{{usageStatsChecked}}" <cr-toggle id="usageStats" checked="{{usageStatsChecked}}"
on-change="onUsageChanged_" aria-labelledby="usageStatsLabel"> on-change="onUsageChanged_" aria-labelledby="usageStatsLabel">
</cr-toggle> </cr-toggle>
<div id="usageStatsLabelContainer"> <div id="usageStatsLabelContainer">
<span id="usageStatsLabel" i18n-content="checkboxLogging" <span id="usageStatsLabel" on-tap="usageStatsLabelClicked_">
on-click="usageStatsLabelClicked_"></span> [[i18nDynamic(locale, 'checkboxLogging')]]
<a id="learn-more" href="#" i18n-content="learnMore" </span>
on-tap="onUsageStatsHelpLinkClicked_"> <a id="learn-more" href="#" on-tap="onUsageStatsHelpLinkClicked_">
[[i18nDynamic(locale, 'learnMore')]]
</a> </a>
</div> </div>
</div> </div>
...@@ -55,8 +56,8 @@ ...@@ -55,8 +56,8 @@
</div> </div>
<oobe-text-button id="acceptButton" inverse on-tap="eulaAccepted_" <oobe-text-button id="acceptButton" inverse on-tap="eulaAccepted_"
disabled="[[acceptButtonDisabled]]"> disabled="[[acceptButtonDisabled]]">
<div i18n-content="oobeEulaAcceptAndContinueButtonText" <div>
id="accept-button-text"> [[i18nDynamic(locale, 'oobeEulaAcceptAndContinueButtonText')]]
</div> </div>
</oobe-text-button> </oobe-text-button>
</div> </div>
...@@ -66,18 +67,27 @@ ...@@ -66,18 +67,27 @@
<hd-iron-icon slot="oobe-icon" <hd-iron-icon slot="oobe-icon"
icon1x="oobe-32:googleg" icon2x="oobe-64:googleg"> icon1x="oobe-32:googleg" icon2x="oobe-64:googleg">
</hd-iron-icon> </hd-iron-icon>
<h1 slot="title" i18n-content="eulaSystemInstallationSettings"></h1> <h1 slot="title">
[[i18nDynamic(locale, 'eulaSystemInstallationSettings')]]
</h1>
<!-- TODO(antrim): find out why do we have everything in subtitle -->
<div slot="subtitle"> <div slot="subtitle">
<div i18n-content="eulaTpmDesc"></div> <div>
[[i18nDynamic(locale, 'eulaTpmDesc')]]
</div>
<div class='tpm-password'> <div class='tpm-password'>
<div hidden="[[isPasswordEmpty_(password)]]" <div hidden="[[isPasswordEmpty_(password)]]">
i18n-content="eulaTpmKeyDesc"></div> [[i18nDynamic(locale, 'eulaTpmKeyDesc')]]
<div hidden="[[!isPasswordEmpty_(password)]]" </div>
i18n-content="eulaTpmDescPowerwash"></div> <div hidden="[[!isPasswordEmpty_(password)]]">
[[i18nDynamic(locale, 'eulaTpmDescPowerwash')]]
</div>
<div class="layout horizontal" <div class="layout horizontal"
hidden="[[!isWaitingForPassword_(password)]]"> hidden="[[!isWaitingForPassword_(password)]]">
<div class="installation-settings-spinner throbber"></div> <div class="installation-settings-spinner throbber"></div>
<div i18n-content="eulaTpmBusy"></div> <div>
[[i18nDynamic(locale, 'eulaTpmBusy')]]
</div>
</div> </div>
<div class='password-row layout horizontal'> <div class='password-row layout horizontal'>
<div class="flex"></div> <div class="flex"></div>
...@@ -90,7 +100,9 @@ ...@@ -90,7 +100,9 @@
<div class="flex"></div> <div class="flex"></div>
<oobe-text-button id="settings-close-button" inverse <oobe-text-button id="settings-close-button" inverse
on-tap="onInstallationSettingsCloseClicked_"> on-tap="onInstallationSettingsCloseClicked_">
<div i18n-content="eulaSystemInstallationSettingsOkButton"></div> <div>
[[i18nDynamic(locale, 'eulaSystemInstallationSettingsOkButton')]]
</div>
</oobe-text-button> </oobe-text-button>
</div> </div>
</oobe-dialog> </oobe-dialog>
......
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