4 https://bugzilla.novell.com/show_bug.cgi?id=501724 |
4 https://bugzilla.novell.com/show_bug.cgi?id=501724 |
5 |
5 |
6 diff --git a/browser/components/preferences/main.js b/browser/components/preferences/main.js |
6 diff --git a/browser/components/preferences/main.js b/browser/components/preferences/main.js |
7 --- a/browser/components/preferences/main.js |
7 --- a/browser/components/preferences/main.js |
8 +++ b/browser/components/preferences/main.js |
8 +++ b/browser/components/preferences/main.js |
9 @@ -344,7 +344,7 @@ var gMainPane = { |
9 @@ -290,17 +290,17 @@ var gMainPane = { |
|
10 // and was available as an option in the 1.5 drop down. On XP this |
|
11 // was in My Documents, on OSX it was in User Docs. In 2.0, we did |
|
12 // away with the drop down option, although the special label was |
|
13 // still supported for the folder if it existed. Because it was |
|
14 // not exposed it was rarely used. |
10 // With 3.0, a new desktop folder - 'Downloads' was introduced for |
15 // With 3.0, a new desktop folder - 'Downloads' was introduced for |
11 // platforms and versions that don't support a default system downloads |
16 // platforms and versions that don't support a default system downloads |
12 // folder. See nsDownloadManager for details. |
17 // folder. See nsDownloadManager for details. |
13 - downloadFolder.label = bundlePreferences.getString("downloadsFolderName"); |
18 - downloadFolder.label = bundlePreferences.getString("downloadsFolderName"); |
14 + downloadFolder.label = "Downloads"; |
19 + downloadFolder.label = "Downloads"; |
15 iconUrlSpec = fph.getURLSpecFromFile(this._indexToFolder(1)); |
20 iconUrlSpec = fph.getURLSpecFromFile(this._indexToFolder(1)); |
16 } else { |
21 } else { |
17 // 'Desktop' |
22 // 'Desktop' |
|
23 downloadFolder.label = bundlePreferences.getString("desktopFolderName"); |
|
24 iconUrlSpec = fph.getURLSpecFromFile(this._getDownloadsFolder("Desktop")); |
|
25 } |
|
26 downloadFolder.image = "moz-icon://" + iconUrlSpec + "?size=16"; |
|
27 |
18 diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/components/downloads/nsDownloadManager.cpp |
28 diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/components/downloads/nsDownloadManager.cpp |
19 --- a/toolkit/components/downloads/nsDownloadManager.cpp |
29 --- a/toolkit/components/downloads/nsDownloadManager.cpp |
20 +++ b/toolkit/components/downloads/nsDownloadManager.cpp |
30 +++ b/toolkit/components/downloads/nsDownloadManager.cpp |
21 @@ -1269,8 +1269,10 @@ nsDownloadManager::GetDefaultDownloadsDi |
31 @@ -1365,18 +1365,20 @@ nsDownloadManager::GetDefaultDownloadsDi |
|
32 // Vista: |
|
33 // Downloads |
|
34 // XP/2K: |
|
35 // My Documents/Downloads |
|
36 // Linux: |
22 // XDG user dir spec, with a fallback to Home/Downloads |
37 // XDG user dir spec, with a fallback to Home/Downloads |
23 |
38 |
24 nsXPIDLString folderName; |
39 nsXPIDLString folderName; |
25 - mBundle->GetStringFromName(NS_LITERAL_STRING("downloadsFolder").get(), |
40 - mBundle->GetStringFromName(MOZ_UTF16("downloadsFolder"), |
26 - getter_Copies(folderName)); |
41 - getter_Copies(folderName)); |
27 + // We don't want localized "Downloads" unless XDG is used |
42 + // We don't want localized "Downloads" unless XDG is used |
28 + //mBundle->GetStringFromName(NS_LITERAL_STRING("downloadsFolder").get(), |
43 + //mBundle->GetStringFromName(NS_LITERAL_STRING("downloadsFolder").get(), |
29 + // getter_Copies(folderName)); |
44 + // getter_Copies(folderName)); |
30 + folderName.AssignLiteral("Downloads"); |
45 + folderName.AssignLiteral("Downloads"); |
31 |
46 |
32 #if defined (XP_MACOSX) |
47 #if defined (XP_MACOSX) |
33 rv = dirService->Get(NS_OSX_DEFAULT_DOWNLOAD_DIR, |
48 rv = dirService->Get(NS_OSX_DEFAULT_DOWNLOAD_DIR, |
|
49 NS_GET_IID(nsIFile), |
|
50 getter_AddRefs(downloadDir)); |
|
51 NS_ENSURE_SUCCESS(rv, rv); |
|
52 #elif defined(XP_WIN) |
|
53 rv = dirService->Get(NS_WIN_DEFAULT_DOWNLOAD_DIR, |