src: externalize internal/repl.js messages

nodejs · jasnell · Jan 7, 2016 · Jan 8, 2016 · Jan 8, 2016 · Jan 8, 2016
commit 259a36d145b6b26aed8927626ef46660b38c5d99
diff --git a/lib/internal/repl.js b/lib/internal/repl.js
@@ -1,11 +1,12 @@
 'use strict';
 
+const I18N = require('internal/messages');
+const debug = require('util').debuglog('repl');
 const Interface = require('readline').Interface;
 const REPL = require('repl');
 const path = require('path');
 const fs = require('fs');
 const os = require('os');
-const debug = require('util').debuglog('repl');
 
 module.exports = Object.create(REPL);
 module.exports.createInternalRepl = createRepl;
@@ -68,8 +69,7 @@ function setupHistory(repl, historyPath, oldHistoryPath, ready) {
     try {
       historyPath = path.join(os.homedir(), '.node_repl_history');
     } catch (err) {
-      repl._writeToOutput('\nError: Could not get the home directory.\n' +
-                          'REPL session history will not be persisted.\n');
+      repl._writeToOutput(`\n${I18N(I18N.REPL_HOME_DIRECTORY)}\n`);
       repl._refreshLine();
 
       debug(err.stack);
@@ -88,8 +88,7 @@ function setupHistory(repl, historyPath, oldHistoryPath, ready) {
     if (err) {
       // Cannot open history file.
       // Don't crash, just don't persist history.
-      repl._writeToOutput('\nError: Could not open history file.\n' +
-                          'REPL session history will not be persisted.\n');
+      repl._writeToOutput(`\n${I18N(I18N.REPL_CANNOT_OPEN_HISTORY)}\n`);
       repl._refreshLine();
       debug(err.stack);
 
@@ -118,15 +117,13 @@ function setupHistory(repl, historyPath, oldHistoryPath, ready) {
       // If pre-v3.0, the user had set NODE_REPL_HISTORY_FILE to
       // ~/.node_repl_history, warn the user about it and proceed.
       repl._writeToOutput(
-          '\nThe old repl history file has the same name and location as ' +
-          `the new one i.e., ${historyPath} and is empty.\nUsing it as is.\n`);
+        `\n${I18N(I18N.REPL_HISTORY_SAME_NAME, historyPath)}\n`);
       repl._refreshLine();
 
     }  else if (oldHistoryPath) {
       // Grab data from the older pre-v3.0 JSON NODE_REPL_HISTORY_FILE format.
       repl._writeToOutput(
-          '\nConverting old JSON repl history to line-separated history.\n' +
-          `The new repl history file can be found at ${historyPath}.\n`);
+        `\n${I18N(I18N.REPL_CONVERTING_HISTORY, historyPath)}\n`);
       repl._refreshLine();
 
       try {
@@ -138,13 +135,13 @@ function setupHistory(repl, historyPath, oldHistoryPath, ready) {
         if (oldReplJSONHistory) repl.history = JSON.parse(oldReplJSONHistory);
 
         if (!Array.isArray(repl.history)) {
-          throw new Error('Expected array, got ' + typeof repl.history);
+          throw I18N.Error(I18N.INVALID_ARG_TYPE, 'repl.history', 'array');
         }
         repl.history = repl.history.slice(0, repl.historySize);
       } catch (err) {
         if (err.code !== 'ENOENT') {
-          return ready(
-            new Error(`Could not parse history data in ${oldHistoryPath}.`));
+          return ready(I18N.Error(I18N.REPL_CANNOT_PARSE_HISTORY,
+                                  oldHistoryPath));
         }
       }
     }
@@ -206,11 +203,7 @@ function setupHistory(repl, historyPath, oldHistoryPath, ready) {
 
 function _replHistoryMessage() {
   if (this.history.length === 0) {
-    this._writeToOutput(
-        '\nPersistent history support disabled. ' +
-        'Set the NODE_REPL_HISTORY environment\nvariable to ' +
-        'a valid, user-writable path to enable.\n'
-    );
+    this._writeToOutput(`\n${I18N(I18N.REPL_HISTORY_DISABLED)}\n`);
     this._refreshLine();
   }
   this._historyPrev = Interface.prototype._historyPrev;

diff --git a/src/messages/en/messages.h b/src/messages/en/messages.h
@@ -398,6 +398,23 @@
   XX(REPL_COMMAND_LOAD_FAILED_INVALID,                                        \
      "Failed to load:{0} is not a valid file")                                \
   XX(REPL_COMMAND_LOAD_FAILED, "Failed to load:{0}")                          \
+  XX(REPL_CANNOT_PARSE_HISTORY, "Could not parse history data in {0}.")       \
+  XX(REPL_HISTORY_DISABLED,                                                   \
+    "Persistent history support disabled. Set the "                           \
+    "NODE_REPL_HISTORY environment\nvariable to "                             \
+    "a valid, user-writable path to enable.")                                 \
+  XX(REPL_HOME_DIRECTORY,                                                     \
+     "Error: Could not get the home directory.\n"                             \
+     "REPL session history will not be persisted.")                           \
+  XX(REPL_CANNOT_OPEN_HISTORY,                                                \
+     "Error: Could not open history file.\n"                                  \
+     "REPL session history will not be persisted.")                           \
+  XX(REPL_HISTORY_SAME_NAME,                                                  \
+     "The old repl history file has the same name and location as "           \
+     "the new one i.e., {0} and is empty.\nUsing it as is.")                  \
+  XX(REPL_CONVERTING_HISTORY,                                                 \
+     "Converting old JSON repl history to line-separated history.\n"          \
+     "The new repl history file can be found at {0}.")                        \
   XX(SYS_DEPRECATED, NODE_DEPRECATE_MESSAGE("sys", "util"))                   \
   XX(TIMERS_NON_NEGATIVE_FINITE,                                              \
      "'{0}' argument must be a non-negative finite number")                   \