[Pkg-mozext-commits] [automatic-save-folder] 23/133: Change : Converted the last hidden xul/dtd to stringbundles for add&edit alert message
David Prévot
taffit at moszumanska.debian.org
Mon Apr 27 20:33:48 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 d2b25e36315777a5e49c629d35bea9b90eedcb8a
Author: Cyan <Cyan at d0063192-6b2e-11de-89a9-0b20f3e2dceb>
Date: Mon Nov 2 17:48:17 2009 +0000
Change : Converted the last hidden xul/dtd to stringbundles for add&edit alert message
git-svn-id: http://automatic-save-folder.googlecode.com/svn/trunk@23 d0063192-6b2e-11de-89a9-0b20f3e2dceb
---
content/add.xul | 5 -----
content/asf_addedit.js | 26 ++++++++++++--------------
content/edit.xul | 5 -----
locale/en-US/asf.dtd | 5 -----
locale/en-US/asf.properties | 5 ++++-
locale/fr-FR/asf.dtd | 5 -----
locale/fr-FR/asf.properties | 5 ++++-
locale/it-IT/asf.dtd | 5 -----
locale/it-IT/asf.properties | 5 ++++-
9 files changed, 24 insertions(+), 42 deletions(-)
diff --git a/content/add.xul b/content/add.xul
index 00d6408..b4e8566 100644
--- a/content/add.xul
+++ b/content/add.xul
@@ -64,9 +64,4 @@
<description value="&asf.addedit.inforegexp4;"/>
</vbox>
</groupbox>
-
-<description id="popup-nodata-domain" style="display:none" value="&asf.addedit.nodata.domain;"/>
-<description id="popup-nodata-filename" style="display:none" value="&asf.addedit.nodata.filename;"/>
-<description id="popup-nodata-folder" style="display:none" value="&asf.addedit.nodata.folder;"/>
-
</dialog>
\ No newline at end of file
diff --git a/content/asf_addedit.js b/content/asf_addedit.js
index 90e9a38..582d1d0 100644
--- a/content/asf_addedit.js
+++ b/content/asf_addedit.js
@@ -19,7 +19,10 @@ Copyright (C) 2007-2009 Eric Cassar (Cyan).
var automatic_save_folder = {
prefManager: Components.classes["@mozilla.org/preferences-service;1"]
.getService(Components.interfaces.nsIPrefBranch),
-
+
+ stringbundle: Components.classes["@mozilla.org/intl/stringbundle;1"]
+ .getService(Components.interfaces.nsIStringBundleService)
+ .createBundle("chrome://asf/locale/asf.properties"),
add_load: function () {
@@ -89,14 +92,11 @@ Copyright (C) 2007-2009 Eric Cassar (Cyan).
browsedir_addedit: function () {
var current_folder_input = document.getElementById("asf-addedit-folder").value;
- var stringbundle = Components.classes['@mozilla.org/intl/stringbundle;1'].
- getService(Components.interfaces.nsIStringBundleService).
- createBundle('chrome://asf/locale/asf.properties');
const nsIFilePicker = Components.interfaces.nsIFilePicker;
var fp = Components.classes["@mozilla.org/filepicker;1"].createInstance(nsIFilePicker);
- var filepickerdescription = stringbundle.GetStringFromName("select_folder");
+ var filepickerdescription = this.stringbundle.GetStringFromName("select_folder");
fp.init(window, filepickerdescription, nsIFilePicker.modeGetFolder);
//fp.appendFilters(nsIFilePicker.filterAll | nsIFilePicker.filterText);
@@ -310,10 +310,8 @@ Copyright (C) 2007-2009 Eric Cassar (Cyan).
}
else
{
- var err_domain = document.getElementById('popup-nodata-domain').value;
- asfalert = alert;
- //alert(err_domain);
- asfalert("test");
+ var err_domain = this.stringbundle.GetStringFromName("nodata.domain");
+ alert(err_domain);
var error = true;
}
@@ -337,7 +335,7 @@ Copyright (C) 2007-2009 Eric Cassar (Cyan).
}
else
{
- var err_filename = document.getElementById('popup-nodata-filename').value;
+ var err_filename = this.stringbundle.GetStringFromName("nodata.filename");
alert(err_filename);
var error = true;
}
@@ -350,7 +348,7 @@ Copyright (C) 2007-2009 Eric Cassar (Cyan).
var rule = this.trim(folder.value);
if (rule == "")
{
- var err_folder = document.getElementById('popup-nodata-folder').value;
+ var err_folder = this.stringbundle.GetStringFromName("nodata.folder");
alert(err_folder);
var error = true;
}
@@ -426,7 +424,7 @@ Copyright (C) 2007-2009 Eric Cassar (Cyan).
}
else
{
- var err_domain = document.getElementById('popup-nodata-domain').value;
+ var err_domain = this.stringbundle.GetStringFromName("nodata.domain");
alert(err_domain);
var error = true;
}
@@ -451,7 +449,7 @@ Copyright (C) 2007-2009 Eric Cassar (Cyan).
}
else
{
- var err_filename = document.getElementById('popup-nodata-filename').value;
+ var err_filename = this.stringbundle.GetStringFromName("nodata.filename");
alert(err_filename);
var error = true;
}
@@ -464,7 +462,7 @@ Copyright (C) 2007-2009 Eric Cassar (Cyan).
var rule = this.trim(folder.value);
if (rule == "")
{
- var err_folder = document.getElementById('popup-nodata-folder').value;
+ var err_folder = this.stringbundle.GetStringFromName("nodata.folder");
alert(err_folder);
var error = true;
}
diff --git a/content/edit.xul b/content/edit.xul
index a1c58e9..bd49ef7 100644
--- a/content/edit.xul
+++ b/content/edit.xul
@@ -64,9 +64,4 @@
<description value="&asf.addedit.inforegexp4;"/>
</vbox>
</groupbox>
-
-<description id="popup-nodata-domain" style="display:none" value="&asf.addedit.nodata.domain;"/>
-<description id="popup-nodata-filename" style="display:none" value="&asf.addedit.nodata.filename;"/>
-<description id="popup-nodata-folder" style="display:none" value="&asf.addedit.nodata.folder;"/>
-
</dialog>
\ No newline at end of file
diff --git a/locale/en-US/asf.dtd b/locale/en-US/asf.dtd
index d8944bb..78dcea7 100644
--- a/locale/en-US/asf.dtd
+++ b/locale/en-US/asf.dtd
@@ -80,11 +80,6 @@
<!ENTITY asf.addedit.inforegexp3 "Partial or wildcarded : file*.zip">
<!ENTITY asf.addedit.inforegexp4 "Regexp. : .*(.rar|.zip)$">
-<!ENTITY asf.addedit.nodata.domain "The domain is empty. Please choose 'all' or enter filter for the domain">
-<!ENTITY asf.addedit.nodata.filename "The filename is empty. Please choose 'all' or enter a filter for the filename">
-<!ENTITY asf.addedit.nodata.folder "The folder is empty. Please select a destination folder for this filter">
-
<!-- Regular expression Help dialog -->
<!ENTITY asf.regexp.title "Regular Expressions">
<!ENTITY asf.regexp.label "Help and examples">
-
diff --git a/locale/en-US/asf.properties b/locale/en-US/asf.properties
index 4c87346..a18ad68 100644
--- a/locale/en-US/asf.properties
+++ b/locale/en-US/asf.properties
@@ -39,4 +39,7 @@ day5_abbr=Fri
day6_abbr=Sat
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
+select_folder=Please select the destination folder for this filter.
+nodata.domain=The domain is empty. Please choose 'All' or enter filter for the domain
+nodata.filename=The filename is empty. Please choose 'All' or enter a filter for the filename
+nodata.folder=The folder is empty. Please select the destination folder for this filter
diff --git a/locale/fr-FR/asf.dtd b/locale/fr-FR/asf.dtd
index cdb277f..a98b9c9 100644
--- a/locale/fr-FR/asf.dtd
+++ b/locale/fr-FR/asf.dtd
@@ -80,11 +80,6 @@
<!ENTITY asf.addedit.inforegexp3 "Partiels : fichier*.zip">
<!ENTITY asf.addedit.inforegexp4 "Expression régulière : .*(.rar|.zip)$">
-<!ENTITY asf.addedit.nodata.domain "Le domaine est vide. Veuillez sélectionner 'Tous' ou entrer un filtre pour le domaine">
-<!ENTITY asf.addedit.nodata.filename "Le nom de fichier est vide. Veuillez sélectionner 'Tous' ou entrer un filtre pour le nom de fichier">
-<!ENTITY asf.addedit.nodata.folder "Le dossier n'est pas défini. Veuillez sélectionner un dossier de destination pour ce filtre">
-
<!-- Regular expression Help dialog -->
<!ENTITY asf.regexp.title "Expressions Régulières">
<!ENTITY asf.regexp.label "Aide et exemples">
-
diff --git a/locale/fr-FR/asf.properties b/locale/fr-FR/asf.properties
index 48ea608..20bbea5 100644
--- a/locale/fr-FR/asf.properties
+++ b/locale/fr-FR/asf.properties
@@ -39,4 +39,7 @@ day5_abbr=Ven
day6_abbr=Sam
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
+select_folder=Sélectionnez le dossier de destination pour ce filtre.
+nodata.domain=Le domaine est vide. Veuillez sélectionner 'Tous' ou entrer un filtre pour le domaine
+nodata.filename=Le nom de fichier est vide. Veuillez sélectionner 'Tous' ou entrer un filtre pour le nom de fichier
+nodata.folder=Le dossier n'est pas défini. Veuillez sélectionner le dossier de destination pour ce filtre
diff --git a/locale/it-IT/asf.dtd b/locale/it-IT/asf.dtd
index 4a13603..7d7223a 100644
--- a/locale/it-IT/asf.dtd
+++ b/locale/it-IT/asf.dtd
@@ -80,11 +80,6 @@
<!ENTITY asf.addedit.inforegexp3 "Parzialmente corrisposto o con wildcard: mio*.zip">
<!ENTITY asf.addedit.inforegexp4 "Espressione regolare. : .*(.rar|.zip)$">
-<!ENTITY asf.addedit.nodata.domain "Il campo dominio è vuoto. Scegli 'tutti' o inserisci un filtro per il dominio">
-<!ENTITY asf.addedit.nodata.filename "Il campo Nome File è vuoto. Scegli 'tutti' o inserisci un filtro per il nome file">
-<!ENTITY asf.addedit.nodata.folder "La cartella è vuota. Scegli una cartella di destinazione per questo filtro">
-
<!-- Regular expression Help dialog -->
<!ENTITY asf.regexp.title "Espressioni regolari">
<!ENTITY asf.regexp.label "Aiuti ed esempi">
-
diff --git a/locale/it-IT/asf.properties b/locale/it-IT/asf.properties
index ba60969..0283771 100644
--- a/locale/it-IT/asf.properties
+++ b/locale/it-IT/asf.properties
@@ -39,4 +39,7 @@ day5_abbr=VEN
day6_abbr=SAB
select_default_folder=Seleziona la cartella predefinita se nessun filtro corrisponde
-select_folder=Select the destination folder for this filter.
\ No newline at end of file
+select_folder=Scegli una cartella di destinazione per questo filtro.
+nodata.domain=Il campo dominio è vuoto. Scegli 'tutti' o inserisci un filtro per il dominio
+nodata.filename=Il campo Nome File è vuoto. Scegli 'tutti' o inserisci un filtro per il nome file
+nodata.folder=La cartella è vuota. Scegli una cartella di destinazione per questo filtro
--
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