Import r6948 from upstream hg supporting Firefox up to 24.*

[dactyl.git] / common / modules / messages.jsm

diff --git a/common/modules/messages.jsm b/common/modules/messages.jsm
index bca366992cf0b3f49a5752a97fcb4ae3ab20a26d..533c0043d5686f25a90e4962156a33a5893a0dd1 100644 (file)
--- a/common/modules/messages.jsm
+++ b/common/modules/messages.jsm
@@ -1,16 +1,13 @@
-// Copyright (c) 2011 by Kris Maglione <maglione.k@gmail.com>
+// Copyright (c) 2011-2012 Kris Maglione <maglione.k@gmail.com>
 //
 // This work is licensed for reuse under an MIT license. Details are
 // given in the LICENSE.txt file included with this file.
-/* use strict */
+"use strict";
 
-try {
-
-Components.utils.import("resource://dactyl/bootstrap.jsm");
 defineModule("messages", {
     exports: ["Messages", "messages", "_"],
     require: ["services", "util"]
-}, this);
+});
 
 var Messages = Module("messages", {
 
@@ -45,7 +42,8 @@ var Messages = Module("messages", {
         array.uniq([JSMLoader.getTarget("dactyl://locale/" + this.name + ".properties"),
                     JSMLoader.getTarget("dactyl://locale-local/" + this.name + ".properties"),
                     "resource://dactyl-locale/en-US/" + this.name + ".properties",
-                    "resource://dactyl-locale-local/en-US/" + this.name + ".properties"])
+                    "resource://dactyl-locale-local/en-US/" + this.name + ".properties"],
+                   true)
              .map(services.stringBundle.createBundle)
              .filter(function (bundle) { try { bundle.getSimpleEnumeration(); return true; } catch (e) { return false; } })),
 
@@ -100,7 +98,7 @@ var Messages = Module("messages", {
         file = io.File(file);
 
         function properties(base, iter_, prop) iter(function _properties() {
-            function key() [base, obj.identifier || obj.name].concat(Array.slice(arguments)).join(".").replace(/[\\:=]/g, "\\$&");
+            function key(...args) [base, obj.identifier || obj.name].concat(args).join(".").replace(/[\\:=]/g, "\\$&");
 
             prop = prop || "description";
             for (var obj in iter_) {
@@ -149,7 +147,6 @@ var Messages = Module("messages", {
                 obj[_prop] = this.default;
                 return {
                     get: function get() {
-                        let self = this;
                         let value = this[_prop];
 
                         function getter(key, default_) function getter() messages.get([name, key].join("."), default_);
@@ -205,6 +202,6 @@ var { _ } = messages;
 
 endModule();
 
-} catch(e){ if (!e.stack) e = Error(e); dump(e.fileName+":"+e.lineNumber+": "+e+"\n" + e.stack); }
+// catch(e){ if (!e.stack) e = Error(e); dump(e.fileName+":"+e.lineNumber+": "+e+"\n" + e.stack); }
 
-// vim: set fdm=marker sw=4 ts=4 et ft=javascript:
+// vim: set fdm=marker sw=4 sts=4 ts=8 et ft=javascript: