author | Wolfgang Rosenauer <wr@rosenauer.org> |
Sat, 03 May 2014 10:14:44 +0200 | |
changeset 733 | b2202fea7983 |
parent 716 | cef565f1c325 |
child 837 | a1f740acf68e |
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 |
|
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
251
diff
changeset
|
9 |
@@ -290,17 +290,17 @@ var gMainPane = { |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
251
diff
changeset
|
10 |
// and was available as an option in the 1.5 drop down. On XP this |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
251
diff
changeset
|
11 |
// was in My Documents, on OSX it was in User Docs. In 2.0, we did |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
251
diff
changeset
|
12 |
// away with the drop down option, although the special label was |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
251
diff
changeset
|
13 |
// still supported for the folder if it existed. Because it was |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
251
diff
changeset
|
14 |
// not exposed it was rarely used. |
0 | 15 |
// With 3.0, a new desktop folder - 'Downloads' was introduced for |
16 |
// platforms and versions that don't support a default system downloads |
|
17 |
// folder. See nsDownloadManager for details. |
|
18 |
- downloadFolder.label = bundlePreferences.getString("downloadsFolderName"); |
|
19 |
+ downloadFolder.label = "Downloads"; |
|
20 |
iconUrlSpec = fph.getURLSpecFromFile(this._indexToFolder(1)); |
|
21 |
} else { |
|
22 |
// 'Desktop' |
|
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
251
diff
changeset
|
23 |
downloadFolder.label = bundlePreferences.getString("desktopFolderName"); |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
251
diff
changeset
|
24 |
iconUrlSpec = fph.getURLSpecFromFile(this._getDownloadsFolder("Desktop")); |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
251
diff
changeset
|
25 |
} |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
251
diff
changeset
|
26 |
downloadFolder.image = "moz-icon://" + iconUrlSpec + "?size=16"; |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
251
diff
changeset
|
27 |
|
251
4c9ebbedd59c
adopt patches to new base
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
0
diff
changeset
|
28 |
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
|
29 |
--- a/toolkit/components/downloads/nsDownloadManager.cpp |
4c9ebbedd59c
adopt patches to new base
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
0
diff
changeset
|
30 |
+++ b/toolkit/components/downloads/nsDownloadManager.cpp |
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
251
diff
changeset
|
31 |
@@ -1365,18 +1365,20 @@ nsDownloadManager::GetDefaultDownloadsDi |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
251
diff
changeset
|
32 |
// Vista: |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
251
diff
changeset
|
33 |
// Downloads |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
251
diff
changeset
|
34 |
// XP/2K: |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
251
diff
changeset
|
35 |
// My Documents/Downloads |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
251
diff
changeset
|
36 |
// Linux: |
0 | 37 |
// XDG user dir spec, with a fallback to Home/Downloads |
38 |
||
39 |
nsXPIDLString folderName; |
|
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
251
diff
changeset
|
40 |
- mBundle->GetStringFromName(MOZ_UTF16("downloadsFolder"), |
0 | 41 |
- getter_Copies(folderName)); |
42 |
+ // We don't want localized "Downloads" unless XDG is used |
|
43 |
+ //mBundle->GetStringFromName(NS_LITERAL_STRING("downloadsFolder").get(), |
|
44 |
+ // getter_Copies(folderName)); |
|
45 |
+ folderName.AssignLiteral("Downloads"); |
|
46 |
||
47 |
#if defined (XP_MACOSX) |
|
48 |
rv = dirService->Get(NS_OSX_DEFAULT_DOWNLOAD_DIR, |
|
716
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
251
diff
changeset
|
49 |
NS_GET_IID(nsIFile), |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
251
diff
changeset
|
50 |
getter_AddRefs(downloadDir)); |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
251
diff
changeset
|
51 |
NS_ENSURE_SUCCESS(rv, rv); |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
251
diff
changeset
|
52 |
#elif defined(XP_WIN) |
cef565f1c325
update to Firefox 29.0b7
Wolfgang Rosenauer <wr@rosenauer.org>
parents:
251
diff
changeset
|
53 |
rv = dirService->Get(NS_WIN_DEFAULT_DOWNLOAD_DIR, |