Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2024-11-24 13:21:05 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 1860606 - Get rid of migration.ftl in favour of migrationWizard.ftl. r=kpatenio,fluent-reviewers,bolsson

Browse Source 
migration.ftl was used by the old, legacy XUL migration dialog that was removed
in bug 1824851.

There were still a few strings being used by migration.ftl, but I've moved those
over to migrationWizard.ftl, and gone ahead and just removed the old file.

Differential Revision: https://phabricator.services.mozilla.com/D192509
This commit is contained in:
Mike Conley 2023-11-02 22:03:26 +00:00
parent 2b95800b49
commit 3ecc7966f4
9 changed files with 40 additions and 178 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
browser/components/migration/EdgeProfileMigrator.sys.mjs
View File

@ -332,7 +332,7 @@ EdgeReadingListMigrator.prototype = {
async _ensureReadingListFolder(parentGuid) {
if (!this.__readingListFolderGuid) {
let folderTitle = await MigrationUtils.getLocalizedString(
"imported-edge-reading-list"
"migration-imported-edge-reading-list"
);
let folderSpec = {
type: lazy.PlacesUtils.bookmarks.TYPE_FOLDER,

2
browser/components/migration/MigrationUtils.sys.mjs
View File

@ -38,7 +38,7 @@ let gUndoData = null;
function getL10n() {
if (!gL10n) {
gL10n = new Localization(["browser/migration.ftl"]);
gL10n = new Localization(["browser/migrationWizard.ftl"]);
}
return gL10n;
}

2
browser/components/migration/SafariProfileMigrator.sys.mjs
View File

@ -207,7 +207,7 @@ Bookmarks.prototype = {
// They are imported under their own folder, created either under the
// bookmarks menu (in the case of startup migration).
let readingListTitle = await MigrationUtils.getLocalizedString(
"imported-safari-reading-list"
"migration-imported-safari-reading-list"
);
folderGuid = (
await MigrationUtils.insertBookmarkWrapper({

2
browser/components/migration/tests/unit/test_Edge_db_migration.js
View File

@ -805,7 +805,7 @@ add_task(async function () {
"Telemetry should have items"
);
let readingListContainerLabel = await MigrationUtils.getLocalizedString(
"imported-edge-reading-list"
"migration-imported-edge-reading-list"
);
for (let bookmark of seenBookmarks) {

4
browser/components/newtab/aboutwelcome/lib/AboutWelcomeDefaults.jsm
View File

@ -788,10 +788,10 @@ let gSourceL10n = null;
const allowedUAs = ["chrome", "edge", "ie"];
function getLocalizedUA(ua) {
if (!gSourceL10n) {
gSourceL10n = new Localization(["browser/migration.ftl"]);
gSourceL10n = new Localization(["browser/migrationWizard.ftl"]);
}
if (allowedUAs.includes(ua)) {
return gSourceL10n.formatValue(`source-name-${ua.toLowerCase()}`);
return gSourceL10n.formatValue(`migration-source-name-${ua.toLowerCase()}`);
}
return null;
}

170
browser/locales/en-US/browser/migration.ftl
View File

@ -1,170 +0,0 @@
# This Source Code Form is subject to the terms of the Mozilla Public
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
migration-wizard =
.title = Import Wizard
import-from =
{ PLATFORM() ->
[windows] Import Options, Bookmarks, History, Passwords and other data from:
*[other] Import Preferences, Bookmarks, History, Passwords and other data from:
}
import-from-bookmarks = Import Bookmarks from:
import-from-ie =
.label = Microsoft Internet Explorer
.accesskey = M
import-from-edge =
.label = Microsoft Edge
.accesskey = E
import-from-edge-legacy =
.label = Microsoft Edge Legacy
.accesskey = L
import-from-edge-beta =
.label = Microsoft Edge Beta
.accesskey = d
import-from-nothing =
.label = Don’t import anything
.accesskey = D
import-from-safari =
.label = Safari
.accesskey = S
import-from-opera =
.label = Opera
.accesskey = O
import-from-vivaldi =
.label = Vivaldi
.accesskey = V
import-from-brave =
.label = Brave
.accesskey = r
import-from-canary =
.label = Chrome Canary
.accesskey = n
import-from-chrome =
.label = Chrome
.accesskey = C
import-from-chrome-beta =
.label = Chrome Beta
.accesskey = B
import-from-chrome-dev =
.label = Chrome Dev
.accesskey = D
import-from-chromium =
.label = Chromium
.accesskey = u
import-from-firefox =
.label = Firefox
.accesskey = x
import-from-360se =
.label = 360 Secure Browser
.accesskey = 3
import-from-opera-gx =
.label = Opera GX
.accesskey = G
no-migration-sources = No programs that contain bookmarks, history or password data could be found.
import-source-page-title = Import Settings and Data
import-items-page-title = Items to Import
import-items-description = Select which items to import:
import-permissions-page-title = Please give { -brand-short-name } permissions
# Do not translate "Safari" (the name of the browser on Apple devices)
import-safari-permissions-string = macOS requires you to explicitly allow { -brand-short-name } to access Safari’s data. Click “Continue”, select the “Safari“ folder in the Finder dialog that appears and then click “Open”.
import-migrating-page-title = Importing…
import-migrating-description = The following items are currently being imported…
import-select-profile-page-title = Select Profile
import-select-profile-description = The following profiles are available to import from:
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.
source-name-ie = Internet Explorer
source-name-edge = Microsoft Edge
source-name-chrome = Google Chrome
imported-safari-reading-list = Reading List (From Safari)
imported-edge-reading-list = Reading List (From Edge)
## Browser data types
## All of these strings get a $browser variable passed in.
## You can use the browser variable to differentiate the name of items,
## which may have different labels in different browsers.
## The supported values for the $browser variable are:
## 360se
## chrome
## edge
## firefox
## ie
## safari
## The various beta and development versions of edge and chrome all get
## normalized to just "edge" and "chrome" for these strings.
browser-data-cookies-checkbox =
.label = Cookies
browser-data-cookies-label =
.value = Cookies
browser-data-history-checkbox =
.label = { $browser ->
[firefox] Browsing History and Bookmarks
*[other] Browsing History
}
browser-data-history-label =
.value = { $browser ->
[firefox] Browsing History and Bookmarks
*[other] Browsing History
}
browser-data-formdata-checkbox =
.label = Saved Form History
browser-data-formdata-label =
.value = Saved Form History
# This string should use the same phrase for "logins and passwords" as the
# label in the main hamburger menu that opens about:logins.
browser-data-passwords-checkbox =
.label = Saved Logins and Passwords
# This string should use the same phrase for "logins and passwords" as the
# label in the main hamburger menu that opens about:logins.
browser-data-passwords-label =
.value = Saved Logins and Passwords
browser-data-bookmarks-checkbox =
.label = { $browser ->
[ie] Favorites
[edge] Favorites
*[other] Bookmarks
}
browser-data-bookmarks-label =
.value = { $browser ->
[ie] Favorites
[edge] Favorites
*[other] Bookmarks
}
browser-data-otherdata-checkbox =
.label = Other Data
browser-data-otherdata-label =
.label = Other Data
browser-data-session-checkbox =
.label = Windows and Tabs
browser-data-session-label =
.value = Windows and Tabs
browser-data-payment-methods-checkbox =
.label = Payment methods
browser-data-payment-methods-label =
.value = Payment methods

7
browser/locales/en-US/browser/migrationWizard.ftl
View File

@ -45,6 +45,13 @@ migration-wizard-migrator-display-name-opera-gx = Opera GX
migration-wizard-migrator-display-name-safari = Safari
migration-wizard-migrator-display-name-vivaldi = Vivaldi
migration-source-name-ie = Internet Explorer
migration-source-name-edge = Microsoft Edge
migration-source-name-chrome = Google Chrome
migration-imported-safari-reading-list = Reading List (From Safari)
migration-imported-edge-reading-list = Reading List (From Edge)
## These strings are shown if the selected browser data directory is unreadable.
## In practice, this tends to only occur on Linux when Firefox
## is installed as a Snap.

27
python/l10n/fluent_migrations/bug_1860606_remove_migration_ftl.py Normal file
View File

@ -0,0 +1,27 @@
# Any copyright is dedicated to the Public Domain.
# http://creativecommons.org/publicdomain/zero/1.0/
from fluent.migrate.helpers import transforms_from
def migrate(ctx):
"""Bug 1860606 - Get rid of migration.ftl in favour of migrationWizard.ftl, part {index}."""
source = "browser/browser/migration.ftl"
target = "browser/browser/migrationWizard.ftl"
ctx.add_transforms(
target,
target,
transforms_from(
"""
migration-source-name-ie = {COPY_PATTERN(from_path, "source-name-ie")}
migration-source-name-edge = {COPY_PATTERN(from_path, "source-name-edge")}
migration-source-name-chrome = {COPY_PATTERN(from_path, "source-name-chrome")}
migration-imported-safari-reading-list = {COPY_PATTERN(from_path, "imported-safari-reading-list")}
migration-imported-edge-reading-list = {COPY_PATTERN(from_path, "imported-edge-reading-list")}
""",
from_path=source,
),
)

2
tools/lint/fluent-lint/exclusions.yml
View File

@ -142,8 +142,6 @@ CO01:
# browser/locales/en-US/browser/browser.ftl
- identity-custom-root
- identity-description-custom-root2
# browser/locales/en-US/browser/migration.ftl
- import-from-firefox
# browser/locales/en-US/browser/migrationWizard.ftl
- migration-wizard-migrator-display-name-firefox
# browser/locales/en-US/browser/newtab/onboarding.ftl