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

Bug 749931 - "Migration to a clean Firefox profile" feature doesn't suggest browser history migration. r=Mano

Browse Source 
--HG--
extra : rebase_source : 5bc07d455e62b110dac344645dd06c8eec3d2604
This commit is contained in:
Matthew Noorenberghe 2012-05-04 15:51:00 -07:00
parent 3cda5d59c6
commit 9620290053
2 changed files with 3 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
browser/locales/en-US/chrome/browser/migration/migration.properties
View File

@ -42,7 +42,6 @@ importedSafariReadingList=Reading List (From Safari)
32_ie=Favorites
32_safari=Bookmarks
32_chrome=Bookmarks
32_firefox=Bookmarks
64_ie=Other Data
64_safari=Other Data

7
toolkit/content/resetProfile.js
View File

@ -51,13 +51,12 @@ function resetSupported() {
}
function getMigratedData() {
Components.utils.import("resource:///modules/MigrationUtils.jsm");
#expand const MOZ_BUILD_APP = "__MOZ_BUILD_APP__";
#expand const MOZ_APP_NAME = "__MOZ_APP_NAME__";
const MAX_MIGRATED_TYPES = 16;
let bundle = Services.strings.createBundle("chrome://" + MOZ_BUILD_APP +
"/locale/migration/migration.properties");
// Loop over possible data to migrate to give the user a list of what will be preserved. This
// assumes that if the string for the data exists, then it will be migrated because calling
// getMigrateData now won't give the correct result.
@ -65,7 +64,7 @@ function getMigratedData() {
for (let i = 1; i < MAX_MIGRATED_TYPES; ++i) {
let itemID = Math.pow(2, i);
try {
let typeName = bundle.GetStringFromName(itemID + "_" + MOZ_APP_NAME);
let typeName = MigrationUtils.getLocalizedString(itemID + "_" + MOZ_APP_NAME);
dataTypes.push(typeName);
} catch (x) {
// Catch exceptions when the string for a data type doesn't exist because it's not migrated