gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2025-12-23 03:37:58 +01:00
Code Issues Projects Releases Wiki Activity

Move some more strings to messages.properties and report (but don't throw) an error for unknown strings.

Browse Source
This commit is contained in:
Kris Maglione
2011-03-02 02:59:04 -05:00
parent 28d1c1bcad
commit e032a82d62
9 changed files with 147 additions and 103 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
common/modules/messages.jsm
View File

@@ -20,11 +20,19 @@ var Messages = Module("messages", {
this.bundle = services.stringBundle.createBundle(JSMLoader.getTarget("dactyl://locale/messages.properties"));
this._ = function _(message) {
if (arguments.length > 1) {
let args = Array.slice(arguments, 1);
return this.format(message + "-" + args.length, args, null) || this.format(message, args);
}
return this.get(message);
};
let seen = {};
for (let prop in iter(this.bundle.getSimpleEnumeration())) {
let key = prop.QueryInterface(Ci.nsIPropertyElement).key.split(".")[0];
if (!set.add(seen, key))
this[key] = {
this._[key] = this[key] = {
__noSuchMethod__: function __(prop, args) self._.apply(self, [prop].concat(args))
};
}
@@ -34,19 +42,14 @@ var Messages = Module("messages", {
services.stringBundle.flushBundles();
},
_: function _(message) {
if (arguments.length > 1) {
let args = Array.slice(arguments, 1);
return this.format(message + "-", args, null) || this.format(message, args);
}
return this.get(message);
},
get: function get(value, default_) {
try {
return this.bundle.GetStringFromName(value);
}
catch (e) {
// Report error so tests fail, but don't throw
if (arguments.length < 2)
util.reportError(Error("Invalid locale string: " + value + ": " + e));
return arguments.length > 1 ? default_ : value;
}
},
@@ -56,6 +59,9 @@ var Messages = Module("messages", {
return this.bundle.formatStringFromName(value, args, args.length);
}
catch (e) {
// Report error so tests fail, but don't throw
if (arguments.length < 3)
util.reportError(Error("Invalid locale string: " + value + ": " + e));
return arguments.length > 2 ? default_ : value;
}
}