Bug 834034 - Migrate persdict.dat when resetting Firefox, r=MattN

This commit is contained in:
Gijs Kruitbosch 2013-04-08 14:17:18 -07:00
parent dd752f0f28
commit 4bf143d032
3 changed files with 5 additions and 3 deletions

View File

@ -77,9 +77,10 @@ FirefoxProfileMigrator.prototype.getResources = function() {
let formData = getFileResource(types.FORMDATA, ["formhistory.sqlite"]);
let bookmarksBackups = getFileResource(types.OTHERDATA,
[PlacesUtils.backups.profileRelativeFolderPath]);
let dictionary = getFileResource(types.OTHERDATA, ["persdict.dat"]);
return [r for each (r in [places, cookies, passwords, formData,
bookmarksBackups]) if (r)];
dictionary, bookmarksBackups]) if (r)];
}
Object.defineProperty(FirefoxProfileMigrator.prototype, "startupOnlyMigrator", {

View File

@ -405,7 +405,8 @@ this.MigrationUtils = Object.freeze({
*/
getLocalizedString: function MU_getLocalizedString(aKey, aReplacements) {
const OVERRIDES = {
"4_firefox": "4_firefox_history_and_bookmarks"
"4_firefox": "4_firefox_history_and_bookmarks",
"64_firefox": "64_firefox_other"
};
aKey = OVERRIDES[aKey] || aKey;

View File

@ -48,4 +48,4 @@ importedSafariReadingList=Reading List (From Safari)
64_ie=Other Data
64_safari=Other Data
64_chrome=Other Data
64_firefox=Bookmarks Backups
64_firefox_other=Other Data