author | Wolfgang Rosenauer <wr@rosenauer.org> |
Tue, 18 Mar 2014 22:53:41 +0100 | |
branch | esr24 |
changeset 713 | 3c7719dfcafa |
parent 251 | 4c9ebbedd59c |
child 716 | cef565f1c325 |
permissions | -rw-r--r-- |
0 | 1 |
From: Wolfgang Rosenauer |
2 |
Subject: Don't use localized Downloads unless XDG is set up |
|
3 |
References: |
|
4 |
https://bugzilla.novell.com/show_bug.cgi?id=501724 |
|
5 |
||
6 |
diff --git a/browser/components/preferences/main.js b/browser/components/preferences/main.js |
|
7 |
--- a/browser/components/preferences/main.js |
|
8 |
+++ b/browser/components/preferences/main.js |
|
9 |
@@ -344,7 +344,7 @@ var gMainPane = { |
|
10 |
// With 3.0, a new desktop folder - 'Downloads' was introduced for |
|
11 |
// platforms and versions that don't support a default system downloads |
|
12 |
// folder. See nsDownloadManager for details. |
|
13 |
- downloadFolder.label = bundlePreferences.getString("downloadsFolderName"); |
|
14 |
+ downloadFolder.label = "Downloads"; |
|
15 |
iconUrlSpec = fph.getURLSpecFromFile(this._indexToFolder(1)); |
|
16 |
} else { |
|
17 |
// 'Desktop' |
|
251
4c9ebbedd59c
adopt patches to new base
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
0
diff
changeset
|
18 |
diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/components/downloads/nsDownloadManager.cpp |
4c9ebbedd59c
adopt patches to new base
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
0
diff
changeset
|
19 |
--- a/toolkit/components/downloads/nsDownloadManager.cpp |
4c9ebbedd59c
adopt patches to new base
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
0
diff
changeset
|
20 |
+++ b/toolkit/components/downloads/nsDownloadManager.cpp |
0 | 21 |
@@ -1269,8 +1269,10 @@ nsDownloadManager::GetDefaultDownloadsDi |
22 |
// XDG user dir spec, with a fallback to Home/Downloads |
|
23 |
||
24 |
nsXPIDLString folderName; |
|
25 |
- mBundle->GetStringFromName(NS_LITERAL_STRING("downloadsFolder").get(), |
|
26 |
- getter_Copies(folderName)); |
|
27 |
+ // We don't want localized "Downloads" unless XDG is used |
|
28 |
+ //mBundle->GetStringFromName(NS_LITERAL_STRING("downloadsFolder").get(), |
|
29 |
+ // getter_Copies(folderName)); |
|
30 |
+ folderName.AssignLiteral("Downloads"); |
|
31 |
||
32 |
#if defined (XP_MACOSX) |
|
33 |
rv = dirService->Get(NS_OSX_DEFAULT_DOWNLOAD_DIR, |