MD Settings: Polish languages pages.

chrome/browser/resources/settings/languages_page/languages_page.html

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..2af51df3dc83ae7004603e8069fdb3d592f90f6c 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">
@@ -30,28 +29,35 @@
         <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="start">
-                  <div title="[[item.language.nativeDisplayName]]">
-                      [[item.language.displayName]]
-<if expr="chromeos or is_win">
-                    <iron-icon icon="done"
-                        hidden$="[[!isProspectiveUILanguage_(item.language.code, prefs.intl.app_locale.value)]]">
-                    </iron-icon>
+              <div class$="list-item [[getLanguageItemClass_(
+                      item.language.code, prefs.intl.app_locale.value)]]"
+                  on-tap="onLanguageTap_">
+<if expr="not chromeos and not is_win">
+                <div class="start" title="[[item.language.nativeDisplayName]]">
+                  [[item.language.displayName]]
+                </div>
 </if>
-                  </div>
+<if expr="chromeos or is_win">
+                <div title="[[item.language.nativeDisplayName]]">
+                  [[item.language.displayName]]
                 </div>
+                <div class="middle">
+                  <iron-icon icon="done"
+                      hidden$="[[!isProspectiveUILanguage_(
+                          item.language.code, prefs.intl.app_locale.value)]]">
+                  </iron-icon>
+                </div>
+</if>
                 <paper-icon-button icon="settings"
                     on-tap="onShowLanguageDetailTap_"></paper-icon-button>
               </div>
@@ -74,11 +80,13 @@
             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"
-                      hidden$="[[!isCurrentInputMethod_(item.id, languages.currentInputMethod)]]">
+                      hidden$="[[!isCurrentInputMethod_(
+                          item.id, languages.currentInputMethod)]]">
                   </iron-icon>
                 </div>
                 <paper-icon-button icon="settings"></paper-icon-button>
@@ -101,14 +109,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 +138,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>