gryf/pentadactyl-pm
1
0
Fork 0
mirror of https://github.com/gryf/pentadactyl-pm.git synced 2025-12-20 18: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-07 00:28:30 +11:00
parent 10d08d2833
commit aaa3d9fa14
2 changed files with 13 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
common/content/dactyl.js
View File

@@ -1072,7 +1072,7 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
function sourceDirectory(dir) {
dactyl.assert(dir.isReadable(), _("io.notReadable", dir.path));
dactyl.log("Sourcing plugin directory: " + dir.path + "...", 3);
dactyl.log(_("dactyl.sourcingPlugins", dir.path), 3);
let loadplugins = options.get("loadplugins");
if (args)
@@ -1096,7 +1096,7 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
let dirs = io.getRuntimeDirectories("plugins");
if (dirs.length == 0) {
dactyl.log("No user plugin directory found", 3);
dactyl.log(_("dactyl.noPluginDir"), 3);
return;
}
@@ -1126,7 +1126,7 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
let verbose = localPrefs.get("loglevel", 0);
if (!level || level <= verbose) {
if (isObject(msg))
if (isObject(msg) && !isinstance(msg, _))
msg = util.objectToString(msg, false);
services.console.logStringMessage(config.name + ": " + msg);
@@ -2072,7 +2072,7 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
load: function () {
dactyl.triggerObserver("load");
dactyl.log("All modules loaded", 3);
dactyl.log(_("dactyl.modulesLoaded"), 3);
dactyl.timeout(function () {
try {
@@ -2092,7 +2092,7 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
dactyl.echoerr(_("dactyl.parsingCommandLine", e));
}
dactyl.log("Command-line options: " + util.objectToString(dactyl.commandLineOptions), 3);
dactyl.log(_("dactyl.commandlineOpts", util.objectToString(dactyl.commandLineOptions)), 3);
// first time intro message
const firstTime = "extensions." + config.name + ".firsttime";
@@ -2136,7 +2136,7 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
services.environment.set("MY_" + config.idName + "RC", rcFile.path);
}
else
dactyl.log("No user RC file found", 3);
dactyl.log(_("dactyl.noRCFile"), 3);
}
if (options["exrc"] && !dactyl.commandLineOptions.rcFile) {
@@ -2177,7 +2177,7 @@ var Dactyl = Module("dactyl", XPCOM(Ci.nsISupportsWeakReference, ModuleBase), {
}, 100);
statusline.update();
dactyl.log(config.appName + " fully initialized", 0);
dactyl.log(_("dactyl.initialized", config.appName), 0);
dactyl.initialized = true;
}
});

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

@@ -60,6 +60,12 @@ command.let.invalidExpression-1 = E15: Invalid expression: %S
dactyl.parsingCommandLine-1 = Parsing command line options: %S
dactyl.notCommand-2 = E492: Not a %S command: %S
dactyl.sourcingPlugins-1 = Sourcing plugin directory: %S...
dactyl.noPluginDir = No user plugin directory found
dactyl.modulesLoaded = All modules loaded
dactyl.commandlineOpts-1 = Command-line options: %S
dactyl.noRCFile = No user RC file found
dactyl.initialized-1 = %S fully initialized
dialog.notAvailable-1 = Dialog %S not available