[Pkg-mozext-commits] [automatic-save-folder] 01/02: Rebuild patches from pq branch
Sascha Girrulat
sagiru-guest at moszumanska.debian.org
Thu Aug 20 12:28:22 UTC 2015
This is an automated email from the git hooks/post-receive script.
sagiru-guest pushed a commit to branch jessie
in repository automatic-save-folder.
commit 19ece92e2f169f06f91d61171e0d00a158aaa94e
Author: Sascha Girrulat <sascha at girrulat.de>
Date: Tue Aug 18 15:35:20 2015 +0200
Rebuild patches from pq branch
Closes: #796222, #796225
---
...on-handling-during-the-start-of-iceweasel.patch | 74 ++++++++++++++++
...02-update-button-labels-to-manage-filters.patch | 98 ++++++++++++++++++++++
debian/patches/series | 2 +
3 files changed, 174 insertions(+)
diff --git a/debian/patches/0001-fix-version-handling-during-the-start-of-iceweasel.patch b/debian/patches/0001-fix-version-handling-during-the-start-of-iceweasel.patch
new file mode 100644
index 0000000..7ce4971
--- /dev/null
+++ b/debian/patches/0001-fix-version-handling-during-the-start-of-iceweasel.patch
@@ -0,0 +1,74 @@
+From: Sascha Girrulat <sascha at girrulat.de>
+Date: Tue, 18 Aug 2015 14:37:37 +0200
+Subject: fix version handling during the start of iceweasel
+
+The empty preferences asf.version and asf.currentVersion results in a displayed
+extra tab with the update information everytime you start firefox. Parts from
+this patch are backported from upstream.
+
+Closes: #796222
+---
+ content/asf_right_click.js | 25 ++++++++++---------------
+ defaults/preferences/asf.js | 5 +++--
+ 2 files changed, 13 insertions(+), 17 deletions(-)
+
+diff --git a/content/asf_right_click.js b/content/asf_right_click.js
+index 0ca5f31..92109c3 100644
+--- a/content/asf_right_click.js
++++ b/content/asf_right_click.js
+@@ -855,21 +855,16 @@ var automatic_save_folder = {
+ {
+ this.prefManager.setCharPref("extensions.asf.version", "1.0.0")
+ }
+-
++
++ this.currentASFVersion = this.prefManager.getCharPref("extensions.asf.currentVersion");
++
++ // ensure asf.version is not empty to avoid ever displayed update message
++ if(this.prefManager.getPrefType("extensions.asf.version") == "")
++ {
++ this.prefManager.setCharPref("extensions.asf.version", this.currentASFVersion)
++ }
++
+ this.previousASFVersion = this.prefManager.getCharPref("extensions.asf.version");
+-
+- // Read currently installed ASF version, including beta revisions
+- // workaround for Firefox4 new asynchronous addonManager (can't depend on addon.version anymore,
+- // so for all versions of Firefox, read the data directly from the dtd source file.
+- var XhrObj = new XMLHttpRequest();
+- XhrObj.open("GET", "chrome://asf/content/common.dtd", false); //synchronous mode
+- XhrObj.overrideMimeType('text/plain; charset=UTF-8');
+- XhrObj.send(null);
+- if (XhrObj.status == 0)
+- {
+- var dtd = XhrObj.responseText.split("\n") ;
+- this.currentASFVersion = dtd[1].match(/"(.*)"/)[1];
+- }
+ },
+
+
+@@ -993,4 +988,4 @@ var automatic_save_folder = {
+ "load", // After browser window is loaded
+ function(){ automatic_save_folder.rightclick_init(); }, // Run main from automatic_save_folder to check the filters
+ false
+- );
+\ No newline at end of file
++ );
+diff --git a/defaults/preferences/asf.js b/defaults/preferences/asf.js
+index ca67dbf..8bb8b87 100644
+--- a/defaults/preferences/asf.js
++++ b/defaults/preferences/asf.js
+@@ -1,4 +1,5 @@
+- pref("extensions.asf.lastdir", true);
++ pref("extensions.asf.currentVersion", "1.0.4");
++ pref("extensions.asf.lastdir", true);
+ pref("extensions.asf.keeptemp", true);
+ pref("extensions.asf.viewdloption", false);
+ pref("extensions.asf.viewdloptionType", 0);
+@@ -33,4 +34,4 @@ pref("extensions.asf at mangaheart.org.description", "chrome://asf/locale/asf.prope
+ pref("extensions.asf.exportFolder", "");
+ pref("extensions.asf.showExportButton", false);
+ pref("extensions.asf.suggestAllPossibleFolders", false);
+- pref("extensions.asf.useSiteBySiteSavePath", false); // new feature since Firefox 7.0.1
+\ No newline at end of file
++ pref("extensions.asf.useSiteBySiteSavePath", false); // new feature since Firefox 7.0.1
diff --git a/debian/patches/0002-update-button-labels-to-manage-filters.patch b/debian/patches/0002-update-button-labels-to-manage-filters.patch
new file mode 100644
index 0000000..e62f9dc
--- /dev/null
+++ b/debian/patches/0002-update-button-labels-to-manage-filters.patch
@@ -0,0 +1,98 @@
+From: Sascha Girrulat <sascha at girrulat.de>
+Date: Thu, 20 Aug 2015 12:10:53 +0200
+Subject: update button labels to manage filters
+
+The button labels are not set consistently so if the icon is not displayed
+correctly the button will be empty. This patch will update all missing labels for
+the buttons add/delete/up/down/edit in the filter dialog of the extension
+preferences.
+
+Closes: #796225
+---
+ locale/en-US/asf.dtd | 8 ++++----
+ locale/fr/asf.dtd | 10 +++++-----
+ locale/it/asf.dtd | 8 ++++----
+ locale/ru/asf.dtd | 8 ++++----
+ 4 files changed, 17 insertions(+), 17 deletions(-)
+
+diff --git a/locale/en-US/asf.dtd b/locale/en-US/asf.dtd
+index d3e3a3a..1623ba3 100644
+--- a/locale/en-US/asf.dtd
++++ b/locale/en-US/asf.dtd
+@@ -20,11 +20,11 @@
+ <!ENTITY asf.tree.column.localfolder "Local folder">
+ <!ENTITY asf.tree.column.enabled "Active">
+ <!-- this is 1 space (not empty string), this is the text you want to see on the buttons next to the arrows on the filter's tab, you can write 'up' if you want -->
+-<!ENTITY asf.options.move.up " ">
+-<!ENTITY asf.options.move.down " ">
++<!ENTITY asf.options.move.up "Up">
++<!ENTITY asf.options.move.down "Down">
+ <!ENTITY asf.options.edit "Edit">
+-<!ENTITY asf.options.delete " ">
+-<!ENTITY asf.options.add " ">
++<!ENTITY asf.options.delete "Delete">
++<!ENTITY asf.options.add "Add">
+
+ <!-- Filters tab - bottom -->
+ <!ENTITY asf.default.label "If the file doesn't match any filter, save to:">
+diff --git a/locale/fr/asf.dtd b/locale/fr/asf.dtd
+index b255463..751c737 100644
+--- a/locale/fr/asf.dtd
++++ b/locale/fr/asf.dtd
+@@ -20,11 +20,11 @@
+ <!ENTITY asf.tree.column.localfolder "Dossier local">
+ <!ENTITY asf.tree.column.enabled "Actif">
+ <!-- this is 1 space (not empty string), this is the text you want to see on the buttons next to the arrows on the filter's tab, you can write 'up' if you want -->
+-<!ENTITY asf.options.move.up " ">
+-<!ENTITY asf.options.move.down " ">
+-<!ENTITY asf.options.edit "Éditer">
+-<!ENTITY asf.options.delete " ">
+-<!ENTITY asf.options.add " ">
++<!ENTITY asf.options.move.up "Vers le haut">
++<!ENTITY asf.options.move.down "Vers le bas">
++<!ENTITY asf.options.edit "Éditer">
++<!ENTITY asf.options.delete "Supprimer">
++<!ENTITY asf.options.add "Ajouter">
+
+ <!-- Filters tab - bottom -->
+ <!ENTITY asf.default.label "Dossier d'enregistrement lorsqu'aucun filtre n'est trouvé :">
+diff --git a/locale/it/asf.dtd b/locale/it/asf.dtd
+index 71473d8..6382d1d 100644
+--- a/locale/it/asf.dtd
++++ b/locale/it/asf.dtd
+@@ -20,11 +20,11 @@
+ <!ENTITY asf.tree.column.localfolder "Cartella locale">
+ <!ENTITY asf.tree.column.enabled "Attivo">
+ <!-- this is 1 space (not empty string), this is the text you want to see on the buttons next to the arrows on the filter's tab, you can write 'up' if you want -->
+-<!ENTITY asf.options.move.up " ">
+-<!ENTITY asf.options.move.down " ">
++<!ENTITY asf.options.move.up "Alto">
++<!ENTITY asf.options.move.down "Giù">
+ <!ENTITY asf.options.edit "Modifica">
+-<!ENTITY asf.options.delete " ">
+-<!ENTITY asf.options.add " ">
++<!ENTITY asf.options.delete "Cancellare">
++<!ENTITY asf.options.add "Sommare">
+
+ <!-- preference bottom -->
+ <!ENTITY asf.default.label "Cartella per salvare il file se nessun filtro corrisponde:">
+diff --git a/locale/ru/asf.dtd b/locale/ru/asf.dtd
+index 81619d1..788befe 100644
+--- a/locale/ru/asf.dtd
++++ b/locale/ru/asf.dtd
+@@ -20,11 +20,11 @@
+ <!ENTITY asf.tree.column.localfolder "Папка для сохранения">
+ <!ENTITY asf.tree.column.enabled "Архив">
+ <!-- this is 1 space (not empty string), this is the text you want to see on the buttons next to the arrows on the filter"s tab, you can write "up" if you want -->
+-<!ENTITY asf.options.move.up " ">
+-<!ENTITY asf.options.move.down " ">
++<!ENTITY asf.options.move.up "наверх">
++<!ENTITY asf.options.move.down "вниз">
+ <!ENTITY asf.options.edit "Изменить">
+-<!ENTITY asf.options.delete " ">
+-<!ENTITY asf.options.add " ">
++<!ENTITY asf.options.delete "удалять">
++<!ENTITY asf.options.add "добавлять">
+
+ <!-- Filters tab - bottom -->
+ <!ENTITY asf.default.label "Если файл не соответствует ни одному фильтру сохранить в:">
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..20fb7c2
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+0001-fix-version-handling-during-the-start-of-iceweasel.patch
+0002-update-button-labels-to-manage-filters.patch
--
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