PDF Viewer: Add strings to two-page view menu

Bug: 1084620
Change-Id: I90e303699df432f20ebb81d47587bff47419feb0
Reviewed-on: https://chromium-review.googlesource.com/c/chromium/src/+/2317824Reviewed-by: Lei Zhang <thestig@chromium.org>
Reviewed-by: dpapad <dpapad@chromium.org>
Commit-Queue: John Lee <johntlee@chromium.org>
Cr-Commit-Position: refs/heads/master@{#792026}

chrome/browser/pdf/pdf_extension_util.cc

@@ -37,10 +37,10 @@ void AddCommonStrings(base::Value* dict) {
       {"pageReload", IDS_PDF_PAGE_RELOAD_BUTTON},
       {"tooltipFitToPage", IDS_PDF_TOOLTIP_FIT_PAGE},
       {"tooltipFitToWidth", IDS_PDF_TOOLTIP_FIT_WIDTH},
-      {"tooltipTwoUpViewDisable", IDS_PDF_TOOLTIP_TWO_UP_VIEW_DISABLE},
-      {"tooltipTwoUpViewEnable", IDS_PDF_TOOLTIP_TWO_UP_VIEW_ENABLE},
       {"tooltipZoomIn", IDS_PDF_TOOLTIP_ZOOM_IN},
       {"tooltipZoomOut", IDS_PDF_TOOLTIP_ZOOM_OUT},
+      {"twoUpViewDisable", IDS_PDF_TWO_UP_VIEW_DISABLE},
+      {"twoUpViewEnable", IDS_PDF_TWO_UP_VIEW_ENABLE},
   };
   for (const auto& resource : kPdfResources)
     dict->SetStringKey(resource.name, l10n_util::GetStringUTF16(resource.id));

chrome/browser/resources/pdf/elements/viewer-pdf-toolbar-new.html

@@ -192,14 +192,14 @@
     <span class="check-container">
       <iron-icon icon="pdf:check" hidden="[[twoUpViewEnabled_]]"></iron-icon>
     </span>
-    Single page view
+    $i18n{twoUpViewDisable}
   </button>
   <button id="two-page-view-button"
       class="dropdown-item" on-click="onTwoPageViewClick_">
     <span class="check-container">
       <iron-icon icon="pdf:check" hidden="[[!twoUpViewEnabled_]]"></iron-icon>
     </span>
-    Two page view
+    $i18n{twoUpViewEnable}
   </button>
 </cr-action-menu>
 

components/pdf_strings.grdp

@@ -55,14 +55,11 @@
     <message name="IDS_PDF_TOOLTIP_FIT_WIDTH" desc="Button tooltip for the button which zooms a PDF so that the width of a single page fills the window horizontally">
       Fit to width
     </message>
-    <!-- TODO(nigi): Remove the translateable="false" attributes for messages
-    IDS_PDF_TOOLTIP_TWO_UP_VIEW_ENABLE and IDS_PDF_TOOLTIP_TWO_UP_VIEW_DISABLE
-    once their tooltips are finalized. -->
-    <message name="IDS_PDF_TOOLTIP_TWO_UP_VIEW_ENABLE" desc="Button tooltip for the button which enables displaying two pages of a PDF on the screen horizontally" translateable="false">
-      Enable two-up view
-    </message>
-    <message name="IDS_PDF_TOOLTIP_TWO_UP_VIEW_DISABLE" desc="Button tooltip for the button which stops displaying two pages of a PDF on the screen horizontally" translateable="false">
-      Disable two-up view
+    <message name="IDS_PDF_TWO_UP_VIEW_ENABLE" desc="Button text for the button which enables displaying two pages of a PDF on the screen horizontally">
+      Two page view
+    </message>
+    <message name="IDS_PDF_TWO_UP_VIEW_DISABLE" desc="Button text for the button which stops displaying two pages of a PDF on the screen horizontally">
+      Single page view
     </message>
     <message name="IDS_PDF_TOOLTIP_ZOOM_IN" desc="Button tooltip for the button which zooms in a PDF, so that the document appears larger">
       Zoom in

components/pdf_strings_grdp/IDS_PDF_TWO_UP_VIEW_DISABLE.png.sha1

+c947bd9cda772b4f1933139637fe856acf4b094b
\ No newline at end of file

components/pdf_strings_grdp/IDS_PDF_TWO_UP_VIEW_ENABLE.png.sha1

+15ad484607a7789c934b8d3642a06da54fba47cd
\ No newline at end of file