From d426c114c7a61fa1c0963c827d348691374d8147 Mon Sep 17 00:00:00 2001 From: Ruben Vermeersch Date: Fri, 7 Mar 2014 10:15:50 +0100 Subject: [PATCH] Add support for obsolete items to fix broken parsing. --- dist/pofile.js | 20 ++++++++++++++++++-- dist/pofile.min.js | 2 +- lib/po.js | 20 ++++++++++++++++++-- test/fixtures/commented.po | 23 +++++++++++++++++++++++ test/parse.js | 15 +++++++++++++++ test/write.js | 9 +++++++++ 6 files changed, 84 insertions(+), 5 deletions(-) create mode 100644 test/fixtures/commented.po diff --git a/dist/pofile.js b/dist/pofile.js index 46dd343..239e97a 100644 --- a/dist/pofile.js +++ b/dist/pofile.js @@ -90,12 +90,15 @@ PO.parse = function (data) { var item = new PO.Item(), context = null, - plural = 0; + plural = 0, + obsolete = false; function finish() { if (item.msgid.length > 0) { po.items.push(item); item = new PO.Item(); + item.obsolete = obsolete; + obsolete = false; } } @@ -110,6 +113,14 @@ PO.parse = function (data) { while (lines.length > 0) { var line = trim(lines.shift()), add = false; + + if (line.match(/^#\~/)) { // Obsolete item + obsolete = true; + line = trim(line.substring(2)); + } else { + obsolete = false; + } + if (line.match(/^#:/)) { // Reference finish(); item.references.push(trim(line.replace(/^#:/, ''))); @@ -176,6 +187,7 @@ PO.Item = function () { this.comments = []; // translator comments this.extractedComments = []; this.flags = {}; + this.obsolete = false; }; PO.Item.prototype.toString = function () { @@ -245,7 +257,11 @@ PO.Item.prototype.toString = function () { } }); - return lines.join("\n"); + if (this.obsolete) { + return "#~ " + lines.join("\n#~ "); + } else { + return lines.join("\n"); + } }; module.exports = PO; diff --git a/dist/pofile.min.js b/dist/pofile.min.js index 5b565e8..21959aa 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);throw new Error("Cannot find module '"+g+"'")}var j=c[g]={exports:{}};b[g][0].call(j.exports,function(a){var c=b[g][1][a];return e(c?c:a)},j,j.exports,a,b,c,d)}return c[g].exports}for(var f="function"==typeof require&&require,g=0;g0&&(e.items.push(j),j=new f.Item)}function d(a){return a=c(a),a=a.replace(/^[^"]*"|"$/g,""),a=a.replace(/\\"/g,'"'),a=a.replace(/\\\\/g,"\\")}a=a.replace(/\r\n/g,"\n");var e=new f,g=a.split(/\n\n/),h=g.shift(),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/).forEach(function(a){if(a.match(/^#/)&&e.comments.push(a.replace(/^#\s*/,"")),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=new f.Item,k=null,l=0;i.length>0;){var m=c(i.shift());if(m.match(/^#:/))b(),j.references.push(c(m.replace(/^#:/,"")));else if(m.match(/^#,/)){b();for(var n=c(m.replace(/^#,/,"")).split(","),o=0;o0&&("msgstr"===k?j.msgstr[l]+=d(m):"msgid"===k?j.msgid+=d(m):"msgid_plural"===k&&(j.msgid_plural+=d(m)))}return b(),e},f.Item=function(){this.msgid="",this.msgctxt=null,this.references=[],this.msgid_plural=null,this.msgstr=[],this.comments=[],this.extractedComments=[],this.flags={}},f.Item.prototype.toString=function(){var a=[],b=this,c=function(a){return a=a.replace(/\\/g,"\\\\"),a.replace(/"/g,'\\"')},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.length>0&&this.comments.forEach(function(b){a.push("# "+b)}),this.extractedComments.length>0&&this.extractedComments.forEach(function(b){a.push("#. "+b)}),this.references.length>0&&this.references.forEach(function(b){a.push("#: "+b)});var f=Object.keys(this.flags);return f.length>0&&a.push("#, "+f.join(",")),["msgctxt","msgid","msgid_plural","msgstr"].forEach(function(c){var f=b[c];null!=f&&(e(f)&&f.length>1?f.forEach(function(b,e){a=a.concat(d(c,b,e))}):(f=e(f)?f.join():f,a=a.concat(d(c,f))))}),a.join("\n")},b.exports=f},{fs:3,"lodash.isarray":4}],pofile:[function(a,b){b.exports=a("W8CkM0")},{}],3:[function(){},{}],4:[function(a,b){var c=a("lodash._isnative"),d="[object Array]",e=Object.prototype,f=e.toString,g=c(g=Array.isArray)&&g,h=g||function(a){return a&&"object"==typeof a&&"number"==typeof a.length&&f.call(a)==d||!1};b.exports=h},{"lodash._isnative":5}],5:[function(a,b){function c(a){return"function"==typeof a&&f.test(a)}var d=Object.prototype,e=d.toString,f=RegExp("^"+String(e).replace(/[.*+?^${}()|[\]\\]/g,"\\$&").replace(/toString| for [^\]]+/g,".*?")+"$");b.exports=c},{}]},{},["W8CkM0"]); \ No newline at end of file +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);throw new Error("Cannot find module '"+g+"'")}var j=c[g]={exports:{}};b[g][0].call(j.exports,function(a){var c=b[g][1][a];return e(c?c:a)},j,j.exports,a,b,c,d)}return c[g].exports}for(var f="function"==typeof require&&require,g=0;g0&&(e.items.push(j),j=new f.Item,j.obsolete=m,m=!1)}function d(a){return a=c(a),a=a.replace(/^[^"]*"|"$/g,""),a=a.replace(/\\"/g,'"'),a=a.replace(/\\\\/g,"\\")}a=a.replace(/\r\n/g,"\n");var e=new f,g=a.split(/\n\n/),h=g.shift(),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/).forEach(function(a){if(a.match(/^#/)&&e.comments.push(a.replace(/^#\s*/,"")),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=new f.Item,k=null,l=0,m=!1;i.length>0;){var n=c(i.shift());if(n.match(/^#\~/)?(m=!0,n=c(n.substring(2))):m=!1,n.match(/^#:/))b(),j.references.push(c(n.replace(/^#:/,"")));else if(n.match(/^#,/)){b();for(var o=c(n.replace(/^#,/,"")).split(","),p=0;p0&&("msgstr"===k?j.msgstr[l]+=d(n):"msgid"===k?j.msgid+=d(n):"msgid_plural"===k&&(j.msgid_plural+=d(n)))}return b(),e},f.Item=function(){this.msgid="",this.msgctxt=null,this.references=[],this.msgid_plural=null,this.msgstr=[],this.comments=[],this.extractedComments=[],this.flags={},this.obsolete=!1},f.Item.prototype.toString=function(){var a=[],b=this,c=function(a){return a=a.replace(/\\/g,"\\\\"),a.replace(/"/g,'\\"')},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.length>0&&this.comments.forEach(function(b){a.push("# "+b)}),this.extractedComments.length>0&&this.extractedComments.forEach(function(b){a.push("#. "+b)}),this.references.length>0&&this.references.forEach(function(b){a.push("#: "+b)});var f=Object.keys(this.flags);return f.length>0&&a.push("#, "+f.join(",")),["msgctxt","msgid","msgid_plural","msgstr"].forEach(function(c){var f=b[c];null!=f&&(e(f)&&f.length>1?f.forEach(function(b,e){a=a.concat(d(c,b,e))}):(f=e(f)?f.join():f,a=a.concat(d(c,f))))}),this.obsolete?"#~ "+a.join("\n#~ "):a.join("\n")},b.exports=f},{fs:3,"lodash.isarray":4}],pofile:[function(a,b){b.exports=a("W8CkM0")},{}],3:[function(){},{}],4:[function(a,b){var c=a("lodash._isnative"),d="[object Array]",e=Object.prototype,f=e.toString,g=c(g=Array.isArray)&&g,h=g||function(a){return a&&"object"==typeof a&&"number"==typeof a.length&&f.call(a)==d||!1};b.exports=h},{"lodash._isnative":5}],5:[function(a,b){function c(a){return"function"==typeof a&&f.test(a)}var d=Object.prototype,e=d.toString,f=RegExp("^"+String(e).replace(/[.*+?^${}()|[\]\\]/g,"\\$&").replace(/toString| for [^\]]+/g,".*?")+"$");b.exports=c},{}]},{},["W8CkM0"]); \ No newline at end of file diff --git a/lib/po.js b/lib/po.js index 0d7a82f..8c0b609 100644 --- a/lib/po.js +++ b/lib/po.js @@ -89,12 +89,15 @@ PO.parse = function (data) { var item = new PO.Item(), context = null, - plural = 0; + plural = 0, + obsolete = false; function finish() { if (item.msgid.length > 0) { po.items.push(item); item = new PO.Item(); + item.obsolete = obsolete; + obsolete = false; } } @@ -109,6 +112,14 @@ PO.parse = function (data) { while (lines.length > 0) { var line = trim(lines.shift()), add = false; + + if (line.match(/^#\~/)) { // Obsolete item + obsolete = true; + line = trim(line.substring(2)); + } else { + obsolete = false; + } + if (line.match(/^#:/)) { // Reference finish(); item.references.push(trim(line.replace(/^#:/, ''))); @@ -175,6 +186,7 @@ PO.Item = function () { this.comments = []; // translator comments this.extractedComments = []; this.flags = {}; + this.obsolete = false; }; PO.Item.prototype.toString = function () { @@ -244,7 +256,11 @@ PO.Item.prototype.toString = function () { } }); - return lines.join("\n"); + if (this.obsolete) { + return "#~ " + lines.join("\n#~ "); + } else { + return lines.join("\n"); + } }; module.exports = PO; diff --git a/test/fixtures/commented.po b/test/fixtures/commented.po new file mode 100644 index 0000000..4fec90b --- /dev/null +++ b/test/fixtures/commented.po @@ -0,0 +1,23 @@ +msgid "" +msgstr "" +"Project-Id-Version: Test\n" +"POT-Creation-Date: \n" +"PO-Revision-Date: 2014-02-17 14:11+0100\n" +"Last-Translator: Ruben Vermeersch \n" +"Language-Team: \n" +"Language: nl\n" +"MIME-Version: 1.0\n" +"Content-Type: text/plain; charset=UTF-8\n" +"Content-Transfer-Encoding: 8bit\n" +"Plural-Forms: nplurals=2; plural=(n != 1);\n" +"X-Generator: Poedit 1.6.4\n" +"X-Poedit-SourceCharset: UTF-8\n" +"X-POOTLE-MTIME: 1390921449.000000\n" + + +#: .tmp/ui/settings/views/console-modal.html +msgid "{{dataLoader.data.length}} results" +msgstr "{{dataLoader.data.length}} resultaten" + +#~ msgid "Add order" +#~ msgstr "Order toevoegen" diff --git a/test/parse.js b/test/parse.js index 4547775..fbe1ef2 100644 --- a/test/parse.js +++ b/test/parse.js @@ -85,6 +85,21 @@ describe('Parse', function () { assert.equal(ambiguousItems[1].msgctxt, 'folder action'); }); + it('Handles obsolete items', function () { + var po = PO.parse(fs.readFileSync(__dirname + '/fixtures/commented.po', 'utf8')); + + assert.equal(po.items.length, 2); + var item = po.items[0]; + assert.equal(item.obsolete, false); + assert.equal(item.msgid, "{{dataLoader.data.length}} results"); + assert.equal(item.msgstr, "{{dataLoader.data.length}} resultaten"); + + item = po.items[1]; + assert.equal(item.obsolete, true); + assert.equal(item.msgid, "Add order"); + assert.equal(item.msgstr, "Order toevoegen"); + }); + describe('C-Strings', function () { it('should parse the c-strings.po file', function () { var po = PO.parse(fs.readFileSync(__dirname + '/fixtures/c-strings.po', 'utf8')); diff --git a/test/write.js b/test/write.js index 2f33f3d..fca4b18 100644 --- a/test/write.js +++ b/test/write.js @@ -52,6 +52,15 @@ describe('Write', function () { assertHasLine(str, '#. Extracted comment'); }); + it('write obsolete items', function () { + var input = fs.readFileSync(__dirname + '/fixtures/commented.po', 'utf8'); + var po = PO.parse(input); + var str = po.toString(); + + assertHasLine(str, '#~ msgid "Add order"'); + assertHasLine(str, '#~ msgstr "Order toevoegen"'); + }); + describe('C-Strings', function () { it('should escape "', function () { var item = new PO.Item();