src: externalize repl.js messages

nodejs · jasnell · Jan 7, 2016 · Jan 8, 2016 · Jan 8, 2016 · Jan 8, 2016
commit 5f4861dc8c79c7fd4a08f47eb9e4fd9604f1ac6d
diff --git a/lib/repl.js b/lib/repl.js
@@ -21,6 +21,8 @@
 
 'use strict';
 
+const I18N = require('internal/messages');
+const debug = I18N.debuglog('repl');
 const internalModule = require('internal/module');
 const internalUtil = require('internal/util');
 const util = require('util');
@@ -33,7 +35,6 @@ const Interface = require('readline').Interface;
 const Console = require('console').Console;
 const Module = require('module');
 const domain = require('domain');
-const debug = util.debuglog('repl');
 
 const parentModule = module;
 const replMap = new WeakMap();
@@ -70,8 +71,7 @@ exports._builtinLibs = ['assert', 'buffer', 'child_process', 'cluster',
   'string_decoder', 'tls', 'tty', 'url', 'util', 'v8', 'vm', 'zlib'];
 
 
-const BLOCK_SCOPED_ERROR = 'Block-scoped declarations (let, ' +
-    'const, function, class) not yet supported outside strict mode';
+const BLOCK_SCOPED_ERROR = I18N(I18N.REPL_BLOCK_SCOPED);
 
 
 class LineParser {
@@ -185,7 +185,7 @@ function REPLServer(prompt,
     dom = options.domain;
     replMode = options.replMode;
   } else if (typeof prompt !== 'string') {
-    throw new Error('An options Object, or a prompt String are required');
+    throw I18N.Error(I18N.REPL_OPTIONS_OR_PROMPT_REQUIRED);
   } else {
     options = {};
   }
@@ -227,7 +227,7 @@ function REPLServer(prompt,
           displayErrors: false
         });
       } catch (e) {
-        debug('parse error %j', code, e);
+        debug(I18N.REPL_DEBUG_PARSE_ERROR, JSON.stringify(code), e);
         if (self.replMode === exports.REPL_MODE_MAGIC &&
             e.message === BLOCK_SCOPED_ERROR &&
             !retry) {
@@ -256,7 +256,7 @@ function REPLServer(prompt,
       } catch (e) {
         err = e;
         if (err && process.domain) {
-          debug('not recoverable, send to domain');
+          debug(I18N.REPL_DEBUG_NOT_RECOVERABLE);
           process.domain.emit('error', err);
           process.domain.exit();
           return;
@@ -276,7 +276,7 @@ function REPLServer(prompt,
   self.eval = self._domain.bind(eval_);
 
   self._domain.on('error', function(e) {
-    debug('domain error');
+    debug(I18N.REPL_DEBUG_DOMAIN_ERROR);
     const top = replMap.get(self);
     internalUtil.decorateErrorStack(e);
     top.outputStream.write((e.stack || e) + '\n');
@@ -360,7 +360,7 @@ function REPLServer(prompt,
         sawSIGINT = false;
         return;
       }
-      self.output.write('(To exit, press ^C again or type .exit)\n');
+      self.output.write(`${I18N(I18N.REPL_EXIT)}\n`);
       sawSIGINT = true;
     } else {
       sawSIGINT = false;
@@ -373,7 +373,7 @@ function REPLServer(prompt,
   });
 
   self.on('line', function(cmd) {
-    debug('line %j', cmd);
+    debug(I18N.REPL_DEBUG_LINE, JSON.stringify(cmd));
     sawSIGINT = false;
     var skipCatchall = false;
 
@@ -393,7 +393,7 @@ function REPLServer(prompt,
       if (self.parseREPLKeyword(keyword, rest) === true) {
         return;
       } else if (!self.bufferedCommand) {
-        self.outputStream.write('Invalid REPL keyword\n');
+        self.outputStream.write(`${I18N(I18N.REPL_INVALID_KEYWORD)}\n`);
         skipCatchall = true;
       }
     }
@@ -413,20 +413,18 @@ function REPLServer(prompt,
         evalCmd = evalCmd + '\n';
       }
 
-      debug('eval %j', evalCmd);
+      debug(I18N.REPL_DEBUG_EVAL, JSON.stringify(evalCmd));
       self.eval(evalCmd, self.context, 'repl', finish);
     } else {
       finish(null);
     }
 
     function finish(e, ret) {
-      debug('finish', e, ret);
+      debug(I18N.REPL_DEBUG_FINISH, e, ret);
       self.memory(cmd);
 
       if (e && !self.bufferedCommand && cmd.trim().match(/^npm /)) {
-        self.outputStream.write('npm should be run outside of the ' +
-                                'node repl, in your normal shell.\n' +
-                                '(Press Control-D to exit.)\n');
+        self.outputStream.write(`${I18N(I18N.REPL_NPM_OUTSIDE)}\n`);
         self.lineParser.reset();
         self.bufferedCommand = '';
         self.displayPrompt();
@@ -907,7 +905,7 @@ REPLServer.prototype.defineCommand = function(keyword, cmd) {
   if (typeof cmd === 'function') {
     cmd = {action: cmd};
   } else if (typeof cmd.action !== 'function') {
-    throw new Error('Bad argument, "action" command must be a function');
+    throw I18N.Error(I18N.FUNCTION_REQUIRED, 'action');
   }
   this.commands[keyword] = cmd;
 };
@@ -1010,7 +1008,7 @@ function addStandardGlobals(completionGroups, filter) {
 
 function defineDefaultCommands(repl) {
   repl.defineCommand('break', {
-    help: 'Sometimes you get stuck, this gets you out',
+    help: I18N(I18N.REPL_COMMAND_BREAK),
     action: function() {
       this.lineParser.reset();
       this.bufferedCommand = '';
@@ -1020,32 +1018,32 @@ function defineDefaultCommands(repl) {
 
   var clearMessage;
   if (repl.useGlobal) {
-    clearMessage = 'Alias for .break';
+    clearMessage = I18N(I18N.REPL_COMMAND_CLEAR_GLOBAL);
   } else {
-    clearMessage = 'Break, and also clear the local context';
+    clearMessage = I18N(I18N.REPL_COMMAND_CLEAR);
   }
   repl.defineCommand('clear', {
     help: clearMessage,
     action: function() {
       this.lineParser.reset();
       this.bufferedCommand = '';
       if (!this.useGlobal) {
-        this.outputStream.write('Clearing context...\n');
+        this.outputStream.write(`${I18N(I18N.REPL_COMMAND_CLEAR_MSG)}\n`);
         this.resetContext();
       }
       this.displayPrompt();
     }
   });
 
   repl.defineCommand('exit', {
-    help: 'Exit the repl',
+    help: I18N(I18N.REPL_COMMAND_EXIT),
     action: function() {
       this.close();
     }
   });
 
   repl.defineCommand('help', {
-    help: 'Show repl options',
+    help: I18N(I18N.REPL_COMMAND_HELP),
     action: function() {
       var self = this;
       Object.keys(this.commands).sort().forEach(function(name) {
@@ -1057,20 +1055,22 @@ function defineDefaultCommands(repl) {
   });
 
   repl.defineCommand('save', {
-    help: 'Save all evaluated commands in this REPL session to a file',
+    help: I18N(I18N.REPL_COMMAND_SAVE),
     action: function(file) {
       try {
         fs.writeFileSync(file, this.lines.join('\n') + '\n');
-        this.outputStream.write('Session saved to:' + file + '\n');
+        this.outputStream.write(
+          `${I18N(I18N.REPL_COMMAND_SESSION_SAVED, file)}\n`);
       } catch (e) {
-        this.outputStream.write('Failed to save:' + file + '\n');
+        this.outputStream.write(
+          `${I18N(I18N.REPL_COMMAND_SAVE_FAILED, file)}\n`);
       }
       this.displayPrompt();
     }
   });
 
   repl.defineCommand('load', {
-    help: 'Load JS from a file into the REPL session',
+    help: I18N(I18N.REPL_COMMAND_LOAD),
     action: function(file) {
       try {
         var stats = fs.statSync(file);
@@ -1085,11 +1085,12 @@ function defineDefaultCommands(repl) {
             }
           });
         } else {
-          this.outputStream.write('Failed to load:' + file +
-                                  ' is not a valid file\n');
+          this.outputStream.write(
+            `${I18N(I18N.REPL_COMMAND_LOAD_FAILED_INVALID, file)}\n`);
         }
       } catch (e) {
-        this.outputStream.write('Failed to load:' + file + '\n');
+        this.outputStream.write(
+          `${I18N(I18N.REPL_COMMAND_LOAD_FAILED, file)}\n`);
       }
       this.displayPrompt();
     }

diff --git a/src/messages/en/messages.h b/src/messages/en/messages.h
@@ -360,6 +360,35 @@
      "isFullWidthCodePoint is deprecated and will be removed.")               \
   XX(READLINE_STRIPVTCONTROLCHARACTERS_DEPRECATED,                            \
      "stripVTControlCharacters is deprecated and will be removed.")           \
-
+  XX(REPL_OPTIONS_OR_PROMPT_REQUIRED,                                         \
+     "An options object, or a prompt string are required")                    \
+  XX(REPL_DEBUG_PARSE_ERROR, "parse error {0} {1}")                           \
+  XX(REPL_DEBUG_NOT_RECOVERABLE, "not recoverable, send to domain")           \
+  XX(REPL_DEBUG_DOMAIN_ERROR, "domain error")                                 \
+  XX(REPL_DEBUG_LINE, "line {0}")                                             \
+  XX(REPL_DEBUG_EVAL, "eval {0}")                                             \
+  XX(REPL_DEBUG_FINISH, "finish {0} {1}")                                     \
+  XX(REPL_NPM_OUTSIDE,                                                        \
+    "npm should be run outside of the node repl, in your normal shell.\n"     \
+    "(Press Control-D to exit.)")                                             \
+  XX(REPL_BLOCK_SCOPED,                                                       \
+    "Block-scoped declarations (let, const, function, class) "                \
+    "not yet supported outside strict mode")                                  \
+  XX(REPL_EXIT, "(To exit, press ^C again or type .exit)")                    \
+  XX(REPL_INVALID_KEYWORD, "Invalid REPL keyword")                            \
+  XX(REPL_COMMAND_BREAK, "Sometimes you get stuck, this gets you out")        \
+  XX(REPL_COMMAND_CLEAR_GLOBAL, "Alias for .break")                           \
+  XX(REPL_COMMAND_CLEAR, "Break, and also clear the local context")           \
+  XX(REPL_COMMAND_CLEAR_MSG, "Clearing context...")                           \
+  XX(REPL_COMMAND_EXIT, "Exit the repl")                                      \
+  XX(REPL_COMMAND_HELP, "Show repl options")                                  \
+  XX(REPL_COMMAND_SAVE,                                                       \
+    "Save all evaluated commands in this REPL session to a file")             \
+  XX(REPL_COMMAND_SESSION_SAVED, "Session saved to:{0}")                      \
+  XX(REPL_COMMAND_SAVE_FAILED, "Failed to save:{0}")                          \
+  XX(REPL_COMMAND_LOAD, "Load JS from a file into the REPL session")          \
+  XX(REPL_COMMAND_LOAD_FAILED_INVALID,                                        \
+     "Failed to load:{0} is not a valid file")                                \
+  XX(REPL_COMMAND_LOAD_FAILED, "Failed to load:{0}")                          \
 
 #endif  // SRC_NODE_MESSAGES_SRC_H_