[Pkg-mozext-commits] [status-4-evar] 01/05: New upstream version 2017.08.20.15
Ximin Luo
infinity0 at debian.org
Fri Aug 25 09:56:42 UTC 2017
This is an automated email from the git hooks/post-receive script.
infinity0 pushed a commit to branch master
in repository status-4-evar.
commit 3232eb7e03d2ac6801279266856dcc0aac85fb5c
Author: Ximin Luo <infinity0 at debian.org>
Date: Fri Aug 25 11:38:38 2017 +0200
New upstream version 2017.08.20.15
---
META-INF/manifest.mf | 29 +++++++++++++----------
META-INF/mozilla.rsa | Bin 4188 -> 4188 bytes
META-INF/mozilla.sf | 4 ++--
chrome/content/overlay.xul | 6 +----
install.rdf | 57 +++++++++++++++++++++++----------------------
modules/Australis.jsm | 37 +++++++++++++++++++++--------
modules/DownloadUI.jsm | 48 ++++----------------------------------
modules/L10n.jsm | 28 ++++++++++++++++++++++
modules/Progress.jsm | 9 +++----
modules/Status4Evar.jsm | 6 ++---
10 files changed, 116 insertions(+), 108 deletions(-)
diff --git a/META-INF/manifest.mf b/META-INF/manifest.mf
index 6fb7ab6..951b474 100644
--- a/META-INF/manifest.mf
+++ b/META-INF/manifest.mf
@@ -2,8 +2,8 @@ Manifest-Version: 1.0
Name: install.rdf
Digest-Algorithms: MD5 SHA1
-MD5-Digest: yWXV+A+mhxNk9wa8vBMBBg==
-SHA1-Digest: Z4cY/QvCOjTBvR61pUbi68nNICU=
+MD5-Digest: ZryEykBlD61evmqZV6RlOA==
+SHA1-Digest: mCWSxhib2RE8bvilhAOIluk55IE=
Name: chrome.manifest
Digest-Algorithms: MD5 SHA1
@@ -27,8 +27,8 @@ SHA1-Digest: 9+pdQqMhADUHsyjXBstyDj189LM=
Name: chrome/content/overlay.xul
Digest-Algorithms: MD5 SHA1
-MD5-Digest: 8HovwCcRZ58opk3BOhHL6g==
-SHA1-Digest: M/+xE2NeNZQDRmtNNl8uJyxi3JM=
+MD5-Digest: Q5ETtZRi6KMuMzSdyZKhxg==
+SHA1-Digest: DZqmLciTabx/dR6IXB2m4xe/PjM=
Name: chrome/content/prefs.css
Digest-Algorithms: MD5 SHA1
@@ -837,8 +837,8 @@ SHA1-Digest: gqr5ycxWUMjojaMzmqOhagMNAAA=
Name: modules/Australis.jsm
Digest-Algorithms: MD5 SHA1
-MD5-Digest: o8j5aPa7MsOLYBP8sJIB2Q==
-SHA1-Digest: V8Hd/DGOwjNnEAQd1yw8m8rNDVc=
+MD5-Digest: tv2ZcMLTq1tdXhLjPgRyZA==
+SHA1-Digest: TJ3TvKdyqC3v1DprVz1s9PSq7qs=
Name: modules/DownloadService.jsm
Digest-Algorithms: MD5 SHA1
@@ -847,13 +847,18 @@ SHA1-Digest: oX6tog9wO7cAPfxhIEmc/hvbwB8=
Name: modules/DownloadUI.jsm
Digest-Algorithms: MD5 SHA1
-MD5-Digest: WJbANKqlqMX93dxUzPAY1Q==
-SHA1-Digest: obN06ly1ia9TdckHylzB0KTyckM=
+MD5-Digest: crNe182RFAM385KtdMDTWA==
+SHA1-Digest: UipZENZmWji5FUAUXt5YOmmsDKc=
+
+Name: modules/L10n.jsm
+Digest-Algorithms: MD5 SHA1
+MD5-Digest: 3OE+ZbNgk2rcJJOfJYuJRg==
+SHA1-Digest: AAAdzMxuf/sVb8naCH+YXkFRtQs=
Name: modules/Progress.jsm
Digest-Algorithms: MD5 SHA1
-MD5-Digest: haBsptoChSpqaybB4V0Waw==
-SHA1-Digest: 0bEA3F2WfFooFgpKHjAr2+j+BjI=
+MD5-Digest: E6jrpqhF4VSfUdwQ1ReJqQ==
+SHA1-Digest: pNOvv1UP0EPpblfYtIv9VFQM4Kk=
Name: modules/Status.jsm
Digest-Algorithms: MD5 SHA1
@@ -862,8 +867,8 @@ SHA1-Digest: c5FM3XJVYlrO4qZUU81GO962NZQ=
Name: modules/Status4Evar.jsm
Digest-Algorithms: MD5 SHA1
-MD5-Digest: ZRtE2ZQvzLr4c9JbkSdSjA==
-SHA1-Digest: pefjX28BOpU+sWGQC7w63sBjM84=
+MD5-Digest: QxliHubMHKdpLnMMjkR3cw==
+SHA1-Digest: IwwSHV1FpdrqcMihdMVswep1Jt0=
Name: modules/Toolbars.jsm
Digest-Algorithms: MD5 SHA1
diff --git a/META-INF/mozilla.rsa b/META-INF/mozilla.rsa
index 40cb1e8..b7bc2e1 100644
Binary files a/META-INF/mozilla.rsa and b/META-INF/mozilla.rsa differ
diff --git a/META-INF/mozilla.sf b/META-INF/mozilla.sf
index e9a436a..ccf4555 100644
--- a/META-INF/mozilla.sf
+++ b/META-INF/mozilla.sf
@@ -1,4 +1,4 @@
Signature-Version: 1.0
-MD5-Digest-Manifest: vjWxo+3Xi2MjSZxhxRM7Vw==
-SHA1-Digest-Manifest: yO54kaNHANKyEaZczNYJY8+dRXU=
+MD5-Digest-Manifest: fQM3yzKabAbgzZe9t+MEAA==
+SHA1-Digest-Manifest: 0AqQVY24QYXff6u5FHcSPr6fzMk=
diff --git a/chrome/content/overlay.xul b/chrome/content/overlay.xul
index 389d634..080c04c 100644
--- a/chrome/content/overlay.xul
+++ b/chrome/content/overlay.xul
@@ -8,7 +8,7 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
- - Copyright (C) 2010-2011, 2013-2015 Matthew Turnbull <sparky at bluefang-logic.com>. All Rights Reserved.
+ - Copyright (C) 2010-2011, 2013-2015, 2017 Matthew Turnbull <sparky at bluefang-logic.com>. All Rights Reserved.
-
- ***** END LICENSE BLOCK *****
-->
@@ -21,10 +21,6 @@
<overlay id="status4evar-overlay"
xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul">
- <stringbundleset id="stringbundleset">
- <stringbundle id="bundle_status4evar" src="chrome://status4evar/locale/overlay.properties" />
- </stringbundleset>
-
<script type="application/javascript" src="chrome://status4evar/content/overlay.js" />
<commandset>
diff --git a/install.rdf b/install.rdf
index 62186f5..59396e2 100644
--- a/install.rdf
+++ b/install.rdf
@@ -6,7 +6,7 @@
- License, v. 2.0. If a copy of the MPL was not distributed with this
- file, You can obtain one at http://mozilla.org/MPL/2.0/.
-
- - Copyright (C) 2016 Matthew Turnbull <sparky at bluefang-logic.com>. All Rights Reserved.
+ - Copyright (C) 2017 Matthew Turnbull <sparky at bluefang-logic.com>. All Rights Reserved.
-
- ***** END LICENSE BLOCK ***** -->
@@ -18,8 +18,9 @@
<em:name>Status-4-Evar</em:name>
<em:description>Status widgets and progress indicators for Firefox 4+</em:description>
<em:id>status4evar at caligonstudios.com</em:id>
- <em:version>2016.10.11.01</em:version>
- <em:creator>Sparky Bluefang</em:creator>
+ <em:version>2017.08.20.15</em:version>
+ <em:creator>Matthew Turnbull <Sparky Bluefang></em:creator>
+ <em:contributor>Jonas Jenwald <Snuffleupagus></em:contributor>
<em:type>2</em:type>
<em:homepageURL>http://forums.mozillazine.org/viewtopic.php?f=48&t=2001965</em:homepageURL>
<em:iconURL>chrome://status4evar/skin/s4e32.png</em:iconURL>
@@ -33,7 +34,7 @@
<em:locale>bg-BG</em:locale>
<em:name>Status-4-Evar</em:name>
<em:description>Лента за състоянието, за Firefox 4+</em:description>
- <em:creator>Sparky Bluefang</em:creator>
+ <em:creator>Matthew Turnbull <Sparky Bluefang></em:creator>
<em:homepageURL>http://forums.mozillazine.org/viewtopic.php?f=48&t=2001965</em:homepageURL>
<em:translator>Martin - Varna [bg-BG]</em:translator>
</Description>
@@ -44,7 +45,7 @@
<em:locale>cs</em:locale>
<em:name>Status-4-Evar</em:name>
<em:description>Stavová udělátka a indikátory pro Firefox4+</em:description>
- <em:creator>Sparky Bluefang</em:creator>
+ <em:creator>Matthew Turnbull <Sparky Bluefang></em:creator>
<em:homepageURL>http://forums.mozillazine.org/viewtopic.php?f=48&t=2001965</em:homepageURL>
<em:translator>Michal Stanke [cs]</em:translator>
</Description>
@@ -55,7 +56,7 @@
<em:locale>da</em:locale>
<em:name>Status-4-Evar</em:name>
<em:description>Status-widgets og forløbsindikatorer til Firefox 4+</em:description>
- <em:creator>Sparky Bluefang</em:creator>
+ <em:creator>Matthew Turnbull <Sparky Bluefang></em:creator>
<em:homepageURL>http://forums.mozillazine.org/viewtopic.php?f=48&t=2001965</em:homepageURL>
<em:translator>Joergen [da]</em:translator>
</Description>
@@ -66,7 +67,7 @@
<em:locale>de</em:locale>
<em:name>Status-4-Evar</em:name>
<em:description>Verschiedene Status- und Fortschrittsanzeige-Elemente für Firefox 4 und höher</em:description>
- <em:creator>Sparky Bluefang</em:creator>
+ <em:creator>Matthew Turnbull <Sparky Bluefang></em:creator>
<em:homepageURL>http://forums.mozillazine.org/viewtopic.php?f=48&t=2001965</em:homepageURL>
<em:translator>o.roth (ReinekeFux) [de]</em:translator><em:translator>Archaeopteryx [de]</em:translator><em:translator>Endor [de]</em:translator>
</Description>
@@ -77,7 +78,7 @@
<em:locale>dsb</em:locale>
<em:name>Status-4-Evar</em:name>
<em:description>Statusowe asistenty a póstupowe grědy za Firefox 4+</em:description>
- <em:creator>Sparky Bluefang</em:creator>
+ <em:creator>Matthew Turnbull <Sparky Bluefang></em:creator>
<em:homepageURL>http://forums.mozillazine.org/viewtopic.php?f=48&t=2001965</em:homepageURL>
<em:translator>milupo [dsb]</em:translator>
</Description>
@@ -88,7 +89,7 @@
<em:locale>el</em:locale>
<em:name>Status-4-Evar</em:name>
<em:description>Οπτικά στοιχεία κατάστασης και ενδείκτες προόδου για Firefox 4+</em:description>
- <em:creator>Sparky Bluefang</em:creator>
+ <em:creator>Matthew Turnbull <Sparky Bluefang></em:creator>
<em:homepageURL>http://forums.mozillazine.org/viewtopic.php?f=48&t=2001965</em:homepageURL>
<em:translator>Γιώργος Μαλαμάς [el]</em:translator>
</Description>
@@ -99,7 +100,7 @@
<em:locale>eo</em:locale>
<em:name>Status-4-Evar</em:name>
<em:description>Stataj fenestraĵoj kaj plenumindikiloj por Firefox 4+</em:description>
- <em:creator>Sparky Bluefang</em:creator>
+ <em:creator>Matthew Turnbull <Sparky Bluefang></em:creator>
<em:homepageURL>http://forums.mozillazine.org/viewtopic.php?f=48&t=2001965</em:homepageURL>
<em:translator>Milupo [eo]</em:translator>
</Description>
@@ -110,7 +111,7 @@
<em:locale>es-ES</em:locale>
<em:name>Status-4-Evar</em:name>
<em:description>Incluye los indicadores de estado y de progreso para Firefox 4+</em:description>
- <em:creator>Sparky Bluefang</em:creator>
+ <em:creator>Matthew Turnbull <Sparky Bluefang></em:creator>
<em:homepageURL>http://forums.mozillazine.org/viewtopic.php?f=48&t=2001965</em:homepageURL>
<em:translator>José I. Plaza [es-ES]</em:translator><em:translator>Carlos Mella [es-ES]</em:translator>
</Description>
@@ -121,7 +122,7 @@
<em:locale>fr</em:locale>
<em:name>Status-4-Evar</em:name>
<em:description>Outils indiquant l'état et barres de progressions pour Firefox 4+</em:description>
- <em:creator>Sparky Bluefang</em:creator>
+ <em:creator>Matthew Turnbull <Sparky Bluefang></em:creator>
<em:homepageURL>http://forums.mozillazine.org/viewtopic.php?f=48&t=2001965</em:homepageURL>
<em:translator>Jojaba [fr]</em:translator>
</Description>
@@ -132,7 +133,7 @@
<em:locale>he</em:locale>
<em:name>Status-4-Evar</em:name>
<em:description>יישומוני מצב ומדדי התקדמות עבור Firefox 4+</em:description>
- <em:creator>Sparky Bluefang</em:creator>
+ <em:creator>Matthew Turnbull <Sparky Bluefang></em:creator>
<em:homepageURL>http://forums.mozillazine.org/viewtopic.php?f=48&t=2001965</em:homepageURL>
<em:translator>SiiiE [he]</em:translator>
</Description>
@@ -143,7 +144,7 @@
<em:locale>hsb</em:locale>
<em:name>Status-4-Evar</em:name>
<em:description>Statusowe asistenty a postupowe hrjady za Firefox 4+</em:description>
- <em:creator>Sparky Bluefang</em:creator>
+ <em:creator>Matthew Turnbull <Sparky Bluefang></em:creator>
<em:homepageURL>http://forums.mozillazine.org/viewtopic.php?f=48&t=2001965</em:homepageURL>
<em:translator>Milupo [hsb]</em:translator>
</Description>
@@ -154,7 +155,7 @@
<em:locale>hu</em:locale>
<em:name>Status-4-Evar</em:name>
<em:description>Állapot- és betöltésjelző elemek Firefox 4+ -hoz</em:description>
- <em:creator>Sparky Bluefang</em:creator>
+ <em:creator>Matthew Turnbull <Sparky Bluefang></em:creator>
<em:homepageURL>http://forums.mozillazine.org/viewtopic.php?f=48&t=2001965</em:homepageURL>
<em:translator>Kozák Csaba (WonderCsabo) [hu]</em:translator>
</Description>
@@ -165,7 +166,7 @@
<em:locale>it-IT</em:locale>
<em:name>Status-4-Evar</em:name>
<em:description>Elementi della barra di stato e indicatori di avanzamento per Firefox 4+</em:description>
- <em:creator>Sparky Bluefang</em:creator>
+ <em:creator>Matthew Turnbull <Sparky Bluefang></em:creator>
<em:homepageURL>http://forums.mozillazine.org/viewtopic.php?f=48&t=2001965</em:homepageURL>
<em:translator>Emanuele Alimonda [it-IT]</em:translator>
</Description>
@@ -176,7 +177,7 @@
<em:locale>ja-JP</em:locale>
<em:name>Status-4-Evar</em:name>
<em:description>Firefox 4 以降のステータスバーやプログレスバー表示をカスタマイズ</em:description>
- <em:creator>Sparky Bluefang</em:creator>
+ <em:creator>Matthew Turnbull <Sparky Bluefang></em:creator>
<em:homepageURL>http://forums.mozillazine.org/viewtopic.php?f=48&t=2001965</em:homepageURL>
<em:translator>能美涼子 [ja-JP]</em:translator><em:translator>k2jp [ja-JP]</em:translator>
</Description>
@@ -187,7 +188,7 @@
<em:locale>nb-NO</em:locale>
<em:name>Status-4-Evar</em:name>
<em:description>Statusfunksjoner og framdriftsviser for Firefox 4+</em:description>
- <em:creator>Sparky Bluefang</em:creator>
+ <em:creator>Matthew Turnbull <Sparky Bluefang></em:creator>
<em:homepageURL>http://forums.mozillazine.org/viewtopic.php?f=48&t=2001965</em:homepageURL>
<em:translator>Håvar Ingmund Henriksen [nb-NO]</em:translator>
</Description>
@@ -198,7 +199,7 @@
<em:locale>nl</em:locale>
<em:name>Status-4-Evar</em:name>
<em:description>Hulpmiddelen voor de statusbalk voor Firefox 4 en hoger</em:description>
- <em:creator>Sparky Bluefang</em:creator>
+ <em:creator>Matthew Turnbull <Sparky Bluefang></em:creator>
<em:homepageURL>http://forums.mozillazine.org/viewtopic.php?f=48&t=2001965</em:homepageURL>
<em:translator>Martijn Weisbeek [nl]</em:translator>
</Description>
@@ -209,7 +210,7 @@
<em:locale>pl</em:locale>
<em:name>Status-4-Evar</em:name>
<em:description>Informacje o statusie i wskaźniki postępu dla Firefoksa 4+</em:description>
- <em:creator>Sparky Bluefang</em:creator>
+ <em:creator>Matthew Turnbull <Sparky Bluefang></em:creator>
<em:homepageURL>http://forums.mozillazine.org/viewtopic.php?f=48&t=2001965</em:homepageURL>
<em:translator>Leszek(teo)Życzkowski [pl]</em:translator><em:translator>Leepa [pl]</em:translator><em:translator>momus [pl]</em:translator>
</Description>
@@ -220,7 +221,7 @@
<em:locale>pt-BR</em:locale>
<em:name>Status-4-Evar</em:name>
<em:description>Widgets de status e indicadores de progresso para o Firefox 4+</em:description>
- <em:creator>Sparky Bluefang</em:creator>
+ <em:creator>Matthew Turnbull <Sparky Bluefang></em:creator>
<em:homepageURL>http://forums.mozillazine.org/viewtopic.php?f=48&t=2001965</em:homepageURL>
<em:translator>Gutierrez PS [pt-BR]</em:translator>
</Description>
@@ -231,7 +232,7 @@
<em:locale>ro</em:locale>
<em:name>Status-4-Evar</em:name>
<em:description>Instrumente de indicare a stării navigatorului și indicatoare de progres pentru Firefox 4+.</em:description>
- <em:creator>Sparky Bluefang</em:creator>
+ <em:creator>Matthew Turnbull <Sparky Bluefang></em:creator>
<em:homepageURL>http://forums.mozillazine.org/viewtopic.php?f=48&t=2001965</em:homepageURL>
<em:translator>Cătălin Zamfirescu (x10firefox) [ro]</em:translator>
</Description>
@@ -242,7 +243,7 @@
<em:locale>ru</em:locale>
<em:name>Status-4-Evar</em:name>
<em:description>Элементы и индикаторы бывшей строки состояния для Firefox 4+</em:description>
- <em:creator>Sparky Bluefang</em:creator>
+ <em:creator>Matthew Turnbull <Sparky Bluefang></em:creator>
<em:homepageURL>http://forums.mozillazine.org/viewtopic.php?f=48&t=2001965</em:homepageURL>
<em:translator>Пирятинский Виталий [ru]</em:translator>
</Description>
@@ -253,7 +254,7 @@
<em:locale>sr</em:locale>
<em:name>Status-4-Evar</em:name>
<em:description>Елементи за стање и показатељи напретка за Фајерфокс 4.</em:description>
- <em:creator>Sparky Bluefang</em:creator>
+ <em:creator>Matthew Turnbull <Sparky Bluefang></em:creator>
<em:homepageURL>http://forums.mozillazine.org/viewtopic.php?f=48&t=2001965</em:homepageURL>
<em:translator>Rancher [sr]</em:translator>
</Description>
@@ -264,7 +265,7 @@
<em:locale>sv-SE</em:locale>
<em:name>Status-4-Evar</em:name>
<em:description>Statusfunktioner och förloppsindikatorer för Firefox 4+</em:description>
- <em:creator>Sparky Bluefang</em:creator>
+ <em:creator>Matthew Turnbull <Sparky Bluefang></em:creator>
<em:homepageURL>http://forums.mozillazine.org/viewtopic.php?f=48&t=2001965</em:homepageURL>
<em:translator>Mikael Hiort af Ornäs [sv-SE]</em:translator>
</Description>
@@ -275,7 +276,7 @@
<em:locale>tr</em:locale>
<em:name>Status-4-Evar</em:name>
<em:description>Firefox 4 + için durum widgetleri ve ilerleme göstergeleri</em:description>
- <em:creator>Sparky Bluefang</em:creator>
+ <em:creator>Matthew Turnbull <Sparky Bluefang></em:creator>
<em:homepageURL>http://forums.mozillazine.org/viewtopic.php?f=48&t=2001965</em:homepageURL>
<em:translator>ckk [tr]</em:translator><em:translator>omrakin [tr]</em:translator>
</Description>
@@ -286,7 +287,7 @@
<em:locale>zh-CN</em:locale>
<em:name>Status-4-Evar</em:name>
<em:description>为Firefox 4+提供状态栏部件和进度条</em:description>
- <em:creator>Sparky Bluefang</em:creator>
+ <em:creator>Matthew Turnbull <Sparky Bluefang></em:creator>
<em:homepageURL>http://forums.mozillazine.org/viewtopic.php?f=48&t=2001965</em:homepageURL>
<em:translator>Cye3s [zh-CN]</em:translator><em:translator>yongdong7 [zh-CN]</em:translator>
</Description>
@@ -297,7 +298,7 @@
<em:locale>zh-TW</em:locale>
<em:name>Status-4-Evar</em:name>
<em:description>Firefox 4及之後版本專用的狀態小工具和載入進度計</em:description>
- <em:creator>Sparky Bluefang</em:creator>
+ <em:creator>Matthew Turnbull <Sparky Bluefang></em:creator>
<em:homepageURL>http://forums.mozillazine.org/viewtopic.php?f=48&t=2001965</em:homepageURL>
<em:translator>velociraptor [zh-TW]</em:translator>
</Description>
diff --git a/modules/Australis.jsm b/modules/Australis.jsm
index 6e5f6cb..86b6057 100644
--- a/modules/Australis.jsm
+++ b/modules/Australis.jsm
@@ -5,7 +5,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
- * Copyright (C) 2013-2015 Matthew Turnbull <sparky at bluefang-logic.com>. All Rights Reserved.
+ * Copyright (C) 2013-2015, 2017 Matthew Turnbull <sparky at bluefang-logic.com>. All Rights Reserved.
*
* ***** END LICENSE BLOCK *****
*/
@@ -26,9 +26,7 @@ const DEFAULT_WIDGETS = [WIDGET_ID_STATUS, WIDGET_ID_PROGRESS, WIDGET_ID_DOWNLOA
CU.import("resource:///modules/CustomizableUI.jsm");
CU.import("resource://gre/modules/Services.jsm");
-CU.import("resource://services-common/stringbundle.js");
-
-const strings = new StringBundle("chrome://status4evar/locale/overlay.properties");
+CU.import("resource://status4evar/L10n.jsm");
CustomizableUI.registerArea(STATUS_BAR_ID, {
type: CustomizableUI.TYPE_TOOLBAR,
@@ -92,7 +90,7 @@ var AustralisTools = {
let item = doc.createElement("toolbaritem");
item.id = LEGACY_SHIM_ID;
item.setAttribute("removable", true);
- item.setAttribute("label", strings.get("legacyWidgetTitle"));
+ item.setAttribute("label", L10n.get("legacyWidgetTitle"));
item.setAttribute("class", "panel-wide-item");
item.setAttribute("closemenu", "none");
item.appendChild(doc.getElementById("status-bar") || palette.querySelector("status-bar"));
@@ -135,11 +133,30 @@ var AustralisTools = {
CustomizableUI.destroyWidget(LEGACY_SHIM_ID);
},
- get TYPE_MENU_PANEL() CustomizableUI.TYPE_MENU_PANEL,
- get TYPE_TOOLBAR() CustomizableUI.TYPE_TOOLBAR,
- get WIDGET_ID_STATUS() WIDGET_ID_STATUS,
- get WIDGET_ID_PROGRESS() WIDGET_ID_PROGRESS,
- get WIDGET_ID_DOWNLOAD() WIDGET_ID_DOWNLOAD,
+ get TYPE_MENU_PANEL()
+ {
+ return CustomizableUI.TYPE_MENU_PANEL;
+ },
+
+ get TYPE_TOOLBAR()
+ {
+ return CustomizableUI.TYPE_TOOLBAR;
+ },
+
+ get WIDGET_ID_STATUS()
+ {
+ return WIDGET_ID_STATUS;
+ },
+
+ get WIDGET_ID_PROGRESS()
+ {
+ return WIDGET_ID_PROGRESS;
+ },
+
+ get WIDGET_ID_DOWNLOAD()
+ {
+ return WIDGET_ID_DOWNLOAD;
+ },
areaForWidget: function(widgetId)
{
diff --git a/modules/DownloadUI.jsm b/modules/DownloadUI.jsm
index ea5bf10..f9722e6 100644
--- a/modules/DownloadUI.jsm
+++ b/modules/DownloadUI.jsm
@@ -7,7 +7,7 @@
*
* Original code copyright (C) Mozilla Foundation. All Rights Reserved.
* Original code copyright (C) 2013 Gijs Kruitbosch <gijskruitbosch at gmail.com>. All Rights Reserved.
- * Copyright (C) 2010-2015 Matthew Turnbull <sparky at bluefang-logic.com>. All Rights Reserved.
+ * Copyright (C) 2010-2015, 2017 Matthew Turnbull <sparky at bluefang-logic.com>. All Rights Reserved.
*
* ***** END LICENSE BLOCK *****
*
@@ -29,6 +29,7 @@ const CU = Components.utils;
CU.import("resource://status4evar/DownloadService.jsm");
CU.import("resource://status4evar/Australis.jsm");
+CU.import("resource://status4evar/L10n.jsm");
CU.import("resource://gre/modules/Services.jsm");
CU.import("resource://gre/modules/PluralForm.jsm");
@@ -236,7 +237,7 @@ S4EDownloadUI.prototype =
state.lastTime = (state.private ? this._statePrivate : this._statePublic).time || Infinity;
state.progressType = (state.paused ? "paused" : "active") + (state.totalSize == 0 ? "-unknown" : "");
- let dlStatus = this._getters.strings.getString(state.paused ? "pausedDownloads" : "activeDownloads");
+ let dlStatus = L10n.get(state.paused ? "pausedDownloads" : "activeDownloads");
state.countStr = PluralForm.get(state.count, dlStatus).replace("#1", state.count);
[state.timeStr, state.time] = DownloadUtils.getTimeLeft(state.time, state.lastTime);
}
@@ -292,7 +293,7 @@ S4EDownloadUI.prototype =
{
download_button.collapsed = true;
}
- download_label.textContent = download_tooltip.label = this._getters.strings.getString("noDownloads");
+ download_label.textContent = download_tooltip.label = L10n.get("noDownloads");
download_progress.collapsed = true;
download_progress.value = 0;
@@ -496,44 +497,3 @@ S4EDownloadUI.prototype =
}
};
-// Firefox < 34 compatibility
-if(Services.vc.compare(Services.appinfo.version, "34.0") < 0 && !Object.assign)
-{
- Object.defineProperty(Object, 'assign',
- {
- enumerable: false,
- configurable: true,
- writable: true,
-
- value: function(target, firstSource)
- {
- 'use strict';
- if(target === undefined || target === null)
- {
- throw new TypeError('Cannot convert first argument to object');
- }
-
- var to = Object(target);
- for(var i = 1; i < arguments.length; i++)
- {
- var nextSource = arguments[i];
- if(nextSource === undefined || nextSource === null)
- {
- continue;
- }
-
- var keysArray = Object.keys(Object(nextSource));
- for(var nextIndex = 0, len = keysArray.length; nextIndex < len; nextIndex++)
- {
- var nextKey = keysArray[nextIndex];
- var desc = Object.getOwnPropertyDescriptor(nextSource, nextKey);
- if(desc !== undefined && desc.enumerable)
- {
- to[nextKey] = nextSource[nextKey];
- }
- }
- }
- return to;
- }
- });
-}
diff --git a/modules/L10n.jsm b/modules/L10n.jsm
new file mode 100644
index 0000000..e8fe03c
--- /dev/null
+++ b/modules/L10n.jsm
@@ -0,0 +1,28 @@
+/*
+ * ***** BEGIN LICENSE BLOCK *****
+ *
+ * This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/.
+ *
+ * Copyright (C) 2017 Matthew Turnbull <sparky at bluefang-logic.com>. All Rights Reserved.
+ *
+ * ***** END LICENSE BLOCK *****
+*/
+
+"use strict";
+
+const EXPORTED_SYMBOLS = ["L10n"];
+
+const CU = Components.utils;
+
+CU.import("resource://gre/modules/Services.jsm");
+
+const strings = Services.strings.createBundle("chrome://status4evar/locale/overlay.properties");
+
+var L10n = {
+ get: function(key)
+ {
+ return strings.GetStringFromName(key);
+ }
+}
diff --git a/modules/Progress.jsm b/modules/Progress.jsm
index e1bd046..56a2893 100644
--- a/modules/Progress.jsm
+++ b/modules/Progress.jsm
@@ -6,7 +6,7 @@
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
* Original code copyright (C) Mozilla Foundation. All Rights Reserved.
- * Copyright (C) 2010-2013 Matthew Turnbull <sparky at bluefang-logic.com>. All Rights Reserved.
+ * Copyright (C) 2010-2013, 2017 Matthew Turnbull <sparky at bluefang-logic.com>. All Rights Reserved.
*
* ***** END LICENSE BLOCK *****
*
@@ -22,6 +22,7 @@ const CI = Components.interfaces;
const CU = Components.utils;
CU.import("resource://gre/modules/XPCOMUtils.jsm");
+CU.import("resource://status4evar/L10n.jsm");
function S4EProgressService(gBrowser, service, getters, statusService) {
this._gBrowser = gBrowser;
@@ -145,10 +146,10 @@ S4EProgressService.prototype =
switch (aStatus)
{
case Components.results.NS_BINDING_ABORTED:
- msg = this._getters.strings.getString("nv_stopped");
+ msg = L10n.get("nv_stopped");
break;
case Components.results.NS_ERROR_NET_TIMEOUT:
- msg = this._getters.strings.getString("nv_timeout");
+ msg = L10n.get("nv_timeout");
break;
}
}
@@ -156,7 +157,7 @@ S4EProgressService.prototype =
if(!msg && (!location || location.spec != "about:blank"))
{
- msg = this._getters.strings.getString("nv_done");
+ msg = L10n.get("nv_done");
}
this._statusService.setDefaultStatus(msg);
diff --git a/modules/Status4Evar.jsm b/modules/Status4Evar.jsm
index 973c699..2a1d995 100644
--- a/modules/Status4Evar.jsm
+++ b/modules/Status4Evar.jsm
@@ -5,7 +5,7 @@
* License, v. 2.0. If a copy of the MPL was not distributed with this
* file, You can obtain one at http://mozilla.org/MPL/2.0/.
*
- * Copyright (C) 2010-2015 Matthew Turnbull <sparky at bluefang-logic.com>. All Rights Reserved.
+ * Copyright (C) 2010-2015, 2017 Matthew Turnbull <sparky at bluefang-logic.com>. All Rights Reserved.
*
* ***** END LICENSE BLOCK *****
*/
@@ -30,6 +30,7 @@ CU.import("resource://status4evar/Status.jsm");
CU.import("resource://status4evar/Progress.jsm");
CU.import("resource://status4evar/DownloadUI.jsm");
CU.import("resource://status4evar/Toolbars.jsm");
+CU.import("resource://status4evar/L10n.jsm");
function Status4Evar(window, gBrowser, toolbox, menuPanelUI)
{
@@ -113,7 +114,7 @@ Status4Evar.prototype =
let status_label = this.getters.statusWidgetLabel;
if(status_label)
{
- status_label.value = this.getters.strings.getString("statusText");
+ status_label.value = L10n.get("statusText");
}
this.menuPanelListener.uninit();
@@ -202,7 +203,6 @@ S4EWindowGetters.prototype =
["statusBar", "status4evar-status-bar"],
["statusWidget", "status4evar-status-widget"],
["statusWidgetLabel", "status4evar-status-text"],
- ["strings", "bundle_status4evar"],
["throbberProgress", "status4evar-throbber-widget"],
["toolbarProgress", "status4evar-progress-bar"],
["urlbarProgress", "urlbar-progress-alt"]
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mozext/status-4-evar.git
More information about the Pkg-mozext-commits
mailing list