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 @@ -383,17 +383,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.

    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(yield this._indexToFolder(1));

    21      } else {

    22        // 'Desktop'

    23        downloadFolder.label = bundlePreferences.getString("desktopFolderName");

    24        iconUrlSpec = fph.getURLSpecFromFile(yield this._getDownloadsFolder("Desktop"));

    25      }

    26      downloadFolder.image = "moz-icon://" + iconUrlSpec + "?size=16";

    27    }),

    28 diff --git a/toolkit/components/downloads/nsDownloadManager.cpp b/toolkit/components/downloads/nsDownloadManager.cpp

    29 --- a/toolkit/components/downloads/nsDownloadManager.cpp

    30 +++ b/toolkit/components/downloads/nsDownloadManager.cpp

    31 @@ -1356,18 +1356,20 @@ nsDownloadManager::GetDefaultDownloadsDi

    32    // Vista:

    33    // Downloads

    34    // XP/2K:

    35    // My Documents/Downloads

    36    // Linux:

    37    // XDG user dir spec, with a fallback to Home/Downloads

    38  

    39    nsXPIDLString folderName;

    40 -  mBundle->GetStringFromName(MOZ_UTF16("downloadsFolder"),

    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,

    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,