cleanup

Signed-off-by: Vasiliy Tolstov <v.tolstov@unistack.org>

.jscs.json

@@ -0,0 +1,34 @@
+{
+    "requireCurlyBraces": ["if", "else", "for", "while", "do", "try", "catch"],
+    "requireSpaceAfterKeywords": ["if", "else", "for", "while", "do", "switch", "return", "try", "catch"],
+    "requireParenthesesAroundIIFE": true,
+    "requireSpacesInFunctionExpression": {
+        "beforeOpeningCurlyBrace": true
+    },
+    "requireSpacesInAnonymousFunctionExpression": {
+        "beforeOpeningRoundBrace": true
+    },
+    "disallowSpacesInNamedFunctionExpression": {
+        "beforeOpeningRoundBrace": true
+    },
+    "disallowSpacesInFunctionDeclaration": {
+        "beforeOpeningRoundBrace": true
+    },
+    "disallowMultipleVarDecl": true,
+    "requireSpacesInsideObjectBrackets": "all",
+    "disallowSpaceAfterObjectKeys": true,
+    "requireCommaBeforeLineBreak": true,
+    "disallowSpaceBeforeBinaryOperators": [","],
+    "disallowSpaceAfterPrefixUnaryOperators": ["++", "--", "+", "-", "~", "!"],
+    "disallowSpaceBeforePostfixUnaryOperators": ["++", "--"],
+    "requireSpaceBeforeBinaryOperators": ["+", "-", "/", "*", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<="],
+    "requireSpaceAfterBinaryOperators": [",", "+", "-", "/", "*", "=", "==", "===", "!=", "!==", ">", ">=", "<", "<="],
+    "validateQuoteMarks": true,
+    "validateIndentation": 4,
+    "disallowTrailingWhitespace": true,
+    "disallowKeywordsOnNewLine": ["else"],
+    "requireCapitalizedConstructors": true,
+    "safeContextKeyword": "self",
+    "requireDotNotation": true,
+    "disallowYodaConditions": true
+}

.travis.yml

@@ -1,7 +1,5 @@
 language: node_js
 node_js:
-  - "0.8"
-  - "0.10"
-  - "0.11"
+  - "node"
 before_install:
   - npm install -g grunt-cli

Gruntfile.coffee

@@ -5,6 +5,7 @@ module.exports = (grunt) ->
     @loadNpmTasks('grunt-contrib-jshint')
     @loadNpmTasks('grunt-contrib-uglify')
     @loadNpmTasks('grunt-contrib-watch')
+    @loadNpmTasks('grunt-jscs')
     @loadNpmTasks('grunt-mocha-cli')
 
     @initConfig
@@ -16,6 +17,13 @@ module.exports = (grunt) ->
             options:
                 jshintrc: '.jshintrc'
 
+        jscs:
+            src:
+                options:
+                    config: '.jscs.json'
+                files:
+                    src: [ 'lib/*.js', 'test/*.js' ]
+
         watch:
             all:
                 options:
@@ -35,7 +43,8 @@ module.exports = (grunt) ->
                 files:
                     'dist/pofile.js': ['lib/po.js']
                 options:
-                    alias: 'lib/po.js:pofile'
+                    alias:
+                        pofile: './lib/po.js'
 
         uglify:
             dist:
@@ -44,10 +53,10 @@ module.exports = (grunt) ->
 
         bump:
             options:
-                files: ['package.json', 'bower.json']
+                files: ['package.json', 'package-lock.json', 'bower.json']
                 commitFiles: ['-a']
                 pushTo: 'origin'
 
     @registerTask 'default', ['test']
-    @registerTask 'build', ['clean', 'jshint', 'browserify', 'uglify']
+    @registerTask 'build', ['clean', 'jshint', 'jscs', 'browserify', 'uglify']
     @registerTask 'test', ['build', 'mochacli']

LICENSE

@@ -1,4 +1,4 @@
-Copyright (C) 2013-2014 Ruben Vermeersch
+Copyright (C) 2013-2017 Ruben Vermeersch
 Copyright (C) 2012 Michael Holly
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of

README.md

@@ -81,7 +81,7 @@ po.save('out.po', function (err) {
 
 ### The PO.Item class
 
-The `PO` class exposes the following members:
+The `PO.Item` class exposes the following members:
 
 * `msgid`: The message id.
 * `msgid_plural`: The plural message id (null if absent).
@@ -143,7 +143,7 @@ PO.load('text.po', function (err, po) {
 
     (The MIT License)
 
-    Copyright (C) 2013-2014 by Ruben Vermeersch <ruben@rocketeer.be>
+    Copyright (C) 2013-2017 by Ruben Vermeersch <ruben@rocketeer.be>
     Copyright (C) 2012 by Michael Holly
 
     Permission is hereby granted, free of charge, to any person obtaining a copy

bower.json

@@ -1,6 +1,6 @@
 {
   "name": "pofile",
-  "version": "0.2.6",
+  "version": "1.1.3",
   "authors": [
     "Ruben Vermeersch <ruben@rocketeer.be>"
   ],

dist/pofile.js

@@ -1,37 +1,53 @@
-require=(function e(t,n,r){function s(o,u){if(!n[o]){if(!t[o]){var a=typeof require=="function"&&require;if(!u&&a)return a(o,!0);if(i)return i(o,!0);throw new Error("Cannot find module '"+o+"'")}var f=n[o]={exports:{}};t[o][0].call(f.exports,function(e){var n=t[o][1][e];return s(n?n:e)},f,f.exports,e,t,n,r)}return n[o].exports}var i=typeof require=="function"&&require;for(var o=0;o<r.length;o++)s(r[o]);return s})({"W8CkM0":[function(require,module,exports){
-var fs = require('fs'),
-    isArray = require('lodash.isarray');
-
+require=(function(){function r(e,n,t){function o(i,f){if(!n[i]){if(!e[i]){var c="function"==typeof require&&require;if(!f&&c)return c(i,!0);if(u)return u(i,!0);var a=new Error("Cannot find module '"+i+"'");throw a.code="MODULE_NOT_FOUND",a}var p=n[i]={exports:{}};e[i][0].call(p.exports,function(r){var n=e[i][1][r];return o(n||r)},p,p.exports,r,e,n,t)}return n[i].exports}for(var u="function"==typeof require&&require,i=0;i<t.length;i++)o(t[i]);return o}return r})()({"pofile":[function(require,module,exports){
 function trim(string) {
     return string.replace(/^\s+|\s+$/g, '');
 }
 
 var PO = function () {
     this.comments = [];
+    this.extractedComments = [];
     this.headers = {};
+    this.headerOrder = [];
     this.items = [];
 };
 
-PO.prototype.save = function (filename, callback) {
-    fs.writeFile(filename, this.toString(), callback);
-};
 
 PO.prototype.toString = function () {
-    var lines = [],
-        that = this;
+    var lines = [];
 
     if (this.comments) {
         this.comments.forEach(function (comment) {
-            lines.push('# ' + comment);
+            lines.push(('# ' + comment).trim());
+        });
+    }
+    if (this.extractedComments) {
+        this.extractedComments.forEach(function (comment) {
+            lines.push(('#. ' + comment).trim());
         });
     }
 
     lines.push('msgid ""');
     lines.push('msgstr ""');
 
+    var self = this;
+    var headerOrder = [];
+
+    this.headerOrder.forEach(function (key) {
+        if (key in self.headers) {
+            headerOrder.push(key);
+        }
+    });
+
     var keys = Object.keys(this.headers);
+
     keys.forEach(function (key) {
-        lines.push('"' + key + ': ' + that.headers[key] + '\\n"');
+        if (headerOrder.indexOf(key) === -1) {
+            headerOrder.push(key);
+        }
+    });
+
+    headerOrder.forEach(function (key) {
+        lines.push('"' + key + ': ' + self.headers[key] + '\\n"');
     });
 
     lines.push('');
@@ -41,26 +57,26 @@ PO.prototype.toString = function () {
         lines.push('');
     });
 
-    return lines.join("\n");
-};
-
-PO.load = function (filename, callback) {
-    fs.readFile(filename, 'utf-8', function (err, data) {
-        if (err) {
-            return callback(err);
-        }
-        var po = PO.parse(data);
-        callback(null, po);
-    });
+    return lines.join('\n');
 };
 
 PO.parse = function (data) {
     //support both unix and windows newline formats.
     data = data.replace(/\r\n/g, '\n');
-    var po = new PO(),
-        sections = data.split(/\n\n/),
-        headers = sections.shift(),
-        lines = sections.join("\n").split(/\n/);
+    var po = new PO();
+    var sections = data.split(/\n\n/);
+    var headers = [];
+    //everything until the first 'msgid ""' is considered header
+    while (sections[0] && (headers.length === 0 || headers[headers.length - 1].indexOf('msgid ""') < 0)) {
+        if (sections[0].match(/msgid\s+"[^"]/)) {
+            //found first real string, adding a dummy header item
+            headers.push('msgid ""');
+        } else {
+            headers.push(sections.shift());
+        }
+    }
+    headers = headers.join('\n');
+    var lines = sections.join('\n').split(/\n/);
 
     po.headers = {
         'Project-Id-Version': '',
@@ -74,100 +90,179 @@ PO.parse = function (data) {
         'Content-Transfer-Encoding': '',
         'Plural-Forms': '',
     };
+    po.headerOrder = [];
 
-    headers.split(/\n/).forEach(function (header) {
-        if (header.match(/^#/)) {
-            po.comments.push(header.replace(/^#\s*/, ''));
+    headers.split(/\n/).reduce(function (acc, line) {
+        if (acc.merge) {
+            //join lines, remove last resp. first "
+            line = acc.pop().slice(0, -1) + line.slice(1);
+            delete acc.merge;
         }
-        if (header.match(/^"/)) {
+        if (/^".*"$/.test(line) && !/^".*\\n"$/.test(line)) {
+            acc.merge = true;
+        }
+        acc.push(line);
+        return acc;
+    }, []).forEach(function (header) {
+        if (header.match(/^#\./)) {
+            po.extractedComments.push(header.replace(/^#\.\s*/, ''));
+        } else if (header.match(/^#/)) {
+            po.comments.push(header.replace(/^#\s*/, ''));
+        } else if (header.match(/^"/)) {
             header = header.trim().replace(/^"/, '').replace(/\\n"$/, '');
-            var p = header.split(/:/),
-                name = p.shift().trim(),
-                value = p.join(':').trim();
+            var p = header.split(/:/);
+            var name = p.shift().trim();
+            var value = p.join(':').trim();
             po.headers[name] = value;
+            po.headerOrder.push(name);
         }
     });
 
-    var item = new PO.Item(),
-        context = null,
-        plural = 0;
+    var parsedPluralForms = PO.parsePluralForms(po.headers['Plural-Forms']);
+    var nplurals = parsedPluralForms.nplurals;
+    var item = new PO.Item({ nplurals: nplurals });
+    var context = null;
+    var plural = 0;
+    var obsoleteCount = 0;
+    var noCommentLineCount = 0;
 
     function finish() {
         if (item.msgid.length > 0) {
+            if (obsoleteCount >= noCommentLineCount) {
+                item.obsolete = true;
+            }
+            obsoleteCount = 0;
+            noCommentLineCount = 0;
             po.items.push(item);
-            item = new PO.Item();
+            item = new PO.Item({ nplurals: nplurals });
         }
     }
 
     function extract(string) {
         string = trim(string);
         string = string.replace(/^[^"]*"|"$/g, '');
-        string = string.replace(/\\"/g, '"');
-        string = string.replace(/\\\\/g, '\\');
+        string = string.replace(/\\([abtnvfr'"\\?]|([0-7]{3})|x([0-9a-fA-F]{2}))/g, function (match, esc, oct, hex) {
+            if (oct) {
+                return String.fromCharCode(parseInt(oct, 8));
+            }
+            if (hex) {
+                return String.fromCharCode(parseInt(hex, 16));
+            }
+            switch (esc) {
+                case 'a':
+                    return '\x07';
+                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 esc;
+            }
+        });
         return string;
     }
 
     while (lines.length > 0) {
-        var line = trim(lines.shift()),
-            add = false;
+        var line = trim(lines.shift());
+        var lineObsolete = false;
+        var add = false;
+
+        if (line.match(/^#\~/)) { // Obsolete item
+            //only remove the obsolte comment mark, here
+            //might be, this is a new item, so
+            //only remember, this line is marked obsolete, count after line is parsed
+            line = trim(line.substring(2));
+            lineObsolete = true;
+        }
+
         if (line.match(/^#:/)) { // Reference
             finish();
             item.references.push(trim(line.replace(/^#:/, '')));
-        }
-        else if (line.match(/^#,/)) { // Flags
+        } else if (line.match(/^#,/)) { // Flags
             finish();
-            var flags = trim(line.replace(/^#,/, '')).split(",");
+            var flags = trim(line.replace(/^#,/, '')).split(',');
             for (var i = 0; i < flags.length; i++) {
                 item.flags[flags[i]] = true;
             }
-        }
-        else if (line.match(/^#\s+/)) { // Translator comment
+        } else if (line.match(/^#($|\s+)/)) { // Translator comment
             finish();
-            item.comments.push(trim(line.replace(/^#\s+/, '')));
-        }
-        else if (line.match(/^#\./)) { // Extracted comment
+            item.comments.push(trim(line.replace(/^#($|\s+)/, '')));
+        } else if (line.match(/^#\./)) { // Extracted comment
             finish();
             item.extractedComments.push(trim(line.replace(/^#\./, '')));
-        }
-        else if (line.match(/^msgid_plural/)) { // Plural form
+        } else if (line.match(/^msgid_plural/)) { // Plural form
             item.msgid_plural = extract(line);
             context = 'msgid_plural';
-        }
-        else if (line.match(/^msgid/)) { // Original
+            noCommentLineCount++;
+        } else if (line.match(/^msgid/)) { // Original
             finish();
             item.msgid = extract(line);
             context = 'msgid';
-        }
-        else if (line.match(/^msgstr/)) { // Translation
+            noCommentLineCount++;
+        } else if (line.match(/^msgstr/)) { // Translation
             var m = line.match(/^msgstr\[(\d+)\]/);
             plural = m && m[1] ? parseInt(m[1]) : 0;
             item.msgstr[plural] = extract(line);
             context = 'msgstr';
-        }
-        else if (line.match(/^msgctxt/)) { // Context
+            noCommentLineCount++;
+        } else if (line.match(/^msgctxt/)) { // Context
             finish();
             item.msgctxt = extract(line);
-        }
-        else { // Probably multiline string or blank
+            context = 'msgctxt';
+            noCommentLineCount++;
+        } else { // Probably multiline string or blank
             if (line.length > 0) {
+                noCommentLineCount++;
                 if (context === 'msgstr') {
                     item.msgstr[plural] += extract(line);
-                }
-                else if (context === 'msgid') {
+                } else if (context === 'msgid') {
                     item.msgid += extract(line);
-                }
-                else if (context === 'msgid_plural') {
+                } else if (context === 'msgid_plural') {
                     item.msgid_plural += extract(line);
+                } else if (context === 'msgctxt') {
+                    item.msgctxt += extract(line);
                 }
             }
         }
+
+        if (lineObsolete) {
+            // Count obsolete lines for this item
+            obsoleteCount++;
+        }
     }
     finish();
 
     return po;
 };
 
-PO.Item = function () {
+PO.parsePluralForms = function (pluralFormsString) {
+    var results = (pluralFormsString || '')
+        .split(';')
+        .reduce(function (acc, keyValueString) {
+            var trimmedString = keyValueString.trim();
+            var equalsIndex = trimmedString.indexOf('=');
+            var key = trimmedString.substring(0, equalsIndex).trim();
+            var value = trimmedString.substring(equalsIndex + 1).trim();
+            acc[key] = value;
+            return acc;
+        }, {});
+    return {
+        nplurals: results.nplurals,
+        plural: results.plural
+    };
+};
+
+PO.Item = function (options) {
+    var nplurals = options && options.nplurals;
+
     this.msgid = '';
     this.msgctxt = null;
     this.references = [];
@@ -176,165 +271,120 @@ PO.Item = function () {
     this.comments = []; // translator comments
     this.extractedComments = [];
     this.flags = {};
+    this.obsolete = false;
+    var npluralsNumber = Number(nplurals);
+    this.nplurals = (isNaN(npluralsNumber)) ? 2 : npluralsNumber;
 };
 
 PO.Item.prototype.toString = function () {
-    var lines = [],
-        that = this;
+    var lines = [];
+    var self = this;
 
     // reverse what extract(string) method during PO.parse does
     var _escape = function (string) {
-        string = string.replace(/\\/g, '\\\\');
-        return string.replace(/"/g, '\\"');
+        // don't unescape \n, since string can never contain it
+        // since split('\n') is called on it
+        string = string.replace(/[\x07\b\t\v\f\r"\\]/g, function (match) {
+            switch (match) {
+                case '\x07':
+                    return '\\a';
+                case '\b':
+                    return '\\b';
+                case '\t':
+                    return '\\t';
+                case '\v':
+                    return '\\v';
+                case '\f':
+                    return '\\f';
+                case '\r':
+                    return '\\r';
+                default:
+                    return '\\' + match;
+            }
+        });
+        return string;
     };
 
     var _process = function (keyword, text, i) {
-        var lines = [],
-            parts = text.split(/\n/),
-            index = typeof i !== 'undefined' ? '[' + i + ']' : '';
+        var lines = [];
+        var parts = text.split(/\n/);
+        var index = typeof i !== 'undefined' ? '[' + i + ']' : '';
         if (parts.length > 1) {
             lines.push(keyword + index + ' ""');
             parts.forEach(function (part) {
                 lines.push('"' + _escape(part) + '"');
             });
-        }
-        else {
+        } else {
             lines.push(keyword + index + ' "' + _escape(text) + '"');
         }
         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
 
-    if (this.comments.length > 0) {
-        this.comments.forEach(function (c) {
-            lines.push('# ' + c);
-        });
-    }
+    this.comments.forEach(function (c) {
+        lines.push('# ' + c);
+    });
 
-    if (this.extractedComments.length > 0) {
-        this.extractedComments.forEach(function (c) {
-            lines.push('#. ' + c);
-        });
-    }
+    this.extractedComments.forEach(function (c) {
+        lines.push('#. ' + c);
+    });
 
-    if (this.references.length > 0) {
-        this.references.forEach(function (ref) {
-            lines.push('#: ' + ref);
-        });
-    }
+    this.references.forEach(function (ref) {
+        lines.push('#: ' + ref);
+    });
 
-    var flags = Object.keys(this.flags);
+    var flags = Object.keys(this.flags).filter(function (flag) {
+        return !!this.flags[flag];
+    }, this);
     if (flags.length > 0) {
-        lines.push('#, ' + flags.join(","));
+        lines.push('#, ' + flags.join(','));
     }
+    var mkObsolete = this.obsolete ? '#~ ' : '';
 
     ['msgctxt', 'msgid', 'msgid_plural', 'msgstr'].forEach(function (keyword) {
-        var text = that[keyword];
+        var text = self[keyword];
         if (text != null) {
-            if (isArray(text) && text.length > 1) {
-                text.forEach(function (t, i) {
-                    lines = lines.concat(_process(keyword, t, i));
+            var hasTranslation = false;
+            if (Array.isArray(text)) {
+                hasTranslation = text.some(function (text) {
+                    return text;
                 });
             }
-            else {
-                text = isArray(text) ? text.join() : text;
-                lines = lines.concat(_process(keyword, text));
+
+            if (Array.isArray(text) && text.length > 1) {
+                text.forEach(function (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++) {
+                    lines = lines.concat(mkObsolete + _process(keyword, '', pluralIndex));
+                }
+            } else {
+                var index = (self.msgid_plural && Array.isArray(text)) ?
+                    0 :
+                    undefined;
+                text = Array.isArray(text) ? text.join() : text;
+                var processed = _processLineBreak(keyword, text, index);
+                lines = lines.concat(mkObsolete + processed.join('\n' + mkObsolete));
             }
         }
     });
 
-    return lines.join("\n");
+    return lines.join('\n');
 };
 
 module.exports = PO;
 
-},{"fs":3,"lodash.isarray":4}],"pofile":[function(require,module,exports){
-module.exports=require('W8CkM0');
-},{}],3:[function(require,module,exports){
-
-},{}],4:[function(require,module,exports){
-/**
- * Lo-Dash 2.4.1 (Custom Build) <http://lodash.com/>
- * Build: `lodash modularize modern exports="npm" -o ./npm/`
- * Copyright 2012-2013 The Dojo Foundation <http://dojofoundation.org/>
- * Based on Underscore.js 1.5.2 <http://underscorejs.org/LICENSE>
- * Copyright 2009-2013 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
- * Available under MIT license <http://lodash.com/license>
- */
-var isNative = require('lodash._isnative');
-
-/** `Object#toString` result shortcuts */
-var arrayClass = '[object Array]';
-
-/** Used for native method references */
-var objectProto = Object.prototype;
-
-/** Used to resolve the internal [[Class]] of values */
-var toString = objectProto.toString;
-
-/* Native method shortcuts for methods with the same name as other `lodash` methods */
-var nativeIsArray = isNative(nativeIsArray = Array.isArray) && nativeIsArray;
-
-/**
- * Checks if `value` is an array.
- *
- * @static
- * @memberOf _
- * @type Function
- * @category Objects
- * @param {*} value The value to check.
- * @returns {boolean} Returns `true` if the `value` is an array, else `false`.
- * @example
- *
- * (function() { return _.isArray(arguments); })();
- * // => false
- *
- * _.isArray([1, 2, 3]);
- * // => true
- */
-var isArray = nativeIsArray || function(value) {
-  return value && typeof value == 'object' && typeof value.length == 'number' &&
-    toString.call(value) == arrayClass || false;
-};
-
-module.exports = isArray;
-
-},{"lodash._isnative":5}],5:[function(require,module,exports){
-/**
- * Lo-Dash 2.4.1 (Custom Build) <http://lodash.com/>
- * Build: `lodash modularize modern exports="npm" -o ./npm/`
- * Copyright 2012-2013 The Dojo Foundation <http://dojofoundation.org/>
- * Based on Underscore.js 1.5.2 <http://underscorejs.org/LICENSE>
- * Copyright 2009-2013 Jeremy Ashkenas, DocumentCloud and Investigative Reporters & Editors
- * Available under MIT license <http://lodash.com/license>
- */
-
-/** Used for native method references */
-var objectProto = Object.prototype;
-
-/** Used to resolve the internal [[Class]] of values */
-var toString = objectProto.toString;
-
-/** Used to detect if a method is native */
-var reNative = RegExp('^' +
-  String(toString)
-    .replace(/[.*+?^${}()|[\]\\]/g, '\\$&')
-    .replace(/toString| for [^\]]+/g, '.*?') + '$'
-);
-
-/**
- * Checks if `value` is a native function.
- *
- * @private
- * @param {*} value The value to check.
- * @returns {boolean} Returns `true` if the `value` is a native function, else `false`.
- */
-function isNative(value) {
-  return typeof value == 'function' && reNative.test(value);
-}
-
-module.exports = isNative;
-
-},{}]},{},["W8CkM0"])
+},{}]},{},["pofile"]);

lib/po.js

@@ -1,36 +1,52 @@
-var fs = require('fs'),
-    isArray = require('lodash.isarray');
-
 function trim(string) {
     return string.replace(/^\s+|\s+$/g, '');
 }
 
 var PO = function () {
     this.comments = [];
+    this.extractedComments = [];
     this.headers = {};
+    this.headerOrder = [];
     this.items = [];
 };
 
-PO.prototype.save = function (filename, callback) {
-    fs.writeFile(filename, this.toString(), callback);
-};
 
 PO.prototype.toString = function () {
-    var lines = [],
-        that = this;
+    var lines = [];
 
     if (this.comments) {
         this.comments.forEach(function (comment) {
-            lines.push('# ' + comment);
+            lines.push(('# ' + comment).trim());
+        });
+    }
+    if (this.extractedComments) {
+        this.extractedComments.forEach(function (comment) {
+            lines.push(('#. ' + comment).trim());
         });
     }
 
     lines.push('msgid ""');
     lines.push('msgstr ""');
 
+    var self = this;
+    var headerOrder = [];
+
+    this.headerOrder.forEach(function (key) {
+        if (key in self.headers) {
+            headerOrder.push(key);
+        }
+    });
+
     var keys = Object.keys(this.headers);
+
     keys.forEach(function (key) {
-        lines.push('"' + key + ': ' + that.headers[key] + '\\n"');
+        if (headerOrder.indexOf(key) === -1) {
+            headerOrder.push(key);
+        }
+    });
+
+    headerOrder.forEach(function (key) {
+        lines.push('"' + key + ': ' + self.headers[key] + '\\n"');
     });
 
     lines.push('');
@@ -40,26 +56,26 @@ PO.prototype.toString = function () {
         lines.push('');
     });
 
-    return lines.join("\n");
-};
-
-PO.load = function (filename, callback) {
-    fs.readFile(filename, 'utf-8', function (err, data) {
-        if (err) {
-            return callback(err);
-        }
-        var po = PO.parse(data);
-        callback(null, po);
-    });
+    return lines.join('\n');
 };
 
 PO.parse = function (data) {
     //support both unix and windows newline formats.
     data = data.replace(/\r\n/g, '\n');
-    var po = new PO(),
-        sections = data.split(/\n\n/),
-        headers = sections.shift(),
-        lines = sections.join("\n").split(/\n/);
+    var po = new PO();
+    var sections = data.split(/\n\n/);
+    var headers = [];
+    //everything until the first 'msgid ""' is considered header
+    while (sections[0] && (headers.length === 0 || headers[headers.length - 1].indexOf('msgid ""') < 0)) {
+        if (sections[0].match(/msgid\s+"[^"]/)) {
+            //found first real string, adding a dummy header item
+            headers.push('msgid ""');
+        } else {
+            headers.push(sections.shift());
+        }
+    }
+    headers = headers.join('\n');
+    var lines = sections.join('\n').split(/\n/);
 
     po.headers = {
         'Project-Id-Version': '',
@@ -73,100 +89,179 @@ PO.parse = function (data) {
         'Content-Transfer-Encoding': '',
         'Plural-Forms': '',
     };
+    po.headerOrder = [];
 
-    headers.split(/\n/).forEach(function (header) {
-        if (header.match(/^#/)) {
-            po.comments.push(header.replace(/^#\s*/, ''));
+    headers.split(/\n/).reduce(function (acc, line) {
+        if (acc.merge) {
+            //join lines, remove last resp. first "
+            line = acc.pop().slice(0, -1) + line.slice(1);
+            delete acc.merge;
         }
-        if (header.match(/^"/)) {
+        if (/^".*"$/.test(line) && !/^".*\\n"$/.test(line)) {
+            acc.merge = true;
+        }
+        acc.push(line);
+        return acc;
+    }, []).forEach(function (header) {
+        if (header.match(/^#\./)) {
+            po.extractedComments.push(header.replace(/^#\.\s*/, ''));
+        } else if (header.match(/^#/)) {
+            po.comments.push(header.replace(/^#\s*/, ''));
+        } else if (header.match(/^"/)) {
             header = header.trim().replace(/^"/, '').replace(/\\n"$/, '');
-            var p = header.split(/:/),
-                name = p.shift().trim(),
-                value = p.join(':').trim();
+            var p = header.split(/:/);
+            var name = p.shift().trim();
+            var value = p.join(':').trim();
             po.headers[name] = value;
+            po.headerOrder.push(name);
         }
     });
 
-    var item = new PO.Item(),
-        context = null,
-        plural = 0;
+    var parsedPluralForms = PO.parsePluralForms(po.headers['Plural-Forms']);
+    var nplurals = parsedPluralForms.nplurals;
+    var item = new PO.Item({ nplurals: nplurals });
+    var context = null;
+    var plural = 0;
+    var obsoleteCount = 0;
+    var noCommentLineCount = 0;
 
     function finish() {
         if (item.msgid.length > 0) {
+            if (obsoleteCount >= noCommentLineCount) {
+                item.obsolete = true;
+            }
+            obsoleteCount = 0;
+            noCommentLineCount = 0;
             po.items.push(item);
-            item = new PO.Item();
+            item = new PO.Item({ nplurals: nplurals });
         }
     }
 
     function extract(string) {
         string = trim(string);
         string = string.replace(/^[^"]*"|"$/g, '');
-        string = string.replace(/\\"/g, '"');
-        string = string.replace(/\\\\/g, '\\');
+        string = string.replace(/\\([abtnvfr'"\\?]|([0-7]{3})|x([0-9a-fA-F]{2}))/g, function (match, esc, oct, hex) {
+            if (oct) {
+                return String.fromCharCode(parseInt(oct, 8));
+            }
+            if (hex) {
+                return String.fromCharCode(parseInt(hex, 16));
+            }
+            switch (esc) {
+                case 'a':
+                    return '\x07';
+                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 esc;
+            }
+        });
         return string;
     }
 
     while (lines.length > 0) {
-        var line = trim(lines.shift()),
-            add = false;
+        var line = trim(lines.shift());
+        var lineObsolete = false;
+        var add = false;
+
+        if (line.match(/^#\~/)) { // Obsolete item
+            //only remove the obsolte comment mark, here
+            //might be, this is a new item, so
+            //only remember, this line is marked obsolete, count after line is parsed
+            line = trim(line.substring(2));
+            lineObsolete = true;
+        }
+
         if (line.match(/^#:/)) { // Reference
             finish();
             item.references.push(trim(line.replace(/^#:/, '')));
-        }
-        else if (line.match(/^#,/)) { // Flags
+        } else if (line.match(/^#,/)) { // Flags
             finish();
-            var flags = trim(line.replace(/^#,/, '')).split(",");
+            var flags = trim(line.replace(/^#,/, '')).split(',');
             for (var i = 0; i < flags.length; i++) {
                 item.flags[flags[i]] = true;
             }
-        }
-        else if (line.match(/^#\s+/)) { // Translator comment
+        } else if (line.match(/^#($|\s+)/)) { // Translator comment
             finish();
-            item.comments.push(trim(line.replace(/^#\s+/, '')));
-        }
-        else if (line.match(/^#\./)) { // Extracted comment
+            item.comments.push(trim(line.replace(/^#($|\s+)/, '')));
+        } else if (line.match(/^#\./)) { // Extracted comment
             finish();
             item.extractedComments.push(trim(line.replace(/^#\./, '')));
-        }
-        else if (line.match(/^msgid_plural/)) { // Plural form
+        } else if (line.match(/^msgid_plural/)) { // Plural form
             item.msgid_plural = extract(line);
             context = 'msgid_plural';
-        }
-        else if (line.match(/^msgid/)) { // Original
+            noCommentLineCount++;
+        } else if (line.match(/^msgid/)) { // Original
             finish();
             item.msgid = extract(line);
             context = 'msgid';
-        }
-        else if (line.match(/^msgstr/)) { // Translation
+            noCommentLineCount++;
+        } else if (line.match(/^msgstr/)) { // Translation
             var m = line.match(/^msgstr\[(\d+)\]/);
             plural = m && m[1] ? parseInt(m[1]) : 0;
             item.msgstr[plural] = extract(line);
             context = 'msgstr';
-        }
-        else if (line.match(/^msgctxt/)) { // Context
+            noCommentLineCount++;
+        } else if (line.match(/^msgctxt/)) { // Context
             finish();
             item.msgctxt = extract(line);
-        }
-        else { // Probably multiline string or blank
+            context = 'msgctxt';
+            noCommentLineCount++;
+        } else { // Probably multiline string or blank
             if (line.length > 0) {
+                noCommentLineCount++;
                 if (context === 'msgstr') {
                     item.msgstr[plural] += extract(line);
-                }
-                else if (context === 'msgid') {
+                } else if (context === 'msgid') {
                     item.msgid += extract(line);
-                }
-                else if (context === 'msgid_plural') {
+                } else if (context === 'msgid_plural') {
                     item.msgid_plural += extract(line);
+                } else if (context === 'msgctxt') {
+                    item.msgctxt += extract(line);
                 }
             }
         }
+
+        if (lineObsolete) {
+            // Count obsolete lines for this item
+            obsoleteCount++;
+        }
     }
     finish();
 
     return po;
 };
 
-PO.Item = function () {
+PO.parsePluralForms = function (pluralFormsString) {
+    var results = (pluralFormsString || '')
+        .split(';')
+        .reduce(function (acc, keyValueString) {
+            var trimmedString = keyValueString.trim();
+            var equalsIndex = trimmedString.indexOf('=');
+            var key = trimmedString.substring(0, equalsIndex).trim();
+            var value = trimmedString.substring(equalsIndex + 1).trim();
+            acc[key] = value;
+            return acc;
+        }, {});
+    return {
+        nplurals: results.nplurals,
+        plural: results.plural
+    };
+};
+
+PO.Item = function (options) {
+    var nplurals = options && options.nplurals;
+
     this.msgid = '';
     this.msgctxt = null;
     this.references = [];
@@ -175,76 +270,118 @@ PO.Item = function () {
     this.comments = []; // translator comments
     this.extractedComments = [];
     this.flags = {};
+    this.obsolete = false;
+    var npluralsNumber = Number(nplurals);
+    this.nplurals = (isNaN(npluralsNumber)) ? 2 : npluralsNumber;
 };
 
 PO.Item.prototype.toString = function () {
-    var lines = [],
-        that = this;
+    var lines = [];
+    var self = this;
 
     // reverse what extract(string) method during PO.parse does
     var _escape = function (string) {
-        string = string.replace(/\\/g, '\\\\');
-        return string.replace(/"/g, '\\"');
+        // don't unescape \n, since string can never contain it
+        // since split('\n') is called on it
+        string = string.replace(/[\x07\b\t\v\f\r"\\]/g, function (match) {
+            switch (match) {
+                case '\x07':
+                    return '\\a';
+                case '\b':
+                    return '\\b';
+                case '\t':
+                    return '\\t';
+                case '\v':
+                    return '\\v';
+                case '\f':
+                    return '\\f';
+                case '\r':
+                    return '\\r';
+                default:
+                    return '\\' + match;
+            }
+        });
+        return string;
     };
 
     var _process = function (keyword, text, i) {
-        var lines = [],
-            parts = text.split(/\n/),
-            index = typeof i !== 'undefined' ? '[' + i + ']' : '';
+        var lines = [];
+        var parts = text.split(/\n/);
+        var index = typeof i !== 'undefined' ? '[' + i + ']' : '';
         if (parts.length > 1) {
             lines.push(keyword + index + ' ""');
             parts.forEach(function (part) {
                 lines.push('"' + _escape(part) + '"');
             });
-        }
-        else {
+        } else {
             lines.push(keyword + index + ' "' + _escape(text) + '"');
         }
         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
 
-    if (this.comments.length > 0) {
-        this.comments.forEach(function (c) {
-            lines.push('# ' + c);
-        });
-    }
+    this.comments.forEach(function (c) {
+        lines.push('# ' + c);
+    });
 
-    if (this.extractedComments.length > 0) {
-        this.extractedComments.forEach(function (c) {
-            lines.push('#. ' + c);
-        });
-    }
+    this.extractedComments.forEach(function (c) {
+        lines.push('#. ' + c);
+    });
 
-    if (this.references.length > 0) {
-        this.references.forEach(function (ref) {
-            lines.push('#: ' + ref);
-        });
-    }
+    this.references.forEach(function (ref) {
+        lines.push('#: ' + ref);
+    });
 
-    var flags = Object.keys(this.flags);
+    var flags = Object.keys(this.flags).filter(function (flag) {
+        return !!this.flags[flag];
+    }, this);
     if (flags.length > 0) {
-        lines.push('#, ' + flags.join(","));
+        lines.push('#, ' + flags.join(','));
     }
+    var mkObsolete = this.obsolete ? '#~ ' : '';
 
     ['msgctxt', 'msgid', 'msgid_plural', 'msgstr'].forEach(function (keyword) {
-        var text = that[keyword];
+        var text = self[keyword];
         if (text != null) {
-            if (isArray(text) && text.length > 1) {
-                text.forEach(function (t, i) {
-                    lines = lines.concat(_process(keyword, t, i));
+            var hasTranslation = false;
+            if (Array.isArray(text)) {
+                hasTranslation = text.some(function (text) {
+                    return text;
                 });
             }
-            else {
-                text = isArray(text) ? text.join() : text;
-                lines = lines.concat(_process(keyword, text));
+
+            if (Array.isArray(text) && text.length > 1) {
+                text.forEach(function (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++) {
+                    lines = lines.concat(mkObsolete + _process(keyword, '', pluralIndex));
+                }
+            } else {
+                var index = (self.msgid_plural && Array.isArray(text)) ?
+                    0 :
+                    undefined;
+                text = Array.isArray(text) ? text.join() : text;
+                var processed = _processLineBreak(keyword, text, index);
+                lines = lines.concat(mkObsolete + processed.join('\n' + mkObsolete));
             }
         }
     });
 
-    return lines.join("\n");
+    return lines.join('\n');
 };
 
 module.exports = PO;

package.json

@@ -1,7 +1,7 @@
 {
   "name": "pofile",
   "description": "Parse and serialize Gettext PO files.",
-  "version": "0.2.6",
+  "version": "1.1.3",
   "author": {
     "name": "Ruben Vermeersch",
     "email": "ruben@savanne.be",
@@ -20,6 +20,7 @@
     "url": "http://github.com/rubenv/pofile.git"
   },
   "main": "./lib/po",
+  "types": "./pofile.d.ts",
   "keywords": [
     "i18n",
     "l10n",
@@ -35,17 +36,16 @@
     "test": "test"
   },
   "devDependencies": {
-    "grunt": "~0.4.2",
-    "grunt-contrib-watch": "~0.5.3",
-    "grunt-contrib-jshint": "~0.7.2",
-    "grunt-mocha-cli": "~1.4.0",
-    "grunt-contrib-uglify": "~0.2.7",
-    "browserify": "~3.11.1",
-    "grunt-browserify": "~1.3.0",
-    "grunt-contrib-clean": "~0.5.0",
-    "grunt-bump": "0.0.13"
-  },
-  "dependencies": {
-    "lodash.isarray": "~2.4.1"
+    "browserify": "~14.0.0",
+    "coffeescript": "^2.6.1",
+    "grunt": "~1.3.0",
+    "grunt-browserify": "^5.1.0",
+    "grunt-bump": "0.8.0",
+    "grunt-contrib-clean": "^2.0.1",
+    "grunt-contrib-jshint": "^3.2.0",
+    "grunt-contrib-uglify": "^2.3.0",
+    "grunt-contrib-watch": "^1.1.0",
+    "grunt-jscs": "^3.0.1",
+    "grunt-mocha-cli": "^6.0.0"
   }
 }

pofile.d.ts

@@ -0,0 +1,39 @@
+declare interface IHeaders {
+    'Project-Id-Version': string;
+    'Report-Msgid-Bugs-To': string;
+    'POT-Creation-Date': string;
+    'PO-Revision-Date': string;
+    'Last-Translator': string;
+    'Language': string;
+    'Language-Team': string;
+    'Content-Type': string;
+    'Content-Transfer-Encoding': string;
+    'Plural-Forms': string;
+    [name: string]: string;
+}
+
+declare class Item {
+    public msgid: string;
+    public msgctxt?: string;
+    public references: string[];
+    public msgid_plural?: string;
+    public msgstr: string[];
+    public comments: string[];
+    public extractedComments: string[];
+    public flags: Record<string, boolean | undefined>;
+    public obsolete: boolean;
+    private nplurals: number;
+}
+
+declare class PO {
+    public comments: string[];
+    public extractedComments: string[];
+    public items: Item[];
+    public headers: Partial<IHeaders>
+
+    public static parse(data: string): PO;
+    public static parsePluralForms(forms: string): PO;
+    public static Item: typeof Item;
+}
+
+export = PO

test/comments.js

@@ -1,25 +0,0 @@
-var assert = require('assert');
-var PO = require('..');
-
-describe('Comments', function () {
-    var po;
-
-    before(function (done) {
-        PO.load(__dirname + '/fixtures/big.po', function (err, result) {
-            assert.equal(err, null);
-            po = result;
-            done();
-        });
-    });
-
-    it('Parses the po file', function () {
-        assert.notEqual(po, null);
-    });
-
-    it('Parses the comments', function () {
-        assert.equal(po.comments.length, 3);
-        assert.equal(po.comments[0], 'French translation of Link (6.x-2.9)');
-        assert.equal(po.comments[1], 'Copyright (c) 2011 by the French translation team');
-        assert.equal(po.comments[2], '');
-    });
-});

test/fixtures/big.po

@@ -1,297 +0,0 @@
-# French translation of Link (6.x-2.9)
-# Copyright (c) 2011 by the French translation team
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Link (6.x-2.9)\n"
-"POT-Creation-Date: 2011-12-31 23:39+0000\n"
-"PO-Revision-Date: 2013-12-17 14:21+0100\n"
-"Language-Team: French\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"
-"Last-Translator: Ruben Vermeersch <ruben@rocketeer.be>\n"
-"Language: fr\n"
-"X-Generator: Poedit 1.6.2\n"
-
-msgid "Title"
-msgstr "Titre"
-
-msgid "CCK"
-msgstr "CCK"
-
-msgid "Content"
-msgstr "Contenu"
-
-msgid "Link"
-msgstr "Lien"
-
-msgid "Link Target"
-msgstr "Cible du Lien"
-
-msgid "URL"
-msgstr "URL"
-
-msgid "Placeholder tokens"
-msgstr "Jetons (tokens) de substitution"
-
-msgid ""
-"The following placeholder tokens can be used in both paths and titles. When "
-"used in a path or title, they will be replaced with the appropriate values."
-msgstr ""
-"Les ébauches de jetons suivantes peuvent être utilisées à la fois dans les "
-"chemins et dans les titres. Lorsqu'elles sont utilisées dans un chemin ou un "
-"titre, elles seront remplacées par les valeurs appropriées."
-
-msgid "Optional Title"
-msgstr "Titre Optionnel"
-
-msgid "Required Title"
-msgstr "Titre Obligatoire"
-
-msgid "No Title"
-msgstr "Aucun Titre"
-
-msgid "Link Title"
-msgstr "Titre du Lien"
-
-msgid "URL Display Cutoff"
-msgstr "Coupure de l'Affichage de l'URL"
-
-msgid ""
-"If the user does not include a title for this link, the URL will be used as "
-"the title. When should the link title be trimmed and finished with an "
-"elipsis (&hellip;)? Leave blank for no limit."
-msgstr ""
-"Si l'utilisateur n'inclue pas de titre pour ce lien, l'URL sera utilisée en "
-"tant que titre. A quel endroit le lien devra-t-il être coupé et terminé par "
-"une ellipse (&hellip;) ? Laissez vide pour aucune limite."
-
-msgid "Default (no target attribute)"
-msgstr "Par Défaut (aucun attribut de cible)"
-
-msgid "Open link in window root"
-msgstr "Ouvrir le lien dans la fenêtre courante"
-
-msgid "Open link in new window"
-msgstr "Ouvrir le lien dans une nouvelle fenêtre"
-
-msgid "Allow the user to choose"
-msgstr "Autoriser l'utilisateur à choisir"
-
-msgid "Additional CSS Class"
-msgstr "Classe CSS additionnelle"
-
-msgid "Not a valid URL."
-msgstr "Cette URL n'est pas valide."
-
-msgid "Titles are required for all links."
-msgstr "Les titres sont obligatoires pour tous les liens."
-
-msgid "Open URL in a New Window"
-msgstr "Ouvril l'URL dans une Nouvelle Fenêtre"
-
-msgid "Defines simple link field types."
-msgstr "Définit les types de champs \"lien simple\"."
-
-msgid "Link URL"
-msgstr "Url du Lien"
-
-msgid "Wildcard"
-msgstr "Joker"
-
-msgid "="
-msgstr "="
-
-msgid "Protocol"
-msgstr "Protocole"
-
-msgid "Optional URL"
-msgstr "URL optionnelle"
-
-msgid "Static Title: "
-msgstr "Titre Statique : "
-
-msgid ""
-"If the link title is optional or required, a field will be displayed to the "
-"end user. If the link title is static, the link will always use the same "
-"title. If <a href=\"http://drupal.org/project/token\">token module</a> is "
-"installed, the static title value may use any other node field as its value. "
-"Static and token-based titles may include most inline XHTML tags such as "
-"<em>strong</em>, <em>em</em>, <em>img</em>, <em>span</em>, etc."
-msgstr ""
-"Si le titre du lien est facultatif ou obligatoire, un champ sera affiché à "
-"l'utilisateur final. Si le titre du lien est statique, le lien utilisera "
-"toujours le même titre. Si le <a href=\"http://drupal.org/project/token"
-"\">module token</a> est installé, le titre statique peut utiliser n'importe "
-"quel autre champ du nœud pour sa valeur. Les titres statiques et basés sur "
-"des jetons (tokens) peuvent contenir la plupart des balises XHTML en ligne, "
-"telles que <em>strong</em>, <em>em</em>, <em>img</em>, <em>span</em>, etc."
-
-msgid "Allow user-entered tokens"
-msgstr "Autoriser les jetons (tokens) saisis par l'utilisateur"
-
-msgid ""
-"Checking will allow users to enter tokens in URLs and Titles on the node "
-"edit form. This does not affect the field settings on this page."
-msgstr ""
-"Le fait de cocher cette case permettra aux utilisateurs de saisir des jetons "
-"dans les URL et les Titres dans le formulaire d'édition du nœud. Ceci "
-"n'affecte pas les configurations de champ sur cette page."
-
-msgid "Rel Attribute"
-msgstr "Attribut Rel"
-
-msgid ""
-"When output, this link will have this rel attribute. The most common usage "
-"is <a href=\"http://en.wikipedia.org/wiki/Nofollow\">rel=&quot;nofollow&quot;"
-"</a> which prevents some search engines from spidering entered links."
-msgstr ""
-"Quand il sera affiché, ce lien aura cet attribut rel. L'usage le plus commun "
-"est <a href=\"http://fr.wikipedia.org/wiki/Nofollow\">rel=&quot;"
-"nofollow&quot;</a> qui empêche certains moteurs de recherche d'aspirer les "
-"liens suivis."
-
-msgid "A default title must be provided if the title is a static value"
-msgstr ""
-"Un titre pas défaut doit être fourni si le titre est une valeur statique"
-
-msgid "At least one title or URL must be entered."
-msgstr "Vous devez saisir au moins un titre ou une URL."
-
-msgid "You cannot enter a title without a link url."
-msgstr "Vous ne pouvez pas saisir un titre dans une url de lien."
-
-msgid "Title, as link (default)"
-msgstr "Titre, en tant que lien (par défaut)"
-
-msgid "URL, as link"
-msgstr "URL, en tant que lien"
-
-msgid "Short, as link with title \"Link\""
-msgstr "Court, comme lien avec le titre \"Lien\""
-
-msgid "Label, as link with label as title"
-msgstr "Étiquette, comme lien avec l'étiquette comme titre"
-
-msgid "Separate title and URL"
-msgstr "Titre et URL séparés"
-
-msgid "Validator"
-msgstr "Validateur"
-
-msgid "Is one of"
-msgstr "Fait partie de"
-
-msgid "@label title"
-msgstr "Titre de @label"
-
-msgid "@label protocol"
-msgstr "Protocole de @label"
-
-msgid "@label target"
-msgstr "Cible de @label"
-
-msgid ""
-"The title to use when this argument is present; it will override the title "
-"of the view and titles from previous arguments. You can use percent "
-"substitution here to replace with argument titles. Use \"%1\" for the first "
-"argument, \"%2\" for the second, etc."
-msgstr ""
-"Le titre à utiliser lorsque cet argument est présent ; il écrasera le titre "
-"de la vue et les titres provenant des arguments précédents. Vous pouvez "
-"utiliser ici les substitutions de pourcentage pour remplacer avec les titres "
-"des arguments. Utilisez \"%1\" pour le premier argument, \"%2\" pour le "
-"second, etc."
-
-msgid "Action to take if argument is not present"
-msgstr "Action à mener si l'argument est absent"
-
-msgid ""
-"If this value is received as an argument, the argument will be ignored; i.e, "
-"\"all values\""
-msgstr ""
-"Si cette valeur est reçue comme argument, l'argument sera ignoré ; "
-"correspond à \"toutes les valeurs\""
-
-msgid "Wildcard title"
-msgstr "Titre du joker"
-
-msgid "The title to use for the wildcard in substitutions elsewhere."
-msgstr ""
-"Le titre à utiliser pour le joker dans les substitutions partout ailleurs."
-
-msgid "<Basic validation>"
-msgstr "<Validation basique>"
-
-msgid "Action to take if argument does not validate"
-msgstr "Actions à mener si l'argument ne passe pas la validation"
-
-msgid ""
-"The protocols displayed here are those globally available. You may add more "
-"protocols by modifying the <em>filter_allowed_protocols</em> variable in "
-"your installation."
-msgstr ""
-"Les protocoles affichés ici sont ceux disponibles de manière globale. Vous "
-"pouvez ajouter plus de protocoles en modifiant la variable "
-"<em>filter_allowed_protocols</em> de votre installation."
-
-msgid "Link title"
-msgstr "Titre du lien"
-
-msgid "exposed"
-msgstr "exposé"
-
-msgid "Formatted html link"
-msgstr "Lien html formaté"
-
-msgid "Store a title, href, and attributes in the database to assemble a link."
-msgstr ""
-"Stocker un titre, href et des attributs dans la base de données pour les "
-"assembler dans un lien."
-
-msgid "URL, as plain text"
-msgstr "URL, texte simple"
-
-msgid "@label URL"
-msgstr "URL de @label"
-
-msgid "Validate URL"
-msgstr "Valider l'URL"
-
-msgid ""
-"If checked, the URL field will be verified as a valid URL during validation."
-msgstr ""
-"Si coché, la validité du format de l'URL sera verifiée durant la validation."
-
-msgid ""
-"If checked, the URL field is optional and submitting a title alone will be "
-"acceptable. If the URL is omitted, the title will be displayed as plain text."
-msgstr ""
-"Si coché, le champ URL est optionnel and soumettre un titre seul sera "
-"accepté. SI l'URL est omise, le titre sera affiché en texte brut."
-
-msgid ""
-"When output, this link will have this class attribute. Multiple classes "
-"should be separated by spaces."
-msgstr ""
-"Lors de l'affichage, le lien aura cet attribut de classe (class). Les "
-"classes doivent être séparées par des espaces."
-
-msgid "Link 'title' Attribute"
-msgstr "Attribut 'title' du lien"
-
-# Comment
-msgid "Title, as plain text"
-msgstr "Attribut title, en tant que texte brut"
-
-# Empty should be adjective
-msgctxt "folder display"
-msgid "Empty folder"
-msgstr "This folder is empty."
-
-# Empty should be verb
-msgctxt "folder action"
-msgid "Empty folder"
-msgstr "Make this folder empty."

test/fixtures/c-strings.po

@@ -1,19 +0,0 @@
-# French translation of Link (6.x-2.9)
-# Copyright (c) 2011 by the French translation team
-msgid ""
-msgstr ""
-"Project-Id-Version: Link (6.x-2.9)\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-12-31 23:39+0000\n"
-"PO-Revision-Date: 2013-12-17 14:59+0100\n"
-"Last-Translator: Ruben Vermeersch <ruben@rocketeer.be>\n"
-"Language: fr\n"
-"Language-Team: French\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"MIME-Version: 1.0\n"
-"X-Generator: Poedit 1.6.2\n"
-
-msgid "The name field must not contain characters like \" or \\"
-msgstr ""

test/fixtures/comment.po

@@ -1,21 +0,0 @@
-# French translation of Link (6.x-2.9)
-# Copyright (c) 2011 by the French translation team
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Link (6.x-2.9)\n"
-"POT-Creation-Date: 2011-12-31 23:39+0000\n"
-"PO-Revision-Date: 2013-12-17 14:21+0100\n"
-"Language-Team: French\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"
-"Last-Translator: Ruben Vermeersch <ruben@rocketeer.be>\n"
-"Language: fr\n"
-"X-Generator: Poedit 1.6.2\n"
-
-# Translator comment
-#. Extracted comment
-msgid "Title, as plain text"
-msgstr "Attribut title, en tant que texte brut"

test/fixtures/fuzzy.po

@@ -1,20 +0,0 @@
-# French translation of Link (6.x-2.9)
-# Copyright (c) 2011 by the French translation team
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Link (6.x-2.9)\n"
-"POT-Creation-Date: 2011-12-31 23:39+0000\n"
-"PO-Revision-Date: 2013-12-17 14:59+0100\n"
-"Language-Team: French\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"
-"Last-Translator: Ruben Vermeersch <ruben@rocketeer.be>\n"
-"Language: fr\n"
-"X-Generator: Poedit 1.6.2\n"
-
-#, fuzzy
-msgid "Sources"
-msgstr "Source"

test/fixtures/multi-line.po

@@ -1,24 +0,0 @@
-# French translation of Link (6.x-2.9)
-# Copyright (c) 2011 by the French translation team
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Link (6.x-2.9)\n"
-"POT-Creation-Date: 2011-12-31 23:39+0000\n"
-"PO-Revision-Date: 2013-12-17 14:21+0100\n"
-"Language-Team: French\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"
-"Last-Translator: Ruben Vermeersch <ruben@rocketeer.be>\n"
-"Language: fr\n"
-"X-Generator: Poedit 1.6.2\n"
-
-msgid ""
-"The following placeholder tokens can be used in both paths and titles. When "
-"used in a path or title, they will be replaced with the appropriate values."
-msgstr ""
-"Les ébauches de jetons suivantes peuvent être utilisées à la fois dans les "
-"chemins et dans les titres. Lorsqu'elles sont utilisées dans un chemin ou un "
-"titre, elles seront remplacées par les valeurs appropriées."

test/fixtures/reference.po

@@ -1,26 +0,0 @@
-# French translation of Link (6.x-2.9)
-# Copyright (c) 2011 by the French translation team
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: Link (6.x-2.9)\n"
-"POT-Creation-Date: 2011-12-31 23:39+0000\n"
-"PO-Revision-Date: 2013-12-17 14:21+0100\n"
-"Language-Team: French\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"
-"Last-Translator: Ruben Vermeersch <ruben@rocketeer.be>\n"
-"Language: fr\n"
-"X-Generator: Poedit 1.6.2\n"
-
-# Comment
-#: .tmp/crm/controllers/map.js
-msgid "Title, as plain text"
-msgstr "Attribut title, en tant que texte brut"
-
-#: a
-#: b
-msgid "X"
-msgstr "Y"

test/headers.js

@@ -1,30 +0,0 @@
-var assert = require('assert');
-var PO = require('..');
-
-describe('Headers', function () {
-    var po;
-
-    before(function (done) {
-        PO.load(__dirname + '/fixtures/big.po', function (err, result) {
-            assert.equal(err, null);
-            po = result;
-            done();
-        });
-    });
-
-    it('Parses the po file', function () {
-        assert.notEqual(po, null);
-    });
-
-    it('Parses headers correctly', function () {
-        assert.equal(po.headers['Project-Id-Version'], 'Link (6.x-2.9)');
-        assert.equal(po.headers['MIME-Version'], '1.0');
-        assert.equal(po.headers['Plural-Forms'], 'nplurals=2; plural=(n > 1);');
-    });
-
-    it('Parses all headers', function () {
-        // There are 11 headers in the .po file, but some default headers
-        // are defined (nr. 12 in this case is Report-Msgid-Bugs-To).
-        assert.equal(Object.keys(po.headers).length, 12);
-    });
-});

test/parse.js

@@ -1,104 +0,0 @@
-var assert = require('assert');
-var fs = require('fs');
-var PO = require('..');
-
-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);
-        
-        var item = po.items[0];
-        assert.equal(item.msgid, "Title");
-        assert.equal(item.msgstr, "Titre");
-    });
-
-    it('Handles multi-line strings', function () {
-        var po = PO.parse(fs.readFileSync(__dirname + '/fixtures/multi-line.po', 'utf8'));
-        assert.notEqual(po, null);
-        assert.equal(po.items.length, 1);
-        
-        var item = po.items[0];
-        assert.equal(item.msgid, "The following placeholder tokens can be used in both paths and titles. When used in a path or title, they will be replaced with the appropriate values.");
-        assert.equal(item.msgstr, "Les ébauches de jetons suivantes peuvent être utilisées à la fois dans les chemins et dans les titres. Lorsqu'elles sont utilisées dans un chemin ou un titre, elles seront remplacées par les valeurs appropriées.");
-    });
-
-    it('Handles translator comments', function () {
-        var po = PO.parse(fs.readFileSync(__dirname + '/fixtures/comment.po', 'utf8'));
-        assert.notEqual(po, null);
-        assert.equal(po.items.length, 1);
-        
-        var item = po.items[0];
-        assert.equal(item.msgid, "Title, as plain text");
-        assert.equal(item.msgstr, "Attribut title, en tant que texte brut");
-        assert.deepEqual(item.comments, ["Translator comment"]);
-    });
-
-    it('Handles extracted comments', function () {
-        var po = PO.parse(fs.readFileSync(__dirname + '/fixtures/comment.po', 'utf8'));
-        assert.notEqual(po, null);
-        assert.equal(po.items.length, 1);
-
-        var item = po.items[0];
-        assert.equal(item.msgid, "Title, as plain text");
-        assert.equal(item.msgstr, "Attribut title, en tant que texte brut");
-        assert.deepEqual(item.extractedComments, ["Extracted comment"]);
-    });
-
-    it('Handles string references', function () {
-        var po = PO.parse(fs.readFileSync(__dirname + '/fixtures/reference.po', 'utf8'));
-        assert.notEqual(po, null);
-        assert.equal(po.items.length, 2);
-        
-        var item = po.items[0];
-        assert.equal(item.msgid, "Title, as plain text");
-        assert.equal(item.msgstr, "Attribut title, en tant que texte brut");
-        assert.deepEqual(item.comments, ["Comment"]);
-        assert.deepEqual(item.references, [".tmp/crm/controllers/map.js"]);
-        
-        item = po.items[1];
-        assert.equal(item.msgid, "X");
-        assert.equal(item.msgstr, "Y");
-        assert.deepEqual(item.references, ["a", "b"]);
-    });
-
-    it('Parses flags', function () {
-        var po = PO.parse(fs.readFileSync(__dirname + '/fixtures/fuzzy.po', 'utf8'));
-        assert.notEqual(po, null);
-        assert.equal(po.items.length, 1);
-
-        var item = po.items[0];
-        assert.equal(item.msgid, "Sources");
-        assert.equal(item.msgstr, "Source");
-        assert.notEqual(item.flags, null);
-        assert.equal(item.flags.fuzzy, true);
-    });
-
-    it('Parses item context', function () {
-        var po = PO.parse(fs.readFileSync(__dirname + '/fixtures/big.po', 'utf8'));
-
-        var ambiguousItems = po.items.filter(function (item) {
-            return item.msgid === 'Empty folder';
-        });
-
-        assert.equal(ambiguousItems[0].msgctxt, 'folder display');
-        assert.equal(ambiguousItems[1].msgctxt, 'folder action');
-    });
-
-    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'));
-
-            assert.notEqual(po, null);
-        });
-
-        it('should extract strings containing " and \\ characters', function () {
-            var po = PO.parse(fs.readFileSync(__dirname + '/fixtures/c-strings.po', 'utf8'));
-
-            var items = po.items.filter(function (item) {
-                return (/^The name field must not contain/).test(item.msgid);
-            });
-            assert.equal(items[0].msgid, 'The name field must not contain characters like " or \\');
-        });
-    });
-});

test/write.js

@@ -1,103 +0,0 @@
-var assert = require('assert');
-var fs = require('fs');
-var PO = require('..');
-
-function assertHasLine(str, line) {
-    var lines = str.split("\n");
-    var found = false;
-
-    for (var i = 0; i < lines.length; i++) {
-        if (lines[i].trim() === line) {
-            found = true;
-            break;
-        }
-    }
-
-    assert(found, "Could not find line: " + line);
-}
-
-describe('Write', function () {
-    it('write flags', function () {
-        var input = fs.readFileSync(__dirname + '/fixtures/fuzzy.po', 'utf8');
-        var po = PO.parse(input);
-        var str = po.toString();
-        assertHasLine(str, "#, fuzzy");
-    });
-
-    it('write msgid', function () {
-        var input = fs.readFileSync(__dirname + '/fixtures/fuzzy.po', 'utf8');
-        var po = PO.parse(input);
-        var str = po.toString();
-        assertHasLine(str, "msgid \"Sources\"");
-    });
-
-    it('write msgstr', function () {
-        var input = fs.readFileSync(__dirname + '/fixtures/fuzzy.po', 'utf8');
-        var po = PO.parse(input);
-        var str = po.toString();
-        assertHasLine(str, "msgstr \"Source\"");
-    });
-
-    it('write translator comment', function () {
-        var input = fs.readFileSync(__dirname + '/fixtures/comment.po', 'utf8');
-        var po = PO.parse(input);
-        var str = po.toString();
-        assertHasLine(str, "# Translator comment");
-    });
-
-    it('write extracted comment', function () {
-        var input = fs.readFileSync(__dirname + '/fixtures/comment.po', 'utf8');
-        var po = PO.parse(input);
-        var str = po.toString();
-        assertHasLine(str, '#. Extracted comment');
-    });
-
-    describe('C-Strings', function () {
-        it('should escape "', function () {
-            var item = new PO.Item();
-
-            item.msgid = '" should be written escaped';
-            assertHasLine(item.toString(), 'msgid "\\" should be written escaped"');
-        });
-
-        it('shoudl escape \\', function () {
-            var item = new PO.Item();
-
-            item.msgid = '\\ should be written escaped';
-            assertHasLine(item.toString(), 'msgid "\\\\ should be written escaped"');
-        });
-
-        it('should write identical file after parsing a file', function () {
-            var input = fs.readFileSync(__dirname + '/fixtures/c-strings.po', 'utf8');
-            var po = PO.parse(input);
-            var str = po.toString();
-
-            assert.equal(str, input);
-        });
-    });
-
-    describe('msgctxt', function () {
-        it('should write context field to file', function () {
-            var input = fs.readFileSync(__dirname + '/fixtures/big.po', 'utf8');
-            var po = PO.parse(input);
-            var str = po.toString();
-            assertHasLine(str, 'msgctxt "folder action"');
-        });
-
-        it('should ignore omitted context field', function () {
-            var po = new PO();
-            var item = new PO.Item();
-            po.items.push(item);
-            assert.ok(po.toString().indexOf('msgctxt') < 0);
-        });
-
-        it('should write empty context field', function () {
-            var po = new PO();
-            var item = new PO.Item();
-
-            item.msgctxt = '';
-            po.items.push(item);
-            assert.ok(po.toString().indexOf('msgctxt') >= 0);
-        });
-    });
-});