[Pkg-mozext-commits] [automatic-save-folder] 08/133: Change : Make the use of stringBundle instead of hidden data in xul/dtd.

David Prévot taffit at moszumanska.debian.org
Mon Apr 27 20:33:47 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 266494f6366090ac1a613da86fb3fb1d8f03ccf4
Author: Cyan <Cyan at d0063192-6b2e-11de-89a9-0b20f3e2dceb>
Date:   Thu Aug 20 13:37:58 2009 +0000

    Change :
    Make the use of stringBundle instead of hidden data in xul/dtd.
    
    git-svn-id: http://automatic-save-folder.googlecode.com/svn/trunk@8 d0063192-6b2e-11de-89a9-0b20f3e2dceb
---
 content/add.xul             | 3 +++
 content/asf.js              | 3 ++-
 content/asf_addedit.js      | 6 ++++--
 content/edit.xul            | 3 +++
 content/options.xul         | 4 +++-
 locale/en-US/asf.dtd        | 3 ---
 locale/en-US/asf.properties | 3 +++
 locale/fr-FR/asf.dtd        | 3 ---
 locale/fr-FR/asf.properties | 3 +++
 locale/it-IT/asf.properties | 3 +++
 10 files changed, 24 insertions(+), 10 deletions(-)

diff --git a/content/add.xul b/content/add.xul
index fccfd5f..e2af77a 100644
--- a/content/add.xul
+++ b/content/add.xul
@@ -21,6 +21,9 @@
 	ondialogextra2="window.openDialog('chrome://asf/content/regexp.xul','asf_regexp_help','chrome, centerscreen, resizable=yes, dialog=no');"
 	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 <script type="application/x-javascript" src="chrome://asf/content/asf_addedit.js"/>
+<stringbundleset id="automatic_save_folder_bundleset">
+	<stringbundle id="automatic_save_folder_bundles" src="chrome://asf/locale/asf.properties"/>
+</stringbundleset>
 <groupbox align="center" orient="horizontal">
 	<caption label="&asf.addedit.filter.label;" />
 	<vbox>
diff --git a/content/asf.js b/content/asf.js
index c8075f6..0fd5d7e 100644
--- a/content/asf.js
+++ b/content/asf.js
@@ -370,11 +370,12 @@ var automatic_save_folder = {
 	// next 2 functions : Code inspired from DTA (browsedir & createValidDestination)
 	browsedir: function () {
 		var current_folder_input = document.getElementById("asf-default-folder").value;
+		var stringbundle = document.getElementById('automatic_save_folder_bundles');
 		
 		const nsIFilePicker = Components.interfaces.nsIFilePicker;
 		var fp = Components.classes["@mozilla.org/filepicker;1"].createInstance(nsIFilePicker);
 		
-		var filepickerdescription = document.getElementById("asf-pickup").value;
+		var filepickerdescription = stringbundle.getString("select_default_folder");
 		fp.init(window, filepickerdescription, nsIFilePicker.modeGetFolder);
 		//fp.appendFilters(nsIFilePicker.filterAll | nsIFilePicker.filterText);
 		
diff --git a/content/asf_addedit.js b/content/asf_addedit.js
index 563842c..bdba93c 100644
--- a/content/asf_addedit.js
+++ b/content/asf_addedit.js
@@ -89,11 +89,13 @@ Copyright (C) 2007-2009 Eric Cassar (Cyan).
 
 	browsedir_addedit: function () {
 		var current_folder_input = document.getElementById("asf-addedit-folder").value;
-		  
+		var stringbundle = document.getElementById('automatic_save_folder_bundles');
+				
 		const nsIFilePicker = Components.interfaces.nsIFilePicker;
 		var fp = Components.classes["@mozilla.org/filepicker;1"].createInstance(nsIFilePicker);
 		
-		fp.init(window, "", nsIFilePicker.modeGetFolder);
+		var filepickerdescription = stringbundle.getString("select_folder");
+		fp.init(window, filepickerdescription, nsIFilePicker.modeGetFolder);
 		//fp.appendFilters(nsIFilePicker.filterAll | nsIFilePicker.filterText);
 		
 		// locate current directory
diff --git a/content/edit.xul b/content/edit.xul
index 98c03f9..d6969ad 100644
--- a/content/edit.xul
+++ b/content/edit.xul
@@ -21,6 +21,9 @@
 	ondialogextra2="window.openDialog('chrome://asf/content/regexp.xul','asf_regexp_help','chrome, centerscreen, resizable=yes, dialog=no');"
 	xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
 <script type="application/x-javascript" src="chrome://asf/content/asf_addedit.js"/>
+<stringbundleset id="automatic_save_folder_bundleset">
+	<stringbundle id="automatic_save_folder_bundles" src="chrome://asf/locale/asf.properties"/>
+</stringbundleset>
 <groupbox align="center" orient="horizontal">
 	<caption label="&asf.addedit.filter.label;"/>
 	<vbox>	
diff --git a/content/options.xul b/content/options.xul
index 17b262f..875808f 100644
--- a/content/options.xul
+++ b/content/options.xul
@@ -29,6 +29,9 @@
 		<preference id="asf_savetype" name="extensions.asf.savetype" type="int"/>
 		<preference id="asf_variablemode" name="extensions.asf.variablemode" type="bool"/>
 	</preferences>
+	<stringbundleset id="automatic_save_folder_bundleset">
+		<stringbundle id="automatic_save_folder_bundles" src="chrome://asf/locale/asf.properties"/>
+	</stringbundleset>
 	<menupopup id="contextpopup">
 		<menuitem label="&asf.top.popup;" oncommand="automatic_save_folder.move('top');"/>
 		<menuitem label="&asf.copy.popup;" oncommand="automatic_save_folder.asf_duplicate();"/>
@@ -90,7 +93,6 @@
 			</radiogroup>
 		</groupbox>
 		<groupbox hidden="true">
-			<textbox id="asf-pickup" value="&asf.selectfolder.pickup;" />
 			<textbox id="asf-current-domain" value="" />
 			<textbox id="asf-current-filename" value="" />
 		</groupbox>
diff --git a/locale/en-US/asf.dtd b/locale/en-US/asf.dtd
index 76e39a0..6acddf9 100644
--- a/locale/en-US/asf.dtd
+++ b/locale/en-US/asf.dtd
@@ -27,9 +27,6 @@
 <!ENTITY asf.selectfolder.label "Select...">
 <!ENTITY asf.keeptemp.label "Use the last folder if the file is from the same hosted domain than the previously downloaded file.">
 
-<!-- preference file pickup -->
-<!ENTITY asf.selectfolder.pickup "Select the default folder if no filter is found">
-
 <!-- popup -->
 <!ENTITY asf.top.popup "Move to Top">
 <!ENTITY asf.copy.popup "Duplicate">
diff --git a/locale/en-US/asf.properties b/locale/en-US/asf.properties
index 4b8091b..11f42f9 100644
--- a/locale/en-US/asf.properties
+++ b/locale/en-US/asf.properties
@@ -23,3 +23,6 @@ month11_full=November
 month11_abbr=Nov
 month12_full=December
 month12_abbr=Dec
+
+select_default_folder=Please select the default folder if no filter is found.
+select_folder=Please select the destination folder for this filter.
\ No newline at end of file
diff --git a/locale/fr-FR/asf.dtd b/locale/fr-FR/asf.dtd
index c01e9f6..aa36127 100644
--- a/locale/fr-FR/asf.dtd
+++ b/locale/fr-FR/asf.dtd
@@ -27,9 +27,6 @@
 <!ENTITY asf.selectfolder.label "Sélectionner...">
 <!ENTITY asf.keeptemp.label "Utiliser le dernier dossier si le téléchargement provient du même domaine d'hébergement que le précédent fichier.">
 
-<!-- preference file pickup -->
-<!ENTITY asf.selectfolder.pickup "Selectionnez le dossier de destination par défaut, lorsqu'aucun filtre n'est trouvé">
-
 <!-- popup -->
 <!ENTITY asf.top.popup "Déplacer au début">
 <!ENTITY asf.copy.popup "Dupliquer">
diff --git a/locale/fr-FR/asf.properties b/locale/fr-FR/asf.properties
index e5fcb7f..9d984ce 100644
--- a/locale/fr-FR/asf.properties
+++ b/locale/fr-FR/asf.properties
@@ -23,3 +23,6 @@ month11_full=Novembre
 month11_abbr=Nov
 month12_full=Décembre
 month12_abbr=Déc
+
+select_default_folder=Sélectionnez le dossier de destination par défaut, lorsqu'aucun filtre n'est trouvé.
+select_folder=Sélectionnez le dossier de destination pour ce filtre.
\ No newline at end of file
diff --git a/locale/it-IT/asf.properties b/locale/it-IT/asf.properties
index b461ff3..b8767eb 100644
--- a/locale/it-IT/asf.properties
+++ b/locale/it-IT/asf.properties
@@ -23,3 +23,6 @@ month11_full=November
 month11_abbr=Nov
 month12_full=December
 month12_abbr=Dec
+
+select_default_folder=Seleziona la cartella predefinita se nessun filtro corrisponde
+select_folder=Please select the destination folder for this filter.
\ No newline at end of file

-- 
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