OLD | NEW |
---|---|
1 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> | 1 <link rel="import" href="chrome://resources/html/i18n_behavior.html"> |
2 <link rel="import" href="chrome://resources/html/md_select_css.html"> | 2 <link rel="import" href="chrome://resources/html/md_select_css.html"> |
3 <link rel="import" href="chrome://resources/html/polymer.html"> | 3 <link rel="import" href="chrome://resources/html/polymer.html"> |
4 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html"> | 4 <link rel="import" href="chrome://resources/polymer/v1_0/neon-animation/neon-ani matable.html"> |
5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> | 5 <link rel="import" href="chrome://resources/polymer/v1_0/paper-button/paper-butt on.html"> |
6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html"> | 6 <link rel="import" href="chrome://resources/polymer/v1_0/paper-icon-button/paper -icon-button-light.html"> |
7 <link rel="import" href="../controls/extension_controlled_indicator.html"> | 7 <link rel="import" href="../controls/extension_controlled_indicator.html"> |
8 <link rel="import" href="../controls/settings_toggle_button.html"> | 8 <link rel="import" href="../controls/settings_toggle_button.html"> |
9 <link rel="import" href="../icons.html"> | 9 <link rel="import" href="../icons.html"> |
10 <link rel="import" href="../i18n_setup.html"> | 10 <link rel="import" href="../i18n_setup.html"> |
(...skipping 88 matching lines...) Expand 10 before | Expand all | Expand 10 after Loading... | |
99 <template is="dom-if" | 99 <template is="dom-if" |
100 if="[[getShowHotwordError_(hotwordInfo_.*, | 100 if="[[getShowHotwordError_(hotwordInfo_.*, |
101 hotwordSearchEnablePref_)]]"> | 101 hotwordSearchEnablePref_)]]"> |
102 <div class="settings-box continuation indented"> | 102 <div class="settings-box continuation indented"> |
103 <iron-icon icon="settings:warning"></iron-icon> | 103 <iron-icon icon="settings:warning"></iron-icon> |
104 <div inner-h-t-m-l="[[hotwordInfo_.errorMessage]]"></div> | 104 <div inner-h-t-m-l="[[hotwordInfo_.errorMessage]]"></div> |
105 </div> | 105 </div> |
106 </template> | 106 </template> |
107 | 107 |
108 <template is="dom-if" if="[[hotwordInfo_.historyEnabled]]"> | 108 <template is="dom-if" if="[[hotwordInfo_.historyEnabled]]"> |
109 <div class="settings-box two-line continuation indented" | 109 <a class="settings-box two-line continuation indented" |
110 on-tap="onManageAudioHistoryTap_" actionable> | 110 actionable tabindex="-1" target="_blank" |
111 href="$i18nRaw{manageAudioHistoryUrl}"> | |
Dan Beam
2017/04/20 00:28:35
why are you using $i18nRaw{}? in case there's a &
scottchen
2017/04/20 18:41:49
Yep, as dschuyler@ reminded me.
Dan Beam
2017/04/20 18:44:46
<archer>
you can...
but there's not
https://cs.c
scottchen
2017/04/20 21:48:34
Acknowledged. I went ahead and changed this to $i1
| |
111 <div class="start"> | 112 <div class="start"> |
112 [[i18n('searchOkGoogleAudioHistoryLabel', | 113 [[i18n('searchOkGoogleAudioHistoryLabel', |
113 hotwordInfo_.userName)]] | 114 hotwordInfo_.userName)]] |
114 <div class="secondary" id="audioHistorySecondary"> | 115 <div class="secondary" id="audioHistorySecondary"> |
115 $i18n{searchOkGoogleAudioHistorySubtext} | 116 $i18n{searchOkGoogleAudioHistorySubtext} |
116 </div> | 117 </div> |
117 </div> | 118 </div> |
118 <button class="icon-external" is="paper-icon-button-light" | 119 <button class="icon-external" is="paper-icon-button-light" |
119 aria-label$="[[i18n('searchOkGoogleAudioHistoryLabel', | 120 aria-label$="[[i18n('searchOkGoogleAudioHistoryLabel', |
120 hotwordInfo_.userName)]]" | 121 hotwordInfo_.userName)]]" |
121 aria-describedby="audioHistorySecondary"></button> | 122 aria-describedby="audioHistorySecondary"></button> |
122 </div> | 123 </a> |
123 </template> | 124 </template> |
124 </template> | 125 </template> |
125 | 126 |
126 <!-- Manage search engines --> | 127 <!-- Manage search engines --> |
127 <div id="subpage-trigger" class="settings-box" | 128 <div id="subpage-trigger" class="settings-box" |
128 on-tap="onManageSearchEnginesTap_" actionable> | 129 on-tap="onManageSearchEnginesTap_" actionable> |
129 <div class="start"> | 130 <div class="start"> |
130 $i18n{searchEnginesManage} | 131 $i18n{searchEnginesManage} |
131 </div> | 132 </div> |
132 <button class="subpage-arrow" is="paper-icon-button-light" | 133 <button class="subpage-arrow" is="paper-icon-button-light" |
133 aria-label="$i18n{searchEnginesManage}"></button> | 134 aria-label="$i18n{searchEnginesManage}"></button> |
134 </div> | 135 </div> |
135 </neon-animatable> | 136 </neon-animatable> |
136 <template is="dom-if" route-path="/searchEngines"> | 137 <template is="dom-if" route-path="/searchEngines"> |
137 <settings-subpage | 138 <settings-subpage |
138 associated-control="[[$$('#subpage-trigger')]]" | 139 associated-control="[[$$('#subpage-trigger')]]" |
139 page-title="$i18n{searchEnginesManage}"> | 140 page-title="$i18n{searchEnginesManage}"> |
140 <settings-search-engines-page></settings-search-engines-page> | 141 <settings-search-engines-page></settings-search-engines-page> |
141 </settings-subpage> | 142 </settings-subpage> |
142 </template> | 143 </template> |
143 </settings-animated-pages> | 144 </settings-animated-pages> |
144 </template> | 145 </template> |
145 <script src="search_page.js"></script> | 146 <script src="search_page.js"></script> |
146 </dom-module> | 147 </dom-module> |
OLD | NEW |