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

Unified Diff: chrome/browser/resources/settings/languages_page/languages_page.html

Issue 2573643005: Language settings: Fix Restart and Remove buttons shown at wrong times (Closed)
Patch Set: feedback Created 4 years 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
Index: chrome/browser/resources/settings/languages_page/languages_page.html
diff --git a/chrome/browser/resources/settings/languages_page/languages_page.html b/chrome/browser/resources/settings/languages_page/languages_page.html
index d0dbab2d6f2d78235f81daf1104f76eea358e887..8684f16e36ab0d46496b94cb1ca7abd26e071734 100644
--- a/chrome/browser/resources/settings/languages_page/languages_page.html
+++ b/chrome/browser/resources/settings/languages_page/languages_page.html
@@ -77,8 +77,7 @@
<div>$i18n{languagesListTitle}</div>
<if expr="chromeos or is_win">
<div class="secondary">
- [[getProspectiveUILanguageName_(
- languages, prefs.intl.app_locale.value)]]
+ [[getProspectiveUILanguageName_(languages.prospectiveUILanguage)]]
</div>
</if>
</div>
@@ -99,8 +98,7 @@
</span>
<template is="dom-repeat" items="[[languages.enabled]]">
<div class$="list-item [[getLanguageItemClass_(
- item.language.code, prefs.intl.app_locale.value,
- item.language.supportsUI)]]">
+ item.language.code, language.prospectiveUILanguage)]]">
<div class="start">
<div title="[[item.language.nativeDisplayName]]">
[[item.language.displayName]]
@@ -108,14 +106,15 @@
<if expr="chromeos or is_win">
<div class="explain-selected"
hidden="[[!isProspectiveUILanguage_(
- item.language.code, prefs.intl.app_locale.value)]]">
+ item.language.code,
+ languages.prospectiveUILanguage)]]">
$i18n{isDisplayedInThisLanguage}
</div>
</if>
</div>
<if expr="chromeos or is_win">
<template is="dom-if" if="[[isRestartRequired_(
- item.language.code, prefs.intl.app_locale.value)]]">
+ item.language.code, languages.prospectiveUILanguage)]]">
<paper-button on-tap="onRestartTap_">
$i18n{restart}
</paper-button>
@@ -213,10 +212,10 @@
<paper-checkbox id="uiLanguageItem" class="dropdown-item"
checked="[[isProspectiveUILanguage_(
detailLanguage_.language.code,
- prefs.intl.app_locale.value)]]"
+ languages.prospectiveUILanguage)]]"
on-change="onUILanguageChange_"
disabled="[[disableUILanguageCheckbox_(
- detailLanguage_, prefs.intl.app_locale.value)]]">
+ detailLanguage_, languages.prospectiveUILanguage)]]">
$i18n{displayInThisLanguage}
</paper-checkbox>
</if>

Powered by Google App Engine
This is Rietveld 408576698