www

commit 99d32c74161462da86dab712bd8d678a5d82342c
parent 22364035fb08668b0eebd57a9e006b304b3c3fb8
Author: Davide P. Cervone <dpvc@union.edu>
Date:   Wed,  5 Aug 2015 15:03:44 -0400

Merge branch 'issue1230' into develop.  Issue #1230.

Diffstat:
M
unpacked/MathJax.js
 | 
11
++++++-----

1 file changed, 6 insertions(+), 5 deletions(-)
diff --git a/unpacked/MathJax.js b/unpacked/MathJax.js
@@ -2326,21 +2326,22 @@ MathJax.Hub = {
   },
   
   formatError: function (script,err) {
+    var LOCALIZE = function (id,text,arg1,arg2) {return MathJax.Localization._(id,text,arg1,arg2)};
     //
     //  Get the error message, URL, and line, and save it for
     //    reporting in the Show Math As Error menu
     //
-    var message = "Error: "+err.message+"\n";
-    if (err.sourceURL) {message += "\nfile: "+err.sourceURL}
-    if (err.line) {message += "\nline: "+err.line}
-    message += "\n[debugging tips: use unpacked/MathJax.js, inspect `MathJax.Hub.lastError` in the console]";
+    var message = LOCALIZE("ErrorMessage","Error: %1",err.message)+"\n";
+    if (err.sourceURL||err.fileName) message += "\n"+LOCALIZE("ErrorFile","file: %1",err.sourceURL||err.fileName);
+    if (err.line||err.lineNumber) message += "\n"+LOCALIZE("ErrorLine","line: %1",err.line||err.lineNumber);
+    message += "\n\n"+LOCALIZE("ErrorTips","Debugging tips: use %1, inspect %2 in the browser console","'unpacked/MathJax.js'","'MathJax.Hub.lastError'");
     script.MathJax.error = MathJax.OutputJax.Error.Jax(message,script);
 
     //
     //  Create the [Math Processing Error] span
     //
     var errorSettings = this.config.errorSettings;
-    var errorText = MathJax.Localization._(errorSettings.messageId,errorSettings.message);
+    var errorText = LOCALIZE(errorSettings.messageId,errorSettings.message);
     var error = MathJax.HTML.Element("span",
                  {className:"MathJax_Error", jaxID:"Error", isMathJax:true},errorText);
     //