unistack-org/pofile
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #30 from janhommes/master

Browse Source 
Fixed issue with plural multi line text.
This commit is contained in:
Ruben Vermeersch 2017-09-14 15:26:50 +02:00 committed by GitHub
commit 58875dc119
4 changed files with 39 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
dist/pofile.js vendored
View File

@ -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));
}
}

2
dist/pofile.min.js vendored
View File

File diff suppressed because one or more lines are too long

18
lib/po.js
View File

@ -313,6 +313,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
@ -348,7 +357,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++) {
@ -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));
}
}

14
test/fixtures/c-strings.po vendored
View File

@ -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."