diff --git a/dist/pofile.js b/dist/pofile.js index 6a90c33..0a73481 100644 --- a/dist/pofile.js +++ b/dist/pofile.js @@ -215,6 +215,7 @@ PO.parse = function (data) { } else if (line.match(/^msgctxt/)) { // Context finish(); item.msgctxt = extract(line); + context = 'msgctxt'; noCommentLineCount++; } else { // Probably multiline string or blank if (line.length > 0) { @@ -225,6 +226,8 @@ PO.parse = function (data) { item.msgid += extract(line); } else if (context === 'msgid_plural') { item.msgid_plural += extract(line); + } else if (context === 'msgctxt') { + item.msgctxt += extract(line); } } } diff --git a/dist/pofile.min.js b/dist/pofile.min.js index 877b110..4400712 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},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;i0&&(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):"msgctxt"===m&&(l.msgctxt+=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 0) { @@ -222,6 +223,8 @@ PO.parse = function (data) { item.msgid += extract(line); } else if (context === 'msgid_plural') { item.msgid_plural += extract(line); + } else if (context === 'msgctxt') { + item.msgctxt += extract(line); } } } diff --git a/test/fixtures/big.po b/test/fixtures/big.po index c5236df..f315c9f 100644 --- a/test/fixtures/big.po +++ b/test/fixtures/big.po @@ -296,3 +296,9 @@ msgstr "This folder is empty." msgctxt "folder action" msgid "Empty folder" msgstr "Make this folder empty." + +msgctxt "" +"folder " +"meta" +msgid "Created Date" +msgstr "Date de création" diff --git a/test/parse.js b/test/parse.js index 3a2fe63..b280634 100644 --- a/test/parse.js +++ b/test/parse.js @@ -6,7 +6,7 @@ describe('Parse', function () { it('Parses the big po file', function () { var po = PO.parse(fs.readFileSync(__dirname + '/fixtures/big.po', 'utf8')); assert.notEqual(po, null); - assert.equal(po.items.length, 69); + assert.equal(po.items.length, 70); var item = po.items[0]; assert.equal(item.msgid, 'Title'); @@ -121,6 +121,17 @@ describe('Parse', function () { assert.equal(ambiguousItems[1].msgctxt, 'folder action'); }); + it('Parses item multiline context', function () { + var po = PO.parse(fs.readFileSync(__dirname + '/fixtures/big.po', 'utf8')); + + var item = po.items.find(function (item) { + return item.msgid === 'Created Date' && item.msgctxt === 'folder meta'; + }); + + assert.notEqual(item, undefined); + assert.equal(item.msgctxt, 'folder meta'); + }); + it('Handles obsolete items', function () { var po = PO.parse(fs.readFileSync(__dirname + '/fixtures/commented.po', 'utf8'));