[Pkg-mozext-commits] [automatic-save-folder] 76/133: Fix : - When going into private browsing mode, if first download method was right-click, it didn't work. -Few locale fixes.
David Prévot
taffit at moszumanska.debian.org
Mon Apr 27 20:33:54 UTC 2015
This is an automated email from the git hooks/post-receive script.
taffit pushed a commit to branch wip
in repository automatic-save-folder.
commit 5f0b4c9b433f2a5b960597a19016100ea8ba38be
Author: Cyan <Cyan at d0063192-6b2e-11de-89a9-0b20f3e2dceb>
Date: Sat Jul 17 16:20:58 2010 +0000
Fix :
- When going into private browsing mode,
if first download method was right-click, it didn't work.
-Few locale fixes.
git-svn-id: http://automatic-save-folder.googlecode.com/svn/trunk@82 d0063192-6b2e-11de-89a9-0b20f3e2dceb
---
content/asf_right_click.js | 44 +++++++++++++++++++++++---------------------
content/common.dtd | 2 +-
content/options.xul | 2 +-
locale/en-US/about.dtd | 2 +-
locale/en-US/asf.dtd | 11 +++++++----
locale/fr/about.dtd | 4 ++--
locale/fr/asf.dtd | 7 +++++--
locale/it/about.dtd | 2 +-
locale/it/asf.dtd | 7 +++++--
locale/ru/about.dtd | 2 +-
locale/ru/asf.dtd | 7 +++++--
11 files changed, 52 insertions(+), 38 deletions(-)
diff --git a/content/asf_right_click.js b/content/asf_right_click.js
index 8c44acc..bd206d1 100644
--- a/content/asf_right_click.js
+++ b/content/asf_right_click.js
@@ -72,7 +72,6 @@ var automatic_save_folder = {
}
}
}
-
},
@@ -86,10 +85,10 @@ var automatic_save_folder = {
//alert("ok");
// Setting private variables usable in this function
- var prefManager = this.prefManager;
+ var prefManager = this.prefManager;
// Check if there is any filter in list
- var nbrfilters = prefManager.getIntPref("extensions.asf.filtersNumber");
+ var nbrfilters = prefManager.getIntPref("extensions.asf.filtersNumber");
// load the domain and the filename of the saved file (copy the data from the firefox saving window)
@@ -114,14 +113,14 @@ var automatic_save_folder = {
// load prefmanager data
- var savetype = prefManager.getIntPref("extensions.asf.savetype");
- var lastdir = prefManager.getBoolPref("extensions.asf.lastdir");
- var defaultfolder = this.loadUnicodeString("extensions.asf.defaultfolder");
+ var savetype = prefManager.getIntPref("extensions.asf.savetype");
+ var lastdir = prefManager.getBoolPref("extensions.asf.lastdir");
+ var defaultfolder = this.loadUnicodeString("extensions.asf.defaultfolder");
var keeptemp = prefManager.getBoolPref("extensions.asf.keeptemp");
var tempdomain = this.loadUnicodeString("extensions.asf.tempdomain");
var variable_mode = prefManager.getBoolPref("extensions.asf.variablemode");
- var dialogaccept = prefManager.getBoolPref("extensions.asf.dialogaccept");
- var use_currentURL = prefManager.getBoolPref("extensions.asf.usecurrenturl");
+ var dialogaccept = prefManager.getBoolPref("extensions.asf.dialogaccept");
+ var use_currentURL = prefManager.getBoolPref("extensions.asf.usecurrenturl");
// If variable/Dynamic folders mode is ON, let's check the variables and replace to create the new defaultfolder
if (variable_mode == true)
@@ -139,10 +138,10 @@ var automatic_save_folder = {
var folder = this.loadUnicodeString("browser.download.dir");
}
this.saveUnicodeString("extensions.asf.lastpath", folder); // And set it to asf.lastpath to be compared later with the new path the filters will set to lastDir (or dir)
-
+
// load filters data from prefmanager into filters[]
- // filters[filternumber][label]
+ // filters[filternumber][label]
var filters = new Array();
for ( var i = 0 ; i < nbrfilters ; i++)
{
@@ -181,7 +180,7 @@ var automatic_save_folder = {
catch (e) { } // if there is no location.host data (tab is closed or script redirection), use the default folder as there are no filter's domain or current URL domain.
}
- // Check the filename
+ // Check the filename
file_regexp = this.test_regexp(filters[i][1], filename); // Filename
// debug
@@ -190,7 +189,7 @@ var automatic_save_folder = {
{
var idx = i;
break;
- }
+ }
}
} // end filters loop
@@ -311,6 +310,10 @@ var automatic_save_folder = {
if (inPrivateBrowsing && directory)
{
+ if (typeof(gDownloadLastDir) == "undefined") // if not loaded yet
+ {
+ Components.utils.import("resource://gre/modules/DownloadLastDir.jsm");
+ }
gDownloadLastDir.file = directory;
}
else
@@ -319,8 +322,7 @@ var automatic_save_folder = {
if (folderList == 2)
this.saveUnicodeString("browser.download.dir", directory.path);
}
-
- }
+ }
},
@@ -418,8 +420,8 @@ var automatic_save_folder = {
var dom_regexp = this.test_regexp(asf_domain, scheme+"://"+domain);
var file_regexp = this.test_regexp(asf_filename, filename);
-
-// Ted Gifford, start block
+
+// Ted Gifford, start block
// String capture in filename with $<1-9>f
try {
//alert(file_regexp.length);
@@ -449,13 +451,13 @@ var automatic_save_folder = {
{
asf_domain = asf_domain.substring(1, asf_domain.length);
asf_domain = asf_domain.substring(0, asf_domain.length -1);
- }
+ }
// Trim the / / if filename is regexp
if (this.is_regexp(asf_filename))
{
asf_filename = asf_filename.substring(1, asf_filename.length);
asf_filename = asf_filename.substring(0, asf_filename.length -1);
- }
+ }
// read the userpref to define if regexp is case insensitive (default true)
var param = "";
@@ -550,7 +552,7 @@ var automatic_save_folder = {
asf_domain = asf_domain.replace(/[\/\:]/g,'');
asf_filename = asf_filename.replace(/[\/\:]/g,'');
file_name = file_name.replace(/[\/\:]/g,'');
- }
+ }
// replace the string here // Year
path = path .replace(/%Y%/g, objdate.getFullYear()) // full year format = 2009
@@ -718,7 +720,7 @@ var automatic_save_folder = {
{
var enabledItems = this.prefManager.getCharPref("extensions.enabledItems");
}
-
+
var addon_GUUID = "{D9808C4D-1CF5-4f67-8DB2-12CF78BBA23F}";
var DownloadSort = enabledItems.indexOf(addon_GUUID,0);
if (DownloadSort >= 0) return true;
@@ -749,4 +751,4 @@ var automatic_save_folder = {
"load", // After OnLoad from overlay_unknownContentType.xul file
function(){ automatic_save_folder.rightclick_init(); }, // Run main from automatic_save_folder to check the filters
false
- );
\ No newline at end of file
+ );
\ No newline at end of file
diff --git a/content/common.dtd b/content/common.dtd
index ee79bc9..ddff35e 100644
--- a/content/common.dtd
+++ b/content/common.dtd
@@ -1,2 +1,2 @@
<!-- Current version -->
-<!ENTITY asf.version "1.0.2b Rev81">
\ No newline at end of file
+<!ENTITY asf.version "1.0.2b Rev82">
\ No newline at end of file
diff --git a/content/options.xul b/content/options.xul
index 51ac241..59b206b 100644
--- a/content/options.xul
+++ b/content/options.xul
@@ -238,7 +238,7 @@
<tabpanel>
<vbox id="asf-options-tab3" flex="1">
<groupbox><caption label="&asf.options.groupbox6.label;" />
- <description>&asf.options.dtaDetected.label;</description>
+ <description style="white-space:pre-wrap;">&asf.options.dtaDetected.label;</description>
<checkbox id="asf-dta_ASFtoDTA_isActive" preference="asf_dta_ASFtoDTA_isActive" label="&asf.dta_ASFtoDTA_isActive.bool;"/>
<separator />
<description style="vertical-align:top;white-space:pre-wrap">&asf.dta_chooseSendingMethod.label;</description>
diff --git a/locale/en-US/about.dtd b/locale/en-US/about.dtd
index c00323c..abe3adf 100644
--- a/locale/en-US/about.dtd
+++ b/locale/en-US/about.dtd
@@ -22,7 +22,7 @@
<!ENTITY about.fix "Fixed">
<!ENTITY about.version.title "Version">
-<!-- Keep the newline intact as it uses the < pre > tag, keep the 2 begining spaces to create indentation -->
+<!-- Keep the newline intact as it uses the < pre > tag, keep the 2 beginning spaces to create indentation -->
<!ENTITY about.version.102 "+ Added an option to force the action choice when using the automatic download option.
+ If DownThemAll add-on is installed, a new option's tab is available to send ASF target path to DTA.
+ Added an option to select if the filters are case sensitive or insensitive.
diff --git a/locale/en-US/asf.dtd b/locale/en-US/asf.dtd
index b3a6fab..c3d9b0e 100644
--- a/locale/en-US/asf.dtd
+++ b/locale/en-US/asf.dtd
@@ -1,9 +1,12 @@
<!-- ASF Settings -->
<!-- Change the preferences window size to fit your localization. Default values : resize=false width=617 height=423, in pixels-->
-<!ENTITY asf.preferences_window.resize "false">
-<!ENTITY asf.preferences_window.width "617">
+<!ENTITY asf.preferences_window.resize "true">
+<!ENTITY asf.preferences_window.width "580">
<!ENTITY asf.preferences_window.height "423">
+<!-- new line, U+00A0 ISOnum -->
+<!ENTITY NL "
" >
+
<!-- browser and save dialog-->
<!ENTITY prefwindow.title "Automatic Save Folder Preferences">
<!ENTITY asf.label "Automatic Save Folder...">
@@ -82,7 +85,7 @@
<!ENTITY asf.rightclicktimeout.tooltip3 "Only download scripts with file redirection are affected.">
<!ENTITY asf.rightclicktimeout.tooltip4 "Note: This option doesn't affect the menus "Save image as..." nor "Save as... (Ctrl+S)".">
<!ENTITY asf.rightclick.ff2.label "The Automatic Save Folder's right-click feature is not available on Firefox 2. If you want to use the filters on your downloads using the right-click menu "Save link as", you should update your Firefox version to 3.0 minimum (recommended version 3.5 or more).">
-<!ENTITY asf.rightclick.DSort.label "Download sort extension has been detected. 
Automatic Save Folder's right-click feature will not work until you disable Download Sort in your Extension manager.">
+<!ENTITY asf.rightclick.DSort.label "Download sort extension has been detected. &NL;Automatic Save Folder's right-click feature will not work until you disable Download Sort in your Extension manager.">
<!ENTITY asf.options.groupbox5.label "Graphical inerface">
<!ENTITY asf.pathlist_defaultforceontop.bool "On drop-down menus, shows the default save path first.">
@@ -92,7 +95,7 @@
<!ENTITY asf.rowmatchinghighlight.system "System color">
<!ENTITY asf.options.groupbox6.label "DownThemAll!">
-<!ENTITY asf.options.dtaDetected.label "Automatic Save Folder has detected that you are using DownThemAll! add-on. Automatic Save Folder can send the filtered destination path to DownThemAll when using the "What should firefox do with this file" saving window. This option is disabled when using the Private Browsing mode.">
+<!ENTITY asf.options.dtaDetected.label "Automatic Save Folder has detected that you are using DownThemAll! &NL;add-on. Automatic Save Folder can send the filtered destination path to DownThemAll when using the "What should firefox do with this file" saving window. This option is disabled when using the Private Browsing mode.">
<!ENTITY asf.dta_ASFtoDTA_isActive.bool "Enable Automatic Save Folder to send the filtered path to DownThemAll.">
<!ENTITY asf.dta_chooseSendingMethod.label "Choose the sending method for DTA OneClic!:">
<!ENTITY asf.dta_methodReplace.label "Replace first folder in list">
diff --git a/locale/fr/about.dtd b/locale/fr/about.dtd
index 222debe..72275ae 100644
--- a/locale/fr/about.dtd
+++ b/locale/fr/about.dtd
@@ -24,11 +24,11 @@
<!-- Conserver les retour à la ligne car le tag < pre > est utilisé, gardez les deux espaces en début de ligne pour l'indentation -->
<!ENTITY about.version.102 "+ Ajout d'une option permettant de forcer le choix de l'action à effectuer lorsque l'enregistrement automatique est sélectionné.
-+ Si l'extension DownThemAll est installée, un nouvel onglet d'option est disponible permetant d'envoyer le dossier de destination d'ASF à DTA.
++ Si l'extension DownThemAll est installée, un nouvel onglet d'option est disponible permettant d'envoyer le dossier de destination d'ASF à DTA.
+ Ajout d'une option permettant de choisir si les filtres sont sensibles ou insensibles à la casse.
+ Nouvelles options concernant l'interface graphique.
+ Ajout de la fonction Copie lors d'un Drag&Drop (ex. drag+Ctrl sur Windows).
-! Correction du script permettant de rajouter les slashs aux expressions régulières si le filtre contient déjà un slash aux extrémités.
+! Correction du script permettant de rajouter les slashs aux expressions régulières si le filtre contient déjà un slash à l'une des extrémités.
! Correction d'un bug où les données d'un lien direct entré dans la barre d'adresse ou initialisé par un autre programme n'étaient pas lu correctement, empêchant d'afficher la liste des filtres lorsque la fenêtre de préférences était ouverte à partir du lien "+ Ajouter ou éditer un filtre" de la fenêtre d'enregistrement. (Merci à MrCOLOMBO)
! ASF utilise maintenant l'URL complète du site courant au lieu de son domaine lorsque qu'aucun filtre n'est trouvé. (Le clic-droit utilisait déjà l'URL complète).">
diff --git a/locale/fr/asf.dtd b/locale/fr/asf.dtd
index 1aba20a..e85e67b 100644
--- a/locale/fr/asf.dtd
+++ b/locale/fr/asf.dtd
@@ -4,6 +4,9 @@
<!ENTITY asf.preferences_window.width "647">
<!ENTITY asf.preferences_window.height "423">
+<!-- new line, U+00A0 ISOnum -->
+<!ENTITY NL "
" >
+
<!-- browser and save dialog-->
<!ENTITY prefwindow.title "Préférences pour Automatic Save Folder">
<!ENTITY asf.label "Automatic Save Folder...">
@@ -82,7 +85,7 @@
<!ENTITY asf.rightclicktimeout.tooltip3 "Seuls les scripts de téléchargement avec redirection de fichier sont concernés.">
<!ENTITY asf.rightclicktimeout.tooltip4 "Note : Cette option n'a pas d'effet sur les menus "Enregistrer l'image sous..." ni "Enregistrer sous... (Ctrl+S)".">
<!ENTITY asf.rightclick.ff2.label "La fonction clic-droit d'automatic save folder n'est pas compatible avec Firefox 2. Si vous souhaitez utiliser les filtres sur les téléchargements en utilisant le menu clic-droit "Enregistrer la cible du lien sous...", vous devrez utiliser au minimum Firefox version 3.0 (Version 3.5 ou plus conseillée).">
-<!ENTITY asf.rightclick.DSort.label "L'extension Download Sort à été détectée. 
La fonction clic-droit d'Automatic Save Folder est temporairement indisponible. Désactivez l'extension Download Sort dans le menu "Outils/Modules complémentaires..." afin de pouvoir utiliser le clic-droit avec Automatic Save Folder.">
+<!ENTITY asf.rightclick.DSort.label "L'extension Download Sort à été détectée. &NL;La fonction clic-droit d'Automatic Save Folder est temporairement indisponible. Désactivez l'extension Download Sort dans le menu "Outils/Modules complémentaires..." afin de pouvoir utiliser le clic-droit avec Automatic Save Folder.">
<!ENTITY asf.options.groupbox5.label "Interface graphique">
<!ENTITY asf.pathlist_defaultforceontop.bool "Dans les menus déroulants, afficher en premier le chemin d'enregistrement par défaut.">
@@ -92,7 +95,7 @@
<!ENTITY asf.rowmatchinghighlight.system "Couleur système">
<!ENTITY asf.options.groupbox6.label "DownThemAll!">
-<!ENTITY asf.options.dtaDetected.label "Automatic Save Folder a détecté que vous utilisez l'extension DownThemAll!. Automatic Save Folder peut envoyer le dossier de destination filtré à DownThemAll lorsque vous utilisez la fenêtre de sauvegarde "Que doit faire Firefox avec ce fichier ?". Cette option est désactivée lorsque vous utilisez le mode Navigation Privée.">
+<!ENTITY asf.options.dtaDetected.label "Automatic Save Folder a détecté que vous utilisez l'extension DownThemAll!. &NL;Automatic Save Folder peut envoyer le dossier de destination filtré à DownThemAll lorsque vous utilisez la fenêtre de sauvegarde "Que doit faire Firefox avec ce fichier ?". Cette option est désactivée lorsque vous utilisez le mode Navigation Privée.">
<!ENTITY asf.dta_ASFtoDTA_isActive.bool "Activer l'envoi du dossier filtré par Automatic Save Folder à DownThemAll!.">
<!ENTITY asf.dta_chooseSendingMethod.label "Choix de la méthode d'envoi pour DTA OneClic!:">
<!ENTITY asf.dta_methodReplace.label "Remplacer le premier dossier de la liste">
diff --git a/locale/it/about.dtd b/locale/it/about.dtd
index 201811a..8869040 100644
--- a/locale/it/about.dtd
+++ b/locale/it/about.dtd
@@ -22,7 +22,7 @@
<!ENTITY about.fix "Risolto">
<!ENTITY about.version.title "Versione">
-<!-- Keep the newline intact as it uses the < pre > tag, keep the 2 begining spaces to create indentation -->
+<!-- Keep the newline intact as it uses the < pre > tag, keep the 2 beginning spaces to create indentation -->
<!ENTITY about.version.102 "+ Added an option to force the action choice when using the automatic download option.
+ If DownThemAll add-on is installed, a new option's tab is available to send ASF target path to DTA.
+ Added an option to select if the filters are case sensitive or insensitive.
diff --git a/locale/it/asf.dtd b/locale/it/asf.dtd
index f7e626d..3a5dab8 100644
--- a/locale/it/asf.dtd
+++ b/locale/it/asf.dtd
@@ -4,6 +4,9 @@
<!ENTITY asf.preferences_window.width "617">
<!ENTITY asf.preferences_window.height "423">
+<!-- new line, U+00A0 ISOnum -->
+<!ENTITY NL "
" >
+
<!-- browser and save dialog-->
<!ENTITY prefwindow.title "Preferenze di Automatic Save Folder">
<!ENTITY asf.label "Automatic Save Folder...">
@@ -82,7 +85,7 @@
<!ENTITY asf.rightclicktimeout.tooltip3 "Only download scripts with file redirection are affected.">
<!ENTITY asf.rightclicktimeout.tooltip4 "Note: This option doesn't affect the menus "Save image as..." nor "Save as... (Ctrl+S)".">
<!ENTITY asf.rightclick.ff2.label "The Automatic Save Folder's right-click feature is not available on Firefox 2. If you want to use the filters on your downloads using the right-click menu "Save link as", you should update your Firefox version to 3.0 minimum (recommended version 3.5 or more).">
-<!ENTITY asf.rightclick.DSort.label "Download sort extension has been detected. 
Automatic Save Folder's right-click feature will not work until you disable Download Sort in your Extension manager.">
+<!ENTITY asf.rightclick.DSort.label "Download sort extension has been detected. &NL;Automatic Save Folder's right-click feature will not work until you disable Download Sort in your Extension manager.">
<!ENTITY asf.options.groupbox5.label "Graphical inerface">
<!ENTITY asf.pathlist_defaultforceontop.bool "On drop-down menus, shows the default save path first.">
@@ -92,7 +95,7 @@
<!ENTITY asf.rowmatchinghighlight.system "System color">
<!ENTITY asf.options.groupbox6.label "DownThemAll!">
-<!ENTITY asf.options.dtaDetected.label "Automatic Save Folder has detected that you are using DownThemAll! add-on. Automatic Save Folder can send the filtered destination path to DownThemAll when using the "What should firefox do with this file" saving window. This option is disabled when using the Private Browsing mode.">
+<!ENTITY asf.options.dtaDetected.label "Automatic Save Folder has detected that you are using DownThemAll! add-on. &NL;Automatic Save Folder can send the filtered destination path to DownThemAll when using the "What should firefox do with this file" saving window. This option is disabled when using the Private Browsing mode.">
<!ENTITY asf.dta_ASFtoDTA_isActive.bool "Enable Automatic Save Folder to send the filtered path to DownThemAll.">
<!ENTITY asf.dta_chooseSendingMethod.label "Choose the sending method for DTA OneClic!:">
<!ENTITY asf.dta_methodReplace.label "Replace first folder in list">
diff --git a/locale/ru/about.dtd b/locale/ru/about.dtd
index a90a08b..e69218c 100644
--- a/locale/ru/about.dtd
+++ b/locale/ru/about.dtd
@@ -22,7 +22,7 @@
<!ENTITY about.fix "Исправлено">
<!ENTITY about.version.title "Версия">
-<!-- Keep the newline intact as it uses the < pre > tag, keep the 2 begining spaces to create indentation -->
+<!-- Keep the newline intact as it uses the < pre > tag, keep the 2 beginning spaces to create indentation -->
<!ENTITY about.version.102 "+ Added an option to force the action choice when using the automatic download option.
+ If DownThemAll add-on is installed, a new option's tab is available to send ASF target path to DTA.
+ Added an option to select if the filters are case sensitive or insensitive.
diff --git a/locale/ru/asf.dtd b/locale/ru/asf.dtd
index 95fa756..42e3068 100644
--- a/locale/ru/asf.dtd
+++ b/locale/ru/asf.dtd
@@ -4,6 +4,9 @@
<!ENTITY asf.preferences_window.width "617">
<!ENTITY asf.preferences_window.height "423">
+<!-- new line, U+00A0 ISOnum -->
+<!ENTITY NL "
" >
+
<!-- browser and save dialog-->
<!ENTITY prefwindow.title "Настройки Automatic Save Folder">
<!ENTITY asf.label "Automatic Save Folder...">
@@ -82,7 +85,7 @@
<!ENTITY asf.rightclicktimeout.tooltip3 "Использовать только для скриптов с перенаправлением загрузок.">
<!ENTITY asf.rightclicktimeout.tooltip4 "На заметку: Опция не имеет влияния на меню "Сохранить картинку как..." и "Сохранить как... (Ctrl+S)".">
<!ENTITY asf.rightclick.ff2.label "Меню Automatic Save Folder по правой кнопке мыши не доступно для Firefox 2. Если вы хотите иметь возможность использовать фильтры для меню правой кнопки мыши "Сохранить ссылку как...", вы должны обновить Firefox до версии 3.0 (рекомендуемая версия 3.5 или выше).">
-<!ENTITY asf.rightclick.DSort.label "Обнаружено дополнение 'Download sort'. Меню Automatic Save Folder по правой кнопке мыши не будет доступно пока вы не отключите 'Download Sort' в списке дополнений.">
+<!ENTITY asf.rightclick.DSort.label "Обнаружено дополнение 'Download sort'. &NL;Меню Automatic Save Folder по правой кнопке мыши не будет доступно пока вы не отключите 'Download Sort' в списке дополнений.">
<!ENTITY asf.options.groupbox5.label "Graphical inerface">
<!ENTITY asf.pathlist_defaultforceontop.bool "On drop-down menus, shows the default save path first.">
@@ -92,7 +95,7 @@
<!ENTITY asf.rowmatchinghighlight.system "System color">
<!ENTITY asf.options.groupbox6.label "DownThemAll!">
-<!ENTITY asf.options.dtaDetected.label "Automatic Save Folder has detected that you are using DownThemAll! add-on. Automatic Save Folder can send the filtered destination path to DownThemAll when using the "What should firefox do with this file" saving window. This option is disabled when using the Private Browsing mode.">
+<!ENTITY asf.options.dtaDetected.label "Automatic Save Folder has detected that you are using DownThemAll! add-on. &NL;Automatic Save Folder can send the filtered destination path to DownThemAll when using the "What should firefox do with this file" saving window. This option is disabled when using the Private Browsing mode.">
<!ENTITY asf.dta_ASFtoDTA_isActive.bool "Enable Automatic Save Folder to send the filtered path to DownThemAll.">
<!ENTITY asf.dta_chooseSendingMethod.label "Choose the sending method for DTA OneClic!:">
<!ENTITY asf.dta_methodReplace.label "Replace first folder in list">
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/automatic-save-folder.git
More information about the Pkg-mozext-commits
mailing list