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

Move some more message strings to the properties file.

Browse Source
This commit is contained in:
Doug Kearns
2011-03-08 03:09:37 +11:00
parent 1f0a95e40d
commit c08c0dc19f
9 changed files with 27 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
common/content/bookmarks.js
View File

@@ -135,14 +135,14 @@ var Bookmarks = Module("bookmarks", {
let count = this.remove(url);
if (count > 0)
dactyl.echomsg({ domains: [util.getHost(url)], message: "Removed bookmark: " + url });
dactyl.echomsg({ domains: [util.getHost(url)], message: _("bookmark.removed", url) });
else {
let title = buffer.uri.spec == url && buffer.title || url;
let extra = "";
if (title != url)
extra = " (" + title + ")";
this.add({ unfiled: true, title: title, url: url });
dactyl.echomsg({ domains: [util.getHost(url)], message: "Added bookmark: " + url + extra });
dactyl.echomsg({ domains: [util.getHost(url)], message: _("bookmark.added", url + extra) });
}
},
@@ -429,7 +429,7 @@ var Bookmarks = Module("bookmarks", {
if (bookmarks.add(opts)) {
let extra = (opts.title == opts.url) ? "" : " (" + opts.title + ")";
dactyl.echomsg({ domains: [util.getHost(opts.url)], message: "Added bookmark: " + opts.url + extra },
dactyl.echomsg({ domains: [util.getHost(opts.url)], message: _("bookmark.added", opts.url + extra) },
1, commandline.FORCE_SINGLELINE);
}
else
@@ -502,7 +502,7 @@ var Bookmarks = Module("bookmarks", {
var deletedCount = bookmarks.remove(context.allItems.items.map(function (item) item.item.id));
}
dactyl.echomsg({ message: deletedCount + " bookmark(s) deleted" });
dactyl.echomsg({ message: _("bookmark.deleted", deletedCount) });
}
},

2
common/content/browser.js
View File

@@ -81,7 +81,7 @@ var Browser = Module("browser", XPCOM(Ci.nsISupportsWeakReference, ModuleBase),
else {
// code which should happen for all (also background) newly loaded tabs goes here:
if (doc != config.browser.contentDocument)
dactyl.echomsg({ domains: [util.getHost(doc.location)], message: "Background tab loaded: " + (doc.title || doc.location.href) }, 3);
dactyl.echomsg({ domains: [util.getHost(doc.location)], message: _("buffer.backgroundLoaded", (doc.title || doc.location.href)) }, 3);
this._triggerLoadAutocmd("PageLoad", doc);
}

2
common/content/modes.js
View File

@@ -306,7 +306,7 @@ var Modes = Module("modes", {
var delayed, oldExtended, oldMain, prev, push;
if (this.inSet) {
dactyl.reportError(Error("Not executing modes.set recursively"), true);
dactyl.reportError(Error(_("mode.recursiveSet")), true);
return;
}

2
common/content/quickmarks.js
View File

@@ -28,7 +28,7 @@ var QuickMarks = Module("quickmarks", {
*/
add: function add(qmark, location) {
this._qmarks.set(qmark, location);
dactyl.echomsg({ domains: [util.getHost(location)], message: "Added Quick Mark '" + qmark + "': " + location }, 1);
dactyl.echomsg({ domains: [util.getHost(location)], message: _("quickmark.added", qmark, location) }, 1);
},
/**

15
common/locale/en-US/messages.properties
View File

@@ -6,6 +6,7 @@ abbrev.none = No abbreviations found
addon.check-1 = Checking updates for addons: %S
addon.cantInstallDir-1 = Cannot install a directory: %S
addon.unavailable = Don't have add-on yet
autocmd.executing-2 = Executing %S Auto commands for %S
autocmd.autocommand-1 = autocommand %S
@@ -19,6 +20,9 @@ bookmark.noMatchingString-1 = No bookmarks matching string %S
bookmark.none = No bookmarks set
bookmark.cantAdd-1 = Could not add bookmark %S
bookmark.allGone = All bookmarks deleted
bookmark.removed-1 = Removed bookmark: %S
bookmark.added-1 = Added bookmark: %S
bookmark.deleted-1 = %S bookmark(s) deleted
buffer.fewer-2 = %S fewer tab%S
buffer.cantDetatchLast = Can't detach the last tab
@@ -26,6 +30,7 @@ buffer.noMatching-1 = No matching buffer for %S
buffer.multipleMatching-1 = More than one match for %S
buffer.noClosed = No matching closed tab
buffer.noAlternate = No alternate page
buffer.backgroundLoaded = Background tab loaded: %S
command.commands = commands
@@ -112,6 +117,7 @@ io.sourcingEnd-1 = finished sourcing %S
io.notInRTP-1 = not found in 'runtimepath': %S
io.searchingFor-1 = Searching for %S
io.searchingFor-2 = Searching for %S in %S
io.downloadFinished-2 = Download of %S to %S finished
macro.canceled-1 = Canceled playback of macro '%S'
macro.recorded-1 = Recorded macro '%S'
@@ -131,6 +137,8 @@ mark.invalid = Invalid mark
mark.unset-1 = Mark not set: %S
mark.noMatching-1 = E283: No marks matching %S
mode.recursiveSet = Not executing modes.set recursively
mow.noPreviousOutput = No previous command output
option.noSuch = No such option
@@ -139,6 +147,7 @@ option.replaceExisting-1 = Warning: %S already exists: replacing existing option
plugin.searchingFor-1 = Searching for %S
plugin.searchingForIn-2 = Searching for %S in %S
plugin.notReplacingContext-1 = Not replacing plugin context for %S
print.toFile-1 = Printing to file: %S
print.sending = Sending to printer...
@@ -149,6 +158,7 @@ quickmark.none = No QuickMarks set
quickmark.noMatching-1 = No QuickMarks matching %S
quickmark.notSet = QuickMark not set
quickmark.invalid = Argument must be an ASCII letter or digit
quickmark.added-2 = Added Quick Mark '%S': %S
save.invalidDestination-1 = Invalid destination: %S
@@ -171,8 +181,6 @@ error.countRequired-1 = Count required for %S
error.cantOpen-2 = Error opening %S: %S
error.interrupted = Interrupted
error.invalidSort-1 = Invalid sort order: %S
error.argRequired = Argument required
error.trailing = Trailing characters
error.trailing-1 = Trailing characters: %S
error.invalid-1 = Invalid %S
@@ -183,4 +191,7 @@ error.argumentRequired = Argument required
error.argumentOrBang = Argument or ! required
error.invalidOperation = Invalid operation
error.monkeyPatchOverlay-1 = Not replacing property with eval-generated overlay by %S
error.nullComputedStyle-1 = Computed style is null: %S
# vim:se ft=jproperties tw=0:

2
common/modules/config.jsm
View File

@@ -59,7 +59,7 @@ var ConfigBase = Class("ConfigBase", {
do {
addon = (JSMLoader.bootstrap || {}).addon;
if (addon && !addon.getResourceURI) {
util.reportError(Error("Don't have add-on yet"));
util.reportError(Error(_("addon.unavailable")));
yield 10;
}
}

2
common/modules/contexts.jsm
View File

@@ -221,7 +221,7 @@ var Contexts = Module("contexts", {
enumerable: true,
get: function () self,
set: function (val) {
util.dactyl(val).reportError(FailedAssertion("Not replacing plugin context for " + self.NAME, 3, false), true);
util.dactyl(val).reportError(FailedAssertion(_("plugin.notReplacingContext", self.NAME), 3, false), true);
}
});
}

2
common/modules/io.jsm
View File

@@ -48,7 +48,7 @@ var IO = Module("io", {
let file = download.targetFile.path;
let size = download.size;
dactyl.echomsg({ domains: [util.getHost(url)], message: "Download of " + title + " to " + file + " finished" },
dactyl.echomsg({ domains: [util.getHost(url)], message: _("io.downloadFinished", title, file) },
1, modules.commandline.ACTIVE_WINDOW);
modules.autocommands.trigger("DownloadPost", { url: url, title: title, file: file, size: size });
}

8
common/modules/util.jsm
View File

@@ -455,8 +455,8 @@ var Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
}
catch (e) {}
if (res == null) {
util.dumpStack("Computed style is null: " + node);
Cu.reportError(Error("Computed style is null: " + node));
util.dumpStack(_("error.nullComputedStyle", node));
Cu.reportError(Error(_("error.nullComputedStyle", node)));
return {};
}
return res;
@@ -1227,8 +1227,8 @@ var Util = Module("Util", XPCOM([Ci.nsIObserver, Ci.nsISupportsWeakReference]),
Class.replaceProperty(this, k, val);
else {
let package_ = util.newURI(util.fixURI(Components.stack.caller.filename)).host;
util.reportError(Error("Not replacing property with eval-generated overlay by " + package_));
util.dactyl.echoerr("Not replacing property with eval-generated overlay by " + package_);
util.reportError(Error(_("error.monkeyPatchOverlay", package_)));
util.dactyl.echoerr(_("error.monkeyPatchOverlay", package_));
}
};
}