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 9c84dbbb8541d75ea783770459c30bf34094f87a..3945a5a74a1ec4bd65b90cd6c836ba5b98e420ea 100644 |
--- a/chrome/browser/resources/settings/languages_page/languages_page.html |
+++ b/chrome/browser/resources/settings/languages_page/languages_page.html |
@@ -2,7 +2,6 @@ |
<link rel="import" href="chrome://resources/html/cr.html"> |
<link rel="import" href="chrome://resources/html/i18n_behavior.html"> |
<link rel="import" href="chrome://resources/html/polymer.html"> |
-<link rel="import" href="chrome://resources/polymer/v1_0/iron-flex-layout/iron-flex-layout.html"> |
<link rel="import" href="chrome://resources/polymer/v1_0/iron-collapse/iron-collapse.html"> |
<link rel="import" href="chrome://resources/polymer/v1_0/iron-icon/iron-icon.html"> |
<link rel="import" href="chrome://resources/polymer/v1_0/iron-icons/iron-icons.html"> |
@@ -22,7 +21,11 @@ |
<dom-module id="settings-languages-page"> |
<template> |
- <style include="settings-shared"></style> |
+ <style include="settings-shared"> |
+ div.list-item[selected] { |
+ font-weight: 500; |
dschuyler
2016/04/06 21:45:50
Would it make sense to have this as
list-item[sel
michaelpg
2016/04/07 14:55:47
Done (also corrected to .selected)
|
+ } |
+ </style> |
<settings-languages languages="{{languages}}"></settings-languages> |
<settings-animated-pages id="pages" current-route="{{currentRoute}}" |
section="languages"> |
@@ -30,21 +33,22 @@ |
<div class="settings-box first two-line"> |
<div class="start"> |
<div i18n-content="languagesListTitle"></div> |
- <div class="secondary">[[languagesSecondary_]]</div> |
+ <div class="secondary"> |
+ [[getProspectiveUILanguageName_(prefs.intl.app_locale.value)]] |
+ </div> |
</div> |
<cr-expand-button expanded="{{languagesOpened_}}"> |
</cr-expand-button> |
</div> |
<iron-collapse id="languagesCollapse" opened="[[languagesOpened_]]"> |
<div class="list-frame vertical-list"> |
- <array-selector id="languageSelector" |
- selected="{{detailLanguage}}" |
- items="{{languages.enabledLanguages}}"></array-selector> |
<template is="dom-repeat" items="{{languages.enabledLanguages}}"> |
- <div class="list-item" on-tap="onLanguageTap_"> |
+ <div |
+ class$="list-item [[getLanguageItemClass_(item.language.code, prefs.intl.app_locale.value)]]" |
+ on-tap="onLanguageTap_"> |
<div class="start"> |
<div title="[[item.language.nativeDisplayName]]"> |
- [[item.language.displayName]] |
+ [[item.language.displayName]] |
<if expr="chromeos or is_win"> |
<iron-icon icon="done" |
hidden$="[[!isProspectiveUILanguage_(item.language.code, prefs.intl.app_locale.value)]]"> |
@@ -74,7 +78,8 @@ |
opened="[[inputMethodsOpened_]]"> |
<div class="list-frame vertical-list"> |
<template is="dom-repeat" items="{{languages.inputMethods}}"> |
- <div class="list-item"> |
+ <div class$= |
+ "list-item [[getInputMethodItemClass_(id, currentId)]]"> |
<div class="start"> |
<div>[[item.name]]</div> |
<iron-icon icon="done" |
@@ -101,14 +106,20 @@ |
</div> |
<iron-collapse id="spellCheckCollapse" opened="[[spellCheckOpened_]]"> |
<div class="list-frame vertical-list"> |
- <div class="list-item"> |
- <template is="dom-repeat" items="{{languages.enabledLanguages}}"> |
- <paper-checkbox hidden="[[!item.language.supportsSpellcheck]]" |
- checked="[[item.state.spellCheckEnabled]]" |
- on-change="onSpellCheckChange_" |
- >[[item.language.displayName]]</paper-checkbox> |
- </template> |
- </div> |
+ <template is="dom-repeat" |
+ items="[[spellCheckLanguages_(languages.enabledLanguages.*)]]"> |
+ <div class="list-item"> |
+ <div class="start"> |
+ <paper-checkbox |
+ checked="[[item.state.spellCheckEnabled]]" |
+ on-change="onSpellCheckChange_"> |
+ [[item.language.displayName]] |
+ </paper-checkbox> |
+ </div> |
+ <paper-icon-button icon="settings" |
+ on-tap="onShowLanguageDetailTap_"></paper-icon-button> |
+ </div> |
+ </template> |
<div class="list-item list-button" i18n-content="manageSpellCheck" |
on-tap="onEditDictionaryTap_"> |
</div> |
@@ -124,9 +135,9 @@ |
</template> |
<template is="dom-if" name="language-detail"> |
<settings-subpage |
- page-title="[[detailLanguage.language.displayName]]"> |
+ page-title="[[detailLanguage_.language.displayName]]"> |
<settings-language-detail-page id="languageDetailPage" |
- prefs="{{prefs}}" detail="[[detailLanguage]]"> |
+ prefs="{{prefs}}" detail="[[detailLanguage_]]"> |
</settings-language-detail-page> |
</settings-subpage> |
</template> |