gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2026-02-24 07:25:45 +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-06 19:16:54 +11:00
parent fed14b1b3f
commit 83385f9d0b
3 changed files with 14 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -100,6 +100,12 @@ io.exists-1 = File %S exists (add ! to override)
io.noCommand-1 = Command not found: %S io.noCommand-1 = Command not found: %S
io.commandFailed = E472: Command failed io.commandFailed = E472: Command failed
io.oneFileAllowed = E172: Only one file name allowed io.oneFileAllowed = E172: Only one file name allowed
io.callingShell-1 = Calling shell to execute: %S
io.sourcing-1 = sourcing %S
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
macro.canceled-1 = Canceled playback of macro '%S' macro.canceled-1 = Canceled playback of macro '%S'
macro.recorded-1 = Recorded macro '%S' macro.recorded-1 = Recorded macro '%S'
@@ -123,6 +129,7 @@ mow.noPreviousOutput = No previous command output
option.noSuch = No such option option.noSuch = No such option
option.noSuch-1 = No such option: %S option.noSuch-1 = No such option: %S
option.replaceExisting = Warning: %S already exists: replacing existing option.
plugin.searchingFor-1 = Searching for %S plugin.searchingFor-1 = Searching for %S
plugin.searchingForIn-2 = Searching for %S in %S plugin.searchingForIn-2 = Searching for %S in %S

12
common/modules/io.jsm
View File

@@ -112,14 +112,14 @@ var IO = Module("io", {
let dirs = modules.options.get("runtimepath").files; let dirs = modules.options.get("runtimepath").files;
let found = null; let found = null;
dactyl.echomsg("Searching for " + paths.join(" ").quote() + " in " + modules.options.get("runtimepath").stringValue, 2); dactyl.echomsg(_("io.searchingFor", paths.join(" ").quote(), modules.options.get("runtimepath").stringValue), 2);
outer: outer:
for (let dir in values(dirs)) { for (let dir in values(dirs)) {
for (let [,path] in Iterator(paths)) { for (let [,path] in Iterator(paths)) {
let file = dir.child(path); let file = dir.child(path);
dactyl.echomsg("Searching for " + file.path.quote(), 3); dactyl.echomsg(_("io.searchingFor", file.path.quote()), 3);
if (file.exists() && file.isFile() && file.isReadable()) { if (file.exists() && file.isFile() && file.isReadable()) {
found = io.source(file.path, false) || true; found = io.source(file.path, false) || true;
@@ -131,7 +131,7 @@ var IO = Module("io", {
} }
if (!found) if (!found)
dactyl.echomsg("not found in 'runtimepath': " + paths.join(" ").quote(), 1); dactyl.echomsg(_("io.notInRTP", paths.join(" ").quote()), 1);
return found; return found;
}, },
@@ -162,7 +162,7 @@ var IO = Module("io", {
return; return;
} }
dactyl.echomsg("sourcing " + filename.quote(), 2); dactyl.echomsg(_("io.sourcing", filename.quote()), 2);
let uri = services.io.newFileURI(file); let uri = services.io.newFileURI(file);
@@ -201,7 +201,7 @@ var IO = Module("io", {
if (this._scriptNames.indexOf(file.path) == -1) if (this._scriptNames.indexOf(file.path) == -1)
this._scriptNames.push(file.path); this._scriptNames.push(file.path);
dactyl.echomsg("finished sourcing " + filename.quote(), 2); dactyl.echomsg(_("io.sourcingEnd", filename.quote()), 2);
dactyl.log("Sourced: " + filename, 3); dactyl.log("Sourced: " + filename, 3);
return context; return context;
@@ -471,7 +471,7 @@ var IO = Module("io", {
* @returns {object} * @returns {object}
*/ */
system: function (command, input) { system: function (command, input) {
util.dactyl.echomsg("Calling shell to execute: " + command, 4); util.dactyl.echomsg(_("io.callingShell", command), 4);
function escape(str) '"' + str.replace(/[\\"$]/g, "\\$&") + '"'; function escape(str) '"' + str.replace(/[\\"$]/g, "\\$&") + '"';

2
common/modules/options.jsm
View File

@@ -803,7 +803,7 @@ var Options = Module("options", {
let name = names[0]; let name = names[0];
if (name in this._optionMap) { if (name in this._optionMap) {
this.dactyl.log("Warning: " + name.quote() + " already exists: replacing existing option.", 1); this.dactyl.log(_("option.replaceExisting", name.quote()), 1);
this.remove(name); this.remove(name);
} }