Move to gettext-parser package

Author: Kim Biesbjerg

package.json

@@ -7,7 +7,8 @@
   "scripts": {
     "build": "npm run clean && tsc",
     "watch": "npm run clean && tsc --watch",
-    "clean": "rm -rf ./dist"
+    "clean": "rm -rf ./dist",
+    "lint": "tslint --force '*.ts'"
   },
   "files": [
     "dist/"
@@ -33,7 +34,7 @@
     "ng2-translate": "^4.0.0"
   },
   "dependencies": {
-    "pofile": "^1.0.2"
+    "gettext-parser": "^1.2.1"
   },
   "devDependencies": {
     "@angular/core": "2.2.1",
@@ -43,6 +44,8 @@
     "rxjs": "5.0.0-beta.12",
     "zone.js": "0.6.21",
     "typescript": "2.0.10",
-    "ng2-translate": "4.0.1"
+    "ng2-translate": "4.0.1",
+    "tslint": "^4.0.2",
+    "tslint-eslint-rules": "^3.1.0"
   }
 }

src/declarations.d.ts

@@ -1 +1 @@
-declare module 'pofile';
+declare module 'gettext-parser';

src/index.ts

@@ -2,10 +2,15 @@ import { Http, Response } from '@angular/http';
 
 import { Observable } from 'rxjs/Observable';
 import { TranslateLoader } from 'ng2-translate';
-import * as pofile from 'pofile';
+import * as gettext from 'gettext-parser';
 
 export class TranslatePoLoader implements TranslateLoader {
 
+	/**
+	 * Translation domain
+	 */
+	public domain = '';
+
 	constructor(
 		protected _http: Http,
 		protected _prefix: string = 'i18n',
@@ -22,25 +27,29 @@ export class TranslatePoLoader implements TranslateLoader {
 		return this._http
 			.get(`${this._prefix}/${lang}${this._suffix}`)
 			.map((response: Response) => response.text())
-			.map((contents: string) => this._parse(contents));
+			.map((contents: string) => this.parse(contents));
 	}
 
 	/**
 	 * Parse po file
 	 * @param contents
 	 * @returns {any}
 	 */
-	protected _parse(contents: string): any {
-		let translations = {};
-
-		const data = pofile.parse(contents);
-		data.items.forEach(item => {
-			const id: string = item.msgid;
-			const translation: string = item.msgstr.pop();
-			if (id && translation)  {
-				translations[id] = translation;
-			}
-		});
+	public parse(contents: string): any {
+		let translations: { [key: string]: string } = {};
+
+		const po = gettext.po.parse(contents, 'utf-8');
+		if (!po.translations.hasOwnProperty(this.domain)) {
+			return translations;
+		}
+
+		Object.keys(po.translations[this.domain])
+			.forEach(key => {
+				const translation: string = po.translations[this.domain][key].msgstr.pop();
+				if (key.length > 0 && translation.length > 0) {
+					translations[key] = translation;
+				}
+			});
 
 		return translations;
 	}

tsconfig.json

@@ -1,18 +1,19 @@
 {
     "compilerOptions": {
-        "emitDecoratorMetadata": true,
-        "experimentalDecorators": true,
-        "declaration": true,
-        "lib": [
-            "dom",
-            "es2015"
-        ],
+        "allowSyntheticDefaultImports": true,
+        "noUnusedLocals": true,
+        "noImplicitAny": true,
+        "removeComments": true,
         "module": "commonjs",
         "moduleResolution": "node",
-        "removeComments": true,
         "sourceMap": true,
+        "outDir": "dist/",
+        "declaration": true,
         "target": "es5",
-        "outDir": "dist/"
+        "lib": [
+            "dom",
+            "es2015"
+        ]
     },
     "include": [
         "src/**/*.ts"

tslint.json

@@ -0,0 +1,53 @@
+{
+	"rulesDirectory": [
+		"node_modules/tslint-eslint-rules/dist/rules"
+	],
+	"rules": {
+		"indent": [true, "tabs"],
+		"semicolon": [true, "always", "ignore-interfaces"],
+		"quotemark": [true, "single", "avoid-escape"],
+		"only-arrow-functions": true,
+		"no-duplicate-variable": true,
+		"member-access": true,
+		"member-ordering": [
+			true,
+			{
+				"order": [
+					"public-static-field",
+					"public-static-method",
+					"protected-static-field",
+					"protected-static-method",
+					"private-static-field",
+					"private-static-method",
+					"public-instance-field",
+					"protected-instance-field",
+					"private-instance-field",
+					"constructor",
+					"public-instance-method",
+					"protected-instance-method",
+					"private-instance-method"
+				]
+			}
+		],
+		"curly": true,
+		"eofline": true,
+		"no-trailing-whitespace": true,
+		"trailing-comma": [
+			true,
+			{
+				"multiline": "never",
+				"singleline": "never"
+			}
+		],
+		"whitespace": [
+			true,
+			"check-branch",
+			"check-decl",
+			"check-operator",
+			"check-module",
+			"check-separator",
+			"check-type",
+			"check-typecast"
+		]
+	}
+}