commit 7cd9180b0b1b315af98a9fbd4c576f0d54655658
parent eeea99922bee658a09b643d3276bf3099d1d9dee
Author: Davide P. Cervone <dpvc@union.edu>
Date: Tue, 9 Apr 2013 13:13:25 -0400
Fix a number of message ID's and message texts. Add menuTitle to fr.js file.
Diffstat:
8 files changed, 31 insertions(+), 27 deletions(-)
diff --git a/unpacked/extensions/MathMenu.js b/unpacked/extensions/MathMenu.js
@@ -773,7 +773,7 @@
MENU.Scale = function () {
var HTMLCSS = OUTPUT["HTML-CSS"], nMML = OUTPUT.NativeMML, SVG = OUTPUT.SVG;
var SCALE = (HTMLCSS||nMML||SVG||{config:{scale:100}}).config.scale;
- var scale = prompt(_("ScaleMath", "Scale all mathematics (compared to surrounding text) by"),SCALE+"%");
+ var scale = prompt(_("ScaleMath","Scale all mathematics (compared to surrounding text) by"),SCALE+"%");
if (scale) {
if (scale.match(/^\s*\d+(\.\d*)?\s*%?\s*$/)) {
scale = parseFloat(scale);
@@ -873,7 +873,7 @@
SVG: {
MSIE: ["MSIESVGWarning",
"SVG is not implemented in Internet Explorer prior to " +
- "IE9, or when the browser is emulating IE8 or below. " +
+ "IE9 or when it is emulating IE8 or below. " +
"Switching to SVG output will cause the mathemtics to " +
"not display properly."]
}
diff --git a/unpacked/extensions/TeX/AMSmath.js b/unpacked/extensions/TeX/AMSmath.js
@@ -460,7 +460,7 @@ MathJax.Hub.Register.StartupHook("TeX Jax Ready",function () {
},
EndRow: function () {
if (this.row.length != 1) {
- TEX.Error(["MultipleRowsOneCol",
+ TEX.Error(["MultlineRowsOneCol",
"multline rows must have exactly one column"]);
}
this.table.push(this.row); this.row = [];
diff --git a/unpacked/jax/input/MathML/jax.js b/unpacked/jax/input/MathML/jax.js
@@ -287,7 +287,7 @@
return(this.parseDIV);
},
parserCreationError: function () {
- alert(_("MathPlayer",
+ alert(_("CantCreateXMLParser",
"MathJax can't create an XML parser for MathML. Check that\n"+
"the 'Script ActiveX controls marked safe for scripting' security\n"+
"setting is enabled (use the Internet Options item in the Tools\n"+
diff --git a/unpacked/jax/input/TeX/jax.js b/unpacked/jax/input/TeX/jax.js
@@ -80,8 +80,8 @@
var STACKITEM = STACK.Item = MathJax.Object.Subclass({
type: "base",
- closeError: ["ExtraCloseMissingOpen","Extra close brace or missing open brace"],
- rightError: ["MissingLeftExtraRight","Missing \\left or extra \\right"],
+ closeError: /*_()*/ ["ExtraCloseMissingOpen","Extra close brace or missing open brace"],
+ rightError: /*_()*/ ["MissingLeftExtraRight","Missing \\left or extra \\right"],
Init: function () {
if (this.isOpen) {this.env = {}}
this.data = [];
@@ -98,7 +98,7 @@
if (item.type === "over" && this.isOpen) {item.num = this.mmlData(false); this.data = []}
if (item.type === "cell" && this.isOpen) {
if (item.linebreak) {return false}
- TEX.Error(["Misplaced %1","Misplaced ",item.name]);
+ TEX.Error(["Misplaced","Misplaced %1",item.name]);
}
if (item.isClose && this[item.type+"Error"]) {TEX.Error(this[item.type+"Error"])}
if (!item.isNotStack) {return true}
@@ -129,7 +129,7 @@
STACKITEM.open = STACKITEM.Subclass({
type: "open", isOpen: true,
- stopError: ["ExtraOpenMissingClose","Extra open brace or missing close brace"],
+ stopError: /*_()*/ ["ExtraOpenMissingClose","Extra open brace or missing close brace"],
checkItem: function (item) {
if (item.type === "close") {
var mml = this.mmlData();
@@ -155,7 +155,7 @@
STACKITEM.subsup = STACKITEM.Subclass({
type: "subsup",
- stopError: ["MissingScript","Missing superscript or subscript argument"],
+ stopError: /*_()*/ ["MissingScript","Missing superscript or subscript argument"],
checkItem: function (item) {
var script = ["","subscript","superscript"][this.position];
if (item.type === "open" || item.type === "left") {return true}
@@ -195,7 +195,7 @@
STACKITEM.left = STACKITEM.Subclass({
type: "left", isOpen: true, delim: '(',
- stopError: ["ExtraLeftMissingRight", "Extra \\left or missing \\right"],
+ stopError: /*_()*/ ["ExtraLeftMissingRight", "Extra \\left or missing \\right"],
checkItem: function (item) {
if (item.type === "right") {
var mml = MML.mfenced(this.data.length === 1 ? this.data[0] : MML.mrow.apply(MML,this.data));
@@ -1371,7 +1371,7 @@
},
MoveRoot: function (name,id) {
if (!this.stack.env.inRoot)
- {TEX.Error(["BadMoveRoot","%1 can appear only within a root"])}
+ {TEX.Error(["MisplacedMoveRoot","%1 can appear only within a root",name])}
if (this.stack.global[id])
{TEX.Error(["MultipleMoveRoot","Multiple use of %1",name])}
var n = this.GetArgument(name);
@@ -1432,7 +1432,7 @@
data = this.GetArgument(name),
def = {attrNames:[]}, match;
if (!MML[type] || !MML[type].prototype.isToken)
- {TEX.Error(["NotMathMLToken", "%1 is not a token element",type])}
+ {TEX.Error(["NotMathMLToken","%1 is not a token element",type])}
while (attr !== "") {
match = attr.match(/^([a-z]+)\s*=\s*('[^']*'|\"[^"]*"|[^ ]*)\s*/i);
if (!match)
@@ -1589,7 +1589,7 @@
this.string = this.AddArgs(macro,this.string.slice(this.i));
this.i = 0;
if (++this.macroCount > TEX.config.MAXMACROS) {
- TEX.Error(["MaxMacroSub",
+ TEX.Error(["MaxMacroSub1",
"MathJax maximum macro substitution count exceeded; " +
"is there a recursive macro call?"]);
}
@@ -1866,7 +1866,7 @@
case '\\': this.i++; break;
case '}':
if (parens-- <= 0) {
- TEX.Error(["ExtraCloseBrace",
+ TEX.Error(["ExtraCloseLooking",
"Extra close brace while looking for %1","']'"]);
}
break;
@@ -1928,7 +1928,7 @@
case '{': parens++; break;
case '}':
if (parens == 0) {
- TEX.Error(["ExtraCloseBrace",
+ TEX.Error(["ExtraCloseLooking",
"Extra close brace while looking for %1",token])
}
parens--;
diff --git a/unpacked/jax/output/NativeMML/jax.js b/unpacked/jax/output/NativeMML/jax.js
@@ -141,10 +141,6 @@
//
// If that fails, give an alert about security settings
//
- // Localization: this seems to use "\n" to force new lines in the
- // dialog: is it really necessary? If so, we need a localization note
- // to explain that to localizers. Handling of concatenation might
- // be an additional difficulty for the string extractor.
alert(MathJax.Localization._(["MathML", "MathPlayer"],
"MathJax was not able to set up MathPlayer.\n\n"+
"If MathPlayer is not installed, you need to install it first.\n"+
diff --git a/unpacked/localization/fr/MathMenu.js b/unpacked/localization/fr/MathMenu.js
@@ -78,6 +78,16 @@ MathJax.Localization.addTranslation("fr","MathMenu",{
"toutes les fonctionnalités requises par MathJax, certaines " +
"expressions pourront donc ne pas s'afficher correctement.",
+ LoadURL:
+ "Load translation data from this URL:",
+
+ BadURL:
+ "The URL should be for a javascript file that defines MathJax translation data. " +
+ "Javascript file names should end with '.js'",
+
+ BadData:
+ "Failed to load translation data from %1",
+
SwitchAnyway:
"Êtes vous certain de vouloir changer le mode de rendu ?\n\n" +
"Appuyez sur OK pour valider ou Annuler pour continuer avec le " +
diff --git a/unpacked/localization/fr/TeX.js b/unpacked/localization/fr/TeX.js
@@ -75,8 +75,8 @@ MathJax.Localization.addTranslation("fr","TeX",{
MisplacedMoveRoot:
"La commande %1 n'est autorisée qu'à l'intérieur d'une racine",
- MultipleMoveRoot:
- "Commande %1 redondante",
+ MultipleCommand:
+ "Usage multiple de la commande %1",
IntegerArg:
"L'argument de la commande %1 doit être un entier",
@@ -120,8 +120,8 @@ MathJax.Localization.addTranslation("fr","TeX",{
ExtraClose:
"Accolade fermante non attendue",
- ExtraCloseInBrackets:
- "Accolade fermante non attendue avant le crochet fermant.",
+ ExtraCloseLooking:
+ "Extra close brace while looking for %1"
MissingCloseBracket:
"Impossible de trouver le crochet fermant pour l'argument de la commande %1",
@@ -132,9 +132,6 @@ MathJax.Localization.addTranslation("fr","TeX",{
MissingDimOrUnits:
"Dimension ou unité manquante pour la commande %1",
- ExtraCloseBraceInUpTo:
- "Accolade fermante non attendue avant la commande %1",
-
TokenNotFoundForCommand:
"Impossible de trouver la commande %1 pour la commande %2",
@@ -171,7 +168,7 @@ MathJax.Localization.addTranslation("fr","TeX",{
ErroneousNestingEq:
"Emboitement incorrect des structures d'équation",
- MultipleRowsOneCol:
+ MultlineRowsOneCol:
"Les lignes multiples doivent avoir exactement une colonne",
NoClosingDelim:
diff --git a/unpacked/localization/fr/fr.js b/unpacked/localization/fr/fr.js
@@ -1,4 +1,5 @@
MathJax.Localization.addTranslation("fr",null,{
+ menuTitle: "Fran\u00E7ais",
isLoaded: true,
domains: {
"_": {
