gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-03-04 20:55:47 +01:00
Code Issues Projects Releases Wiki Activity

Implement string bundle cascading.

Browse Source
This commit is contained in:
Kris Maglione
2011-03-07 22:24:55 -05:00
parent cd4c0a7722
commit b5447ae736
1 changed files with 29 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

50
common/modules/messages.jsm
View File

@@ -15,10 +15,16 @@ defineModule("messages", {
// TODO: Lazy instantiation // TODO: Lazy instantiation
var Messages = Module("messages", { var Messages = Module("messages", {
init: function init() { init: function init(name) {
let self = this; let self = this;
name = name || "messages";
this.bundle = services.stringBundle.createBundle(JSMLoader.getTarget("dactyl://locale/messages.properties")); this.bundles = array.uniq([JSMLoader.getTarget("dactyl://locale/" + name + ".properties"),
JSMLoader.getTarget("dactyl://locale-local/" + name + ".properties"),
"resource://dactyl-locale/en-US/" + name + ".properties",
"resource://dactyl-locale-local/en-US/" + name + ".properties"])
.map(services.stringBundle.createBundle)
.filter(function (bundle) { try { bundle.getSimpleEnumeration(); return true; } catch (e) { return false; } });
this._ = Class("_", String, { this._ = Class("_", String, {
init: function _(message) { init: function _(message) {
@@ -46,7 +52,7 @@ var Messages = Module("messages", {
} }
}, },
iterate: function () let (bundle = this.bundle) iterate: function () let (bundle = this.bundles[0])
iter(prop.QueryInterface(Ci.nsIPropertyElement) for (prop in iter(bundle.getSimpleEnumeration()))), iter(prop.QueryInterface(Ci.nsIPropertyElement) for (prop in iter(bundle.getSimpleEnumeration()))),
cleanup: function cleanup() { cleanup: function cleanup() {
@@ -54,27 +60,29 @@ var Messages = Module("messages", {
}, },
get: function get(value, default_) { get: function get(value, default_) {
try { for (let bundle in values(this.bundles))
return this.bundle.GetStringFromName(value); try {
} return bundle.GetStringFromName(value);
catch (e) { }
// Report error so tests fail, but don't throw catch (e) {}
if (arguments.length < 2)
util.reportError(Error("Invalid locale string: " + value + ": " + e)); // Report error so tests fail, but don't throw
return arguments.length > 1 ? default_ : value; if (arguments.length < 2)
} util.reportError(Error("Invalid locale string: " + value));
return arguments.length > 1 ? default_ : value;
}, },
format: function format(value, args, default_) { format: function format(value, args, default_) {
try { for (let bundle in values(this.bundles))
return this.bundle.formatStringFromName(value, args, args.length); try {
} return bundle.formatStringFromName(value, args, args.length);
catch (e) { }
// Report error so tests fail, but don't throw catch (e) {}
if (arguments.length < 3)
util.reportError(Error("Invalid locale string: " + value + ": " + e)); // Report error so tests fail, but don't throw
return arguments.length > 2 ? default_ : value; if (arguments.length < 3)
} util.reportError(Error("Invalid locale string: " + value));
return arguments.length > 2 ? default_ : value;
} }
}, { }, {