MD History: Use $i18n expressions instead of i18n- attributes

This means that localization is performed before data is sent to the WebUI client. This CL removes almost all existing i18n-template usage. We still have a small number of more complex strings which are created in JS which are more difficult to convert to the new system. BUG=563884 Review URL: https://codereview.chromium.org/1609683002 Cr-Commit-Position: refs/heads/master@{#381604}

MD History: Use $i18n expressions instead of i18n- attributes
This means that localization is performed before data is sent to the WebUI client. This CL removes almost all existing i18n-template usage. We still have a small number of more complex strings which are created in JS which are more difficult to convert to the new system. BUG=563884 Review URL: https://codereview.chromium.org/1609683002 Cr-Commit-Position: refs/heads/master@{#381604}
63413cfe · tsergeant · Commit bot · 343fd10c · 63413cfe · 63413cfe
Commit 63413cfe authored Mar 16, 2016 by tsergeant Committed by Commit bot Mar 17, 2016
5 changed files
--- a/chrome/browser/resources/md_history/history.html
+++ b/chrome/browser/resources/md_history/history.html
@@ -2,7 +2,7 @@
 <html i18n-values="dir:textdirection;lang:language">
 <head>
  <meta charset="utf8">
-  <title i18n-content="title"></title>
+  <title>$i18n{title}</title>
  <link rel="stylesheet" href="chrome://resources/css/text_defaults_md.css">
@@ -64,7 +64,11 @@
  <script src="history.js"></script>
-  <!-- Prepare strings and perform i18n substitutions. -->
+  <!--
+    Prepare strings and perform i18n substitutions.
+    TODO(tsergeant): Remove once we are fully converted to
+    ReplaceTemplateExpressions. It is currently only used for the <html> tag.
+  -->
  <link rel="import" href="chrome://resources/html/i18n_template.html">
 </body>

--- a/chrome/browser/resources/md_history/history_list.html
+++ b/chrome/browser/resources/md_history/history_list.html
@@ -49,10 +49,11 @@
      </template>
    </iron-list>
    <cr-shared-menu id="sharedMenu">
-      <paper-item i18n-content="moreFromSite" on-tap="onMoreFromSiteTap_">
+      <paper-item on-tap="onMoreFromSiteTap_">
+        $i18n{moreFromSite}
      </paper-item>
-      <paper-item i18n-content="removeFromHistory"
+      <paper-item on-tap="onRemoveFromHistoryTap_">
-          on-tap="onRemoveFromHistoryTap_">
+        $i18n{removeFromHistory}
      </paper-item>
    </cr-shared-menu>
  </template>

--- a/chrome/browser/resources/md_history/history_toolbar.html
+++ b/chrome/browser/resources/md_history/history_toolbar.html
@@ -80,9 +80,9 @@
    </style>
    <div id="toolbar-container">
      <div id="main-content" hidden$="[[itemsSelected_]]">
-        <h1 i18n-content="title" id="title"></h1>
+        <h1 id="title">$i18n{title}</h1>
-        <cr-search-field id="search-input"
+        <cr-search-field id="search-input" label="$i18n{search}"
-            i18n-values="label:search;clear-label:clearSearch">
+            clear-label="$i18n{clearSearch}">
        </cr-search-field>
      </div>
@@ -90,10 +90,12 @@
        <paper-icon-button icon="clear" id="cancel-icon-button"
            on-tap="onClearSelectionTap_"></paper-icon-button>
        <div id="number-selected">[[numberOfItemsSelected_(count)]]</div>
-        <paper-button id="cancel-button" on-tap="onClearSelectionTap_"
+        <paper-button id="cancel-button" on-tap="onClearSelectionTap_">
-            i18n-content="cancel"></paper-button>
+          $i18n{cancel}
-        <paper-button id="delete-button" on-tap="onDeleteTap_"
+        </paper-button>
-            i18n-content="delete"></paper-button>
+        <paper-button id="delete-button" on-tap="onDeleteTap_">
+          $i18n{delete}
+        </paper-button>
      </div>
    </div>
@@ -101,8 +103,8 @@
      <div id="front-padding"></div>
      <div id="centered-buttons" hidden$="[[itemsSelected_]]">
        <paper-button on-tap="onClearBrowsingDataTap_"
-            i18n-content="clearBrowsingData"
            id="clear-browsing-data-button">
+          $i18n{clearBrowsingData}
        </paper-button>
      </div>
      <div id="back-padding"></div>

--- a/chrome/browser/resources/md_history/side_bar.html
+++ b/chrome/browser/resources/md_history/side_bar.html
@@ -36,11 +36,11 @@
    </style>
    <paper-menu id="overflow-menu" selected="0" on-iron-select="onSelect_">
      <paper-item id="history-button">
-        <div i18n-content="historyMenuItem"></div>
+        <div>$i18n{historyMenuItem}</div>
        <paper-ripple></paper-ripple>
      </paper-item>
      <paper-item id="synced-tabs-button">
-        <div i18n-content="openTabsMenuItem"></div>
+        <div>$i18n{openTabsMenuItem}</div>
        <paper-ripple></paper-ripple>
      </paper-item>
    </paper-menu>

--- a/chrome/browser/resources/md_history/synced_device_card.html
+++ b/chrome/browser/resources/md_history/synced_device_card.html
@@ -99,7 +99,7 @@
            </template>
          </template>
          <div class="item-container">
-            <p on-tap="openAllTabs_" id="open-tabs" i18n-content="openAll"></p>
+            <p on-tap="openAllTabs_" id="open-tabs">$i18n{openAll}</p>
          </div>
        </div>
      </iron-collapse>