From a6937bb7f04cddf485072745acd608499e8904f8 Mon Sep 17 00:00:00 2001 From: janhommes Date: Thu, 14 Sep 2017 14:37:45 +0200 Subject: [PATCH] Fixed issue with plural multiline text. --- dist/pofile.js | 18 ++++++++++++------ dist/pofile.min.js | 2 +- lib/po.js | 18 ++++++++++++------ test/fixtures/c-strings.po | 14 ++++++++++++++ 4 files changed, 39 insertions(+), 13 deletions(-) diff --git a/dist/pofile.js b/dist/pofile.js index 46d781e..6a90c33 100644 --- a/dist/pofile.js +++ b/dist/pofile.js @@ -316,6 +316,15 @@ PO.Item.prototype.toString = function () { return lines; }; + //handle \n in single-line texts (can not be handled in _escape) + var _processLineBreak = function (keyword, text, index) { + var processed = _process(keyword, text, index); + for (var i = 1; i < processed.length - 1; i++) { + processed[i] = processed[i].slice(0, -1) + '\\n"'; + } + return processed; + }; + // https://www.gnu.org/software/gettext/manual/html_node/PO-Files.html // says order is translator-comments, extracted-comments, references, flags @@ -351,7 +360,8 @@ PO.Item.prototype.toString = function () { if (Array.isArray(text) && text.length > 1) { text.forEach(function (t, i) { - lines = lines.concat(mkObsolete + _process(keyword, t, i)); + var processed = _processLineBreak(keyword, t, i); + lines = lines.concat(mkObsolete + processed.join('\n' + mkObsolete)); }); } else if (self.msgid_plural && keyword === 'msgstr' && !hasTranslation) { for (var pluralIndex = 0; pluralIndex < self.nplurals; pluralIndex++) { @@ -362,11 +372,7 @@ PO.Item.prototype.toString = function () { 0 : undefined; text = Array.isArray(text) ? text.join() : text; - var processed = _process(keyword, text, index); - //handle \n in single-line texts (can not be handled in _escape) - for (var i = 1; i < processed.length - 1; i++) { - processed[i] = processed[i].slice(0, -1) + '\\n"'; - } + var processed = _processLineBreak(keyword, text, index); lines = lines.concat(mkObsolete + processed.join('\n' + mkObsolete)); } } diff --git a/dist/pofile.min.js b/dist/pofile.min.js index fc56e6a..877b110 100644 --- a/dist/pofile.min.js +++ b/dist/pofile.min.js @@ -1 +1 @@ -require=function a(b,c,d){function e(g,h){if(!c[g]){if(!b[g]){var i="function"==typeof require&&require;if(!h&&i)return i(g,!0);if(f)return f(g,!0);var j=new Error("Cannot find module '"+g+"'");throw j.code="MODULE_NOT_FOUND",j}var k=c[g]={exports:{}};b[g][0].call(k.exports,function(a){var c=b[g][1][a];return e(c?c:a)},k,k.exports,a,b,c,d)}return c[g].exports}for(var f="function"==typeof require&&require,g=0;g0&&(o>=p&&(l.obsolete=!0),o=0,p=0,e.items.push(l),l=new f.Item({nplurals:k}))}function c(a){return a=d(a),a=a.replace(/^[^"]*"|"$/g,""),a=a.replace(/\\([abtnvfr'"\\?]|([0-7]{3})|x([0-9a-fA-F]{2}))/g,function(a,b,c,d){if(c)return String.fromCharCode(parseInt(c,8));if(d)return String.fromCharCode(parseInt(d,16));switch(b){case"a":return"";case"b":return"\b";case"t":return"\t";case"n":return"\n";case"v":return"\v";case"f":return"\f";case"r":return"\r";default:return b}})}a=a.replace(/\r\n/g,"\n");for(var e=new f,g=a.split(/\n\n/),h=[];g[0]&&(0===h.length||h[h.length-1].indexOf('msgid ""')<0);)g[0].match(/msgid "[^"]/)?h.push('msgid ""'):h.push(g.shift());h=h.join("\n");var i=g.join("\n").split(/\n/);e.headers={"Project-Id-Version":"","Report-Msgid-Bugs-To":"","POT-Creation-Date":"","PO-Revision-Date":"","Last-Translator":"",Language:"","Language-Team":"","Content-Type":"","Content-Transfer-Encoding":"","Plural-Forms":""},h.split(/\n/).reduce(function(a,b){return a.merge&&(b=a.pop().slice(0,-1)+b.slice(1),delete a.merge),/^".*"$/.test(b)&&!/^".*\\n"$/.test(b)&&(a.merge=!0),a.push(b),a},[]).forEach(function(a){if(a.match(/^#\./))e.extractedComments.push(a.replace(/^#\.\s*/,""));else if(a.match(/^#/))e.comments.push(a.replace(/^#\s*/,""));else if(a.match(/^"/)){a=a.trim().replace(/^"/,"").replace(/\\n"$/,"");var b=a.split(/:/),c=b.shift().trim(),d=b.join(":").trim();e.headers[c]=d}});for(var j=f.parsePluralForms(e.headers["Plural-Forms"]),k=j.nplurals,l=new f.Item({nplurals:k}),m=null,n=0,o=0,p=0;i.length>0;){var q=d(i.shift()),r=!1;if(q.match(/^#\~/)&&(q=d(q.substring(2)),r=!0),q.match(/^#:/))b(),l.references.push(d(q.replace(/^#:/,"")));else if(q.match(/^#,/)){b();for(var s=d(q.replace(/^#,/,"")).split(","),t=0;t0&&(p++,"msgstr"===m?l.msgstr[n]+=c(q):"msgid"===m?l.msgid+=c(q):"msgid_plural"===m&&(l.msgid_plural+=c(q)));r&&o++}return b(),e},f.parsePluralForms=function(a){var b=(a||"").split(";").reduce(function(a,b){var c=b.trim(),d=c.indexOf("="),e=c.substring(0,d).trim(),f=c.substring(d+1).trim();return a[e]=f,a},{});return{nplurals:b.nplurals,plural:b.plural}},f.Item=function(a){var b=a&&a.nplurals;this.msgid="",this.msgctxt=null,this.references=[],this.msgid_plural=null,this.msgstr=[],this.comments=[],this.extractedComments=[],this.flags={},this.obsolete=!1;var c=Number(b);this.nplurals=isNaN(c)?2:c},f.Item.prototype.toString=function(){var a=[],b=this,c=function(a){return a=a.replace(/[\x07\b\t\v\f\r"\\]/g,function(a){switch(a){case"":return"\\a";case"\b":return"\\b";case"\t":return"\\t";case"\v":return"\\v";case"\f":return"\\f";case"\r":return"\\r";default:return"\\"+a}})},d=function(a,b,d){var e=[],f=b.split(/\n/),g="undefined"!=typeof d?"["+d+"]":"";return f.length>1?(e.push(a+g+' ""'),f.forEach(function(a){e.push('"'+c(a)+'"')})):e.push(a+g+' "'+c(b)+'"'),e};this.comments.forEach(function(b){a.push("# "+b)}),this.extractedComments.forEach(function(b){a.push("#. "+b)}),this.references.forEach(function(b){a.push("#: "+b)});var e=Object.keys(this.flags).filter(function(a){return!!this.flags[a]},this);e.length>0&&a.push("#, "+e.join(","));var f=this.obsolete?"#~ ":"";return["msgctxt","msgid","msgid_plural","msgstr"].forEach(function(c){var e=b[c];if(null!=e){var g=!1;if(Array.isArray(e)&&(g=e.some(function(a){return a})),Array.isArray(e)&&e.length>1)e.forEach(function(b,e){a=a.concat(f+d(c,b,e))});else if(b.msgid_plural&&"msgstr"===c&&!g)for(var h=0;h0&&(o>=p&&(l.obsolete=!0),o=0,p=0,e.items.push(l),l=new f.Item({nplurals:k}))}function c(a){return a=d(a),a=a.replace(/^[^"]*"|"$/g,""),a=a.replace(/\\([abtnvfr'"\\?]|([0-7]{3})|x([0-9a-fA-F]{2}))/g,function(a,b,c,d){if(c)return String.fromCharCode(parseInt(c,8));if(d)return String.fromCharCode(parseInt(d,16));switch(b){case"a":return"";case"b":return"\b";case"t":return"\t";case"n":return"\n";case"v":return"\v";case"f":return"\f";case"r":return"\r";default:return b}})}a=a.replace(/\r\n/g,"\n");for(var e=new f,g=a.split(/\n\n/),h=[];g[0]&&(0===h.length||h[h.length-1].indexOf('msgid ""')<0);)g[0].match(/msgid "[^"]/)?h.push('msgid ""'):h.push(g.shift());h=h.join("\n");var i=g.join("\n").split(/\n/);e.headers={"Project-Id-Version":"","Report-Msgid-Bugs-To":"","POT-Creation-Date":"","PO-Revision-Date":"","Last-Translator":"",Language:"","Language-Team":"","Content-Type":"","Content-Transfer-Encoding":"","Plural-Forms":""},h.split(/\n/).reduce(function(a,b){return a.merge&&(b=a.pop().slice(0,-1)+b.slice(1),delete a.merge),/^".*"$/.test(b)&&!/^".*\\n"$/.test(b)&&(a.merge=!0),a.push(b),a},[]).forEach(function(a){if(a.match(/^#\./))e.extractedComments.push(a.replace(/^#\.\s*/,""));else if(a.match(/^#/))e.comments.push(a.replace(/^#\s*/,""));else if(a.match(/^"/)){a=a.trim().replace(/^"/,"").replace(/\\n"$/,"");var b=a.split(/:/),c=b.shift().trim(),d=b.join(":").trim();e.headers[c]=d}});for(var j=f.parsePluralForms(e.headers["Plural-Forms"]),k=j.nplurals,l=new f.Item({nplurals:k}),m=null,n=0,o=0,p=0;i.length>0;){var q=d(i.shift()),r=!1;if(q.match(/^#\~/)&&(q=d(q.substring(2)),r=!0),q.match(/^#:/))b(),l.references.push(d(q.replace(/^#:/,"")));else if(q.match(/^#,/)){b();for(var s=d(q.replace(/^#,/,"")).split(","),t=0;t0&&(p++,"msgstr"===m?l.msgstr[n]+=c(q):"msgid"===m?l.msgid+=c(q):"msgid_plural"===m&&(l.msgid_plural+=c(q)));r&&o++}return b(),e},f.parsePluralForms=function(a){var b=(a||"").split(";").reduce(function(a,b){var c=b.trim(),d=c.indexOf("="),e=c.substring(0,d).trim(),f=c.substring(d+1).trim();return a[e]=f,a},{});return{nplurals:b.nplurals,plural:b.plural}},f.Item=function(a){var b=a&&a.nplurals;this.msgid="",this.msgctxt=null,this.references=[],this.msgid_plural=null,this.msgstr=[],this.comments=[],this.extractedComments=[],this.flags={},this.obsolete=!1;var c=Number(b);this.nplurals=isNaN(c)?2:c},f.Item.prototype.toString=function(){var a=[],b=this,c=function(a){return a=a.replace(/[\x07\b\t\v\f\r"\\]/g,function(a){switch(a){case"":return"\\a";case"\b":return"\\b";case"\t":return"\\t";case"\v":return"\\v";case"\f":return"\\f";case"\r":return"\\r";default:return"\\"+a}})},d=function(a,b,d){var e=[],f=b.split(/\n/),g="undefined"!=typeof d?"["+d+"]":"";return f.length>1?(e.push(a+g+' ""'),f.forEach(function(a){e.push('"'+c(a)+'"')})):e.push(a+g+' "'+c(b)+'"'),e},e=function(a,b,c){for(var e=d(a,b,c),f=1;f0&&a.push("#, "+f.join(","));var g=this.obsolete?"#~ ":"";return["msgctxt","msgid","msgid_plural","msgstr"].forEach(function(c){var f=b[c];if(null!=f){var h=!1;if(Array.isArray(f)&&(h=f.some(function(a){return a})),Array.isArray(f)&&f.length>1)f.forEach(function(b,d){var f=e(c,b,d);a=a.concat(g+f.join("\n"+g))});else if(b.msgid_plural&&"msgstr"===c&&!h)for(var i=0;i 1) { text.forEach(function (t, i) { - lines = lines.concat(mkObsolete + _process(keyword, t, i)); + var processed = _processLineBreak(keyword, t, i); + lines = lines.concat(mkObsolete + processed.join('\n' + mkObsolete)); }); } else if (self.msgid_plural && keyword === 'msgstr' && !hasTranslation) { for (var pluralIndex = 0; pluralIndex < self.nplurals; pluralIndex++) { @@ -359,11 +369,7 @@ PO.Item.prototype.toString = function () { 0 : undefined; text = Array.isArray(text) ? text.join() : text; - var processed = _process(keyword, text, index); - //handle \n in single-line texts (can not be handled in _escape) - for (var i = 1; i < processed.length - 1; i++) { - processed[i] = processed[i].slice(0, -1) + '\\n"'; - } + var processed = _processLineBreak(keyword, text, index); lines = lines.concat(mkObsolete + processed.join('\n' + mkObsolete)); } } diff --git a/test/fixtures/c-strings.po b/test/fixtures/c-strings.po index d05b8e3..be5c506 100644 --- a/test/fixtures/c-strings.po +++ b/test/fixtures/c-strings.po @@ -57,3 +57,17 @@ msgid "" msgstr "" "\a\b\t\n" "\v\f\r" + +# plural text must suport \n +msgid "" +"Test.\n" +" multiline." +msgid_plural "" +"Test\n" +" multiline plural." +msgstr[0] "" +"Test.\n" +" mehrzeilig." +msgstr[1] "" +"Test.\n" +" mehrzeilig Plural."