Bug 1638362 - Rename urlbar-go-end-cap l10n id to urlbar-go-button. r=fluent-reviewers,flod
authorDão Gottwald <dao@mozilla.com>
Fri, 15 May 2020 16:08:22 +0000
changeset 530309 4140e3361afd211d746a536687a60559cd00944f
parent 530308 fe40ddb45918d471f6358c904e30d9667ce06975
child 530310 377751aaad489deeef0562f2d80ee03f23d1746e
push id37420
push usernerli@mozilla.com
push dateFri, 15 May 2020 21:52:36 +0000
treeherdermozilla-central@f340bbb582d1 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersfluent-reviewers, flod
bugs1638362
milestone78.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1638362 - Rename urlbar-go-end-cap l10n id to urlbar-go-button. r=fluent-reviewers,flod Differential Revision: https://phabricator.services.mozilla.com/D75558
browser/base/content/browser.xhtml
browser/locales/en-US/browser/browser.ftl
python/l10n/fluent_migrations/bug_1638362_url_bar_go_button.py
--- a/browser/base/content/browser.xhtml
+++ b/browser/base/content/browser.xhtml
@@ -1003,17 +1003,17 @@
                             aria-autocomplete="both"
                             inputmode="mozAwesomebar"
                             data-l10n-id="urlbar-placeholder"
                             data-l10n-attrs="placeholder"/>
               </moz-input-box>
               <image id="urlbar-go-button"
                      class="urlbar-icon"
                      onclick="gURLBar.handleCommand(event);"
-                     data-l10n-id="urlbar-go-end-cap"/>
+                     data-l10n-id="urlbar-go-button"/>
               <hbox id="page-action-buttons" context="pageActionContextMenu">
                 <toolbartabstop/>
                 <hbox id="contextual-feature-recommendation" role="button" hidden="true">
                   <hbox id="cfr-label-container">
                     <label id="cfr-label"/>
                   </hbox>
                   <image id="cfr-button"
                          class="urlbar-icon urlbar-page-action"
--- a/browser/locales/en-US/browser/browser.ftl
+++ b/browser/locales/en-US/browser/browser.ftl
@@ -246,14 +246,14 @@ urlbar-permissions-granted =
   .tooltiptext = You have granted this website additional permissions.
 urlbar-switch-to-tab =
   .value = Switch to tab:
 
 # Used to indicate that a selected autocomplete entry is provided by an extension.
 urlbar-extension =
   .value = Extension:
 
-urlbar-go-end-cap =
+urlbar-go-button =
   .tooltiptext = Go to the address in the Location Bar
 urlbar-page-action-button =
   .tooltiptext = Page actions
 urlbar-pocket-button =
   .tooltiptext = Save to { -pocket-brand-name }
copy from python/l10n/fluent_migrations/bug_1631122_url_bar.py
copy to python/l10n/fluent_migrations/bug_1638362_url_bar_go_button.py
--- a/python/l10n/fluent_migrations/bug_1631122_url_bar.py
+++ b/python/l10n/fluent_migrations/bug_1638362_url_bar_go_button.py
@@ -1,57 +1,19 @@
 # coding=utf8
 
 # Any copyright is dedicated to the Public Domain.
 # http://creativecommons.org/publicdomain/zero/1.0/
 
 from __future__ import absolute_import
-import fluent.syntax.ast as FTL
-from fluent.migrate import REPLACE
-from fluent.migrate.helpers import COPY, TERM_REFERENCE, transforms_from
+from fluent.migrate.helpers import COPY, transforms_from
 
 def migrate(ctx):
-    """Bug 1631122 - Convert URL bar dtd strings in browser.xhtml to Fluent, part {index}."""
+    """Bug 1638362 - Rename urlbar-go-end-cap l10n id to urlbar-go-button, part {index}."""
 
     ctx.add_transforms(
         "browser/browser/browser.ftl",
         "browser/browser/browser.ftl",
     transforms_from(
 """
-urlbar-default-placeholder =
-    .defaultPlaceholder = { COPY(from_path, "urlbar.placeholder2") }
-urlbar-placeholder =
-    .placeholder = { COPY(from_path, "urlbar.placeholder2") }
-urlbar-remote-control-notification-anchor =
-    .tooltiptext = { COPY(from_path, "urlbar.remoteControlNotificationAnchor.tooltip") }
-urlbar-permissions-granted =
-    .tooltiptext = { COPY(from_path, "urlbar.permissionsGranted.tooltip") }
-urlbar-switch-to-tab =
-    .value = { COPY(from_path, "urlbar.switchToTab.label") }
-urlbar-extension =
-    .value = { COPY(from_path, "urlbar.extension.label") }
-urlbar-go-end-cap =
+urlbar-go-button =
     .tooltiptext = { COPY(from_path, "goEndCap.tooltip") }
-urlbar-page-action-button =
-    .tooltiptext = { COPY(from_path, "pageActionButton.tooltip") }
 """, from_path="browser/chrome/browser/browser.dtd"))
-
-    ctx.add_transforms(
-        "browser/browser/browser.ftl",
-        "browser/browser/browser.ftl",
-        [
-            FTL.Message(
-                id=FTL.Identifier("urlbar-pocket-button"),
-                attributes=[
-                    FTL.Attribute(
-                        id=FTL.Identifier("tooltiptext"),
-                        value=REPLACE(
-                            "browser/chrome/browser/browser.dtd",
-                            "pocketButton.tooltiptext",
-                            {
-                                "Pocket": TERM_REFERENCE("pocket-brand-name"),
-                            }
-                        )
-                    ),
-                ]
-            ),
-        ]
-    )