Bug 1645165 - fix header labels in migration dialog, r=MattN,fluent-reviewers,flod
authorGijs Kruitbosch <gijskruitbosch@gmail.com>
Fri, 12 Jun 2020 12:25:47 +0000
changeset 535446 43dd99f85176b68193e06a61350260a67cd5a794
parent 535445 0dd6203e9edd3fa43517d9d9a64fde100837e11b
child 535447 a6094d1a9dfe8418b6a9688fa3b7518a0c6b6bdb
push id37501
push usernbeleuzu@mozilla.com
push dateSat, 13 Jun 2020 03:21:52 +0000
treeherdermozilla-central@80b6f21783a3 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersMattN, fluent-reviewers, flod
bugs1645165
milestone79.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 1645165 - fix header labels in migration dialog, r=MattN,fluent-reviewers,flod Differential Revision: https://phabricator.services.mozilla.com/D79383
browser/components/migration/content/migration.xhtml
browser/locales/en-US/browser/migration.ftl
python/l10n/fluent_migrations/bug_1645165_migration_header_labels.py
--- a/browser/components/migration/content/migration.xhtml
+++ b/browser/components/migration/content/migration.xhtml
@@ -19,17 +19,17 @@
   <html:link rel="localization" href="browser/migration.ftl"/>
 </linkset>
 
 <script src="chrome://global/content/customElements.js"/>
 <script src="chrome://browser/content/migration/migration.js"/>
 
 <wizard data-branded="true">
   <wizardpage id="importSource" pageid="importSource" next="selectProfile"
-              data-l10n-id="import-source">
+              data-header-label-id="import-source-page-title">
     <description id="importAll" control="importSourceGroup" data-l10n-id="import-from"></description>
     <description id="importBookmarks" control="importSourceGroup" data-l10n-id="import-from-bookmarks" hidden="true" ></description>
 
     <radiogroup id="importSourceGroup" align="start">
 # NB: if you add items to this list, please also assign them a unique migrator ID in MigrationUtils.jsm
       <radio id="firefox"   data-l10n-id="import-from-firefox"/>
 #ifdef XP_WIN 
       <radio id="chromium-edge"      data-l10n-id="import-from-edge"/>
@@ -57,41 +57,41 @@
       <radio id="nothing" data-l10n-id="import-from-nothing" hidden="true"/>
     </radiogroup>
     <label id="noSources" hidden="true" data-l10n-id="no-migration-sources"></label>
     <spacer flex="1"/>
     <description class="header" id="closeSourceBrowser" data-l10n-id="import-close-source-browser" style="visibility:hidden"></description>
   </wizardpage>
 
   <wizardpage id="selectProfile" pageid="selectProfile"
-              data-l10n-id="import-select-profile-title"
+              data-header-label-id="import-select-profile-page-title"
               next="importItems">
     <description control="profiles" data-l10n-id="import-select-profile-description"></description>
 
     <radiogroup id="profiles" align="start"/>
   </wizardpage>
 
   <wizardpage id="importItems" pageid="importItems"
-              data-l10n-id="import-items-title"
+              data-header-label-id="import-items-page-title"
               next="migrating"
               oncommand="MigrationWizard.onImportItemCommand();">
     <description control="dataSources" data-l10n-id="import-items-description"></description>
 
     <vbox id="dataSources" style="overflow: auto; -moz-appearance: listbox" align="start" flex="1" role="group"/>
   </wizardpage>
 
   <wizardpage id="migrating" pageid="migrating"
-              data-l10n-id="import-migrating-title"
+              data-header-label-id="import-migrating-page-title"
               next="done">
     <description control="migratingItems" data-l10n-id="import-migrating-description"></description>
 
     <vbox id="migratingItems" style="overflow: auto;" align="start" role="group"/>
   </wizardpage>
 
   <wizardpage id="done" pageid="done"
-              data-l10n-id="import-done-title">
+              data-header-label-id="import-done-page-title">
     <description control="doneItems" data-l10n-id="import-done-description"></description>
 
     <vbox id="doneItems" style="overflow: auto;" align="start" role="group"/>
   </wizardpage>
 
 </wizard>
 </window>
--- a/browser/locales/en-US/browser/migration.ftl
+++ b/browser/locales/en-US/browser/migration.ftl
@@ -49,35 +49,30 @@ import-from-firefox =
     .label = Firefox
     .accesskey = x
 import-from-360se =
     .label = 360 Secure Browser
     .accesskey = 3
 
 no-migration-sources = No programs that contain bookmarks, history or password data could be found.
 
-import-source =
-    .label = Import Settings and Data
-import-items-title =
-    .label = Items to Import
+import-source-page-title = Import Settings and Data
+import-items-page-title = Items to Import
 
 import-items-description = Select which items to import:
 
-import-migrating-title =
-    .label = Importing…
+import-migrating-page-title = Importing…
 
 import-migrating-description = The following items are currently being imported…
 
-import-select-profile-title =
-    .label = Select Profile
+import-select-profile-page-title = Select Profile
 
 import-select-profile-description = The following profiles are available to import from:
 
-import-done-title =
-    .label = Import Complete
+import-done-page-title = Import Complete
 
 import-done-description = The following items were successfully imported:
 
 import-close-source-browser = Please ensure the selected browser is closed before continuing.
 
 # Displays which browser the bookmarks are being imported from
 #
 # Variables:
copy from python/l10n/fluent_migrations/bug_1643321_migration_data_types.py
copy to python/l10n/fluent_migrations/bug_1645165_migration_header_labels.py
--- a/python/l10n/fluent_migrations/bug_1643321_migration_data_types.py
+++ b/python/l10n/fluent_migrations/bug_1645165_migration_header_labels.py
@@ -3,20 +3,20 @@
 # Any copyright is dedicated to the Public Domain.
 # http://creativecommons.org/publicdomain/zero/1.0/
 
 from __future__ import absolute_import
 from fluent.migrate.helpers import transforms_from
 
 
 def migrate(ctx):
-    """Bug 1643321 - reorganize data type strings for migration from other browsers, part {index}."""
+    """Bug 1645165 - fix header labels in the browser data migration dialog, part {index}."""
 
     ctx.add_transforms(
         "browser/browser/migration.ftl",
         "browser/browser/migration.ftl",
         transforms_from("""
-browser-data-session-checkbox =
-    .label = { COPY_PATTERN(from_path, "browser-data-firefox-128.label") }
-browser-data-session-label =
-    .value = { COPY_PATTERN(from_path, "browser-data-firefox-128.value") }
-
+import-source-page-title = { COPY_PATTERN(from_path, "import-source.label") }
+import-items-page-title = { COPY_PATTERN(from_path, "import-items-title.label") }
+import-migrating-page-title = { COPY_PATTERN(from_path, "import-migrating-title.label") }
+import-select-profile-page-title = { COPY_PATTERN(from_path, "import-select-profile-title.label") }
+import-done-page-title = { COPY_PATTERN(from_path, "import-done-title.label") }
 """, from_path="browser/browser/migration.ftl"))