corysanin/tubestation
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Bug 1965231 - Move new migration wizard strings for Chrome password import out of preview. r=migration-reviewers,fluent-reviewers,fxview-reviewers,omc-reviewers,nsharpley,Gijs,bolsson,pdahiya

Browse Source 
Differential Revision: https://phabricator.services.mozilla.com/D248430
This commit is contained in:
Mike Conley
2025-05-09 17:27:48 +00:00
committed by mconley@mozilla.com
parent 1126b77237
commit e912c215de
10 changed files with 36 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
browser/base/content/spotlight.html
View File

@@ -23,7 +23,6 @@
<link rel="localization" href="browser/newtab/onboarding.ftl" />
<link rel="localization" href="browser/spotlight.ftl" />
<link rel="localization" href="browser/migrationWizard.ftl" />
<link rel="localization" href="preview/migrationWizardChromeWindows.ftl" />
<link rel="localization" href="browser/preonboarding.ftl" />
</head>
<body

1
browser/components/aboutwelcome/content/aboutwelcome.html
View File

@@ -27,7 +27,6 @@
<link rel="localization" href="browser/newtab/onboarding.ftl" />
<link rel="localization" href="browser/spotlight.ftl" />
<link rel="localization" href="browser/migrationWizard.ftl" />
<link rel="localization" href="preview/migrationWizardChromeWindows.ftl" />
<link rel="localization" href="toolkit/branding/brandings.ftl" />
</head>
<body>

1
browser/components/firefoxview/firefoxview.html
View File

@@ -18,7 +18,6 @@
<link rel="localization" href="toolkit/global/textActions.ftl" />
<link rel="localization" href="toolkit/branding/brandings.ftl" />
<link rel="localization" href="browser/migrationWizard.ftl" />
<link rel="localization" href="preview/migrationWizardChromeWindows.ftl" />
<link
rel="stylesheet"
href="chrome://browser/content/firefoxview/firefoxview.css"

8
browser/components/migration/ChromeProfileMigrator.sys.mjs
View File

@@ -188,13 +188,7 @@ export class ChromeProfileMigrator extends MigratorBase {
* @returns {boolean}
*/
get showsManualPasswordImport() {
// We show the CSV workflow on Windows, but _only_ in English locales, until
// bug 1965231 is closed.
return (
AppConstants.platform == "win" &&
this.constructor.key == "chrome" &&
Services.locale.appLocaleAsBCP47.startsWith("en")
);
return AppConstants.platform == "win" && this.constructor.key == "chrome";
}
_keychainServiceName = "Chrome Safe Storage";

3
browser/components/migration/MigrationWizardChild.sys.mjs
View File

@@ -332,8 +332,7 @@ export class MigrationWizardChild extends JSWindowActorChild {
return;
} else if (
migrationDetails.key == "chrome" &&
AppConstants.platform == "win" &&
Services.locale.appLocaleAsBCP47.startsWith("en")
AppConstants.platform == "win"
) {
this.#sendTelemetryEvent("chromePasswordFile");
this.setComponentState({

7
browser/components/migration/content/migration-wizard.mjs
View File

@@ -244,8 +244,8 @@ export class MigrationWizard extends HTMLElement {
</li>
</ol>
<moz-button-group class="buttons" part="buttons">
<button class="manual-password-import-skip" data-l10n-id="migration-safari-password-import-skip-button"></button>
<button class="manual-password-import-select primary" data-l10n-id="migration-safari-password-import-select-button"></button>
<button class="manual-password-import-skip" data-l10n-id="migration-manual-password-import-skip-button"></button>
<button class="manual-password-import-select primary" data-l10n-id="migration-manual-password-import-select-button"></button>
</moz-button-group>
</div>
@@ -316,9 +316,6 @@ export class MigrationWizard extends HTMLElement {
if (window.MozXULElement) {
window.MozXULElement.insertFTLIfNeeded("branding/brand.ftl");
window.MozXULElement.insertFTLIfNeeded("browser/migrationWizard.ftl");
window.MozXULElement.insertFTLIfNeeded(
"preview/migrationWizardChromeWindows.ftl"
);
}
document.l10n.connectRoot(shadow);

13
browser/locales-preview/migrationWizardChromeWindows.ftl
View File

@@ -1,13 +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-chrome-windows-password-import-header = How to import passwords from Chrome
migration-chrome-windows-password-import-steps-header = In Chrome:
migration-chrome-windows-password-import-step1 = Open the main menu <img data-l10n-name="chrome-icon-3dots"/> and go to Passwords and Autofill > Google Password Manager.
migration-chrome-windows-password-import-step2 = Select “Settings” from the menu.
migration-chrome-windows-password-import-step3 = Choose “Download file” and save it to your device.
migration-chrome-windows-password-import-step4 = Return here and “Select File” to finish import.
migration-manual-password-import-skip-button = Skip
migration-manual-password-import-select-button = Select File

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

@@ -219,9 +219,16 @@ migration-safari-password-import-step1 = In Safari, open “Safari” menu and g
migration-safari-password-import-step2 = Select the <img data-l10n-name="safari-icon-3dots"/> button and choose “Export All Passwords”
migration-safari-password-import-step3 = Save the passwords file
migration-safari-password-import-step4 = Use “Select File” below to choose the passwords file you saved
migration-safari-password-import-skip-button = Skip
migration-safari-password-import-select-button = Select File
migration-chrome-windows-password-import-header = How to import passwords from Chrome
migration-chrome-windows-password-import-steps-header = In Chrome:
migration-chrome-windows-password-import-step1 = Open the main menu <img data-l10n-name="chrome-icon-3dots"/> and go to Passwords and Autofill > Google Password Manager.
migration-chrome-windows-password-import-step2 = Select “Settings” from the menu.
migration-chrome-windows-password-import-step3 = Choose “Download file” and save it to your device.
migration-chrome-windows-password-import-step4 = Return here and “Select File” to finish import.
migration-manual-password-import-skip-button = Skip
migration-manual-password-import-select-button = Select File
# Shown in the migration wizard after importing bookmarks from another
# browser has completed.

1
browser/locales/jar.mn
View File

@@ -20,7 +20,6 @@
preview/linkPreview.ftl (../locales-preview/linkPreview.ftl)
preview/smartTabGroups.ftl (../locales-preview/smartTabGroups.ftl)
preview/taskbartabs.ftl (../locales-preview/taskbartabs.ftl)
preview/migrationWizardChromeWindows.ftl (../locales-preview/migrationWizardChromeWindows.ftl)
@AB_CD@.jar:
% locale browser @AB_CD@ %locale/browser/

23
python/l10n/fluent_migrations/bug_1960560_migration_wizard_manual_password_import.py Normal file
View File

@@ -0,0 +1,23 @@
# 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 1960560 - Generalize IDs of strings for migration wizard manual password import, part {index}."""
source = "browser/browser/migrationWizard.ftl"
target = source
ctx.add_transforms(
target,
target,
transforms_from(
"""
migration-manual-password-import-skip-button = {COPY_PATTERN(from_path, "migration-safari-password-import-skip-button")}
migration-manual-password-import-select-button = {COPY_PATTERN(from_path, "migration-safari-password-import-select-button")}
""",
from_path=source,
),
)