Merge pull request #119 from austhomp/translation-markers

Adding translated markers and custom missing prefix.

Author: rubenv

dist/angular-gettext.js

@@ -15,7 +15,15 @@ angular.module('gettext').factory('gettextCatalog', ["gettextPlurals", "$http",
 
     var prefixDebug = function (string) {
         if (catalog.debug && catalog.currentLanguage !== catalog.baseLanguage) {
-            return '[MISSING]: ' + string;
+            return catalog.debugPrefix + string;
+        } else {
+            return string;
+        }
+    };
+
+    var addTranslatedMarkers = function (string) {
+        if (catalog.showTranslatedMarkers) {
+            return catalog.translatedMarkerPrefix + string + catalog.translatedMarkerSuffix;
         } else {
             return string;
         }
@@ -27,6 +35,10 @@ angular.module('gettext').factory('gettextCatalog', ["gettextPlurals", "$http",
 
     catalog = {
         debug: false,
+        debugPrefix: '[MISSING]: ',
+        showTranslatedMarkers: false,
+        translatedMarkerPrefix: '[',
+        translatedMarkerSuffix: ']',
         strings: {},
         baseLanguage: 'en',
         currentLanguage: 'en',
@@ -62,13 +74,15 @@ angular.module('gettext').factory('gettextCatalog', ["gettextPlurals", "$http",
 
         getString: function (string, context) {
             string = this.getStringForm(string, 0) || prefixDebug(string);
-            return context ? $interpolate(string)(context) : string;
+            string = context ? $interpolate(string)(context) : string;
+            return addTranslatedMarkers(string);
         },
 
         getPlural: function (n, string, stringPlural, context) {
             var form = gettextPlurals(this.currentLanguage, n);
             string = this.getStringForm(string, form) || prefixDebug(n === 1 ? string : stringPlural);
-            return context ? $interpolate(string)(context) : string;
+            string = context ? $interpolate(string)(context) : string;
+            return addTranslatedMarkers(string);
         },
 
         loadRemote: function (url) {

dist/angular-gettext.min.js

@@ -3,7 +3,15 @@ angular.module('gettext').factory('gettextCatalog', function (gettextPlurals, $h
 
     var prefixDebug = function (string) {
         if (catalog.debug && catalog.currentLanguage !== catalog.baseLanguage) {
-            return '[MISSING]: ' + string;
+            return catalog.debugPrefix + string;
+        } else {
+            return string;
+        }
+    };
+
+    var addTranslatedMarkers = function (string) {
+        if (catalog.showTranslatedMarkers) {
+            return catalog.translatedMarkerPrefix + string + catalog.translatedMarkerSuffix;
         } else {
             return string;
         }
@@ -15,6 +23,10 @@ angular.module('gettext').factory('gettextCatalog', function (gettextPlurals, $h
 
     catalog = {
         debug: false,
+        debugPrefix: '[MISSING]: ',
+        showTranslatedMarkers: false,
+        translatedMarkerPrefix: '[',
+        translatedMarkerSuffix: ']',
         strings: {},
         baseLanguage: 'en',
         currentLanguage: 'en',
@@ -50,13 +62,15 @@ angular.module('gettext').factory('gettextCatalog', function (gettextPlurals, $h
 
         getString: function (string, context) {
             string = this.getStringForm(string, 0) || prefixDebug(string);
-            return context ? $interpolate(string)(context) : string;
+            string = context ? $interpolate(string)(context) : string;
+            return addTranslatedMarkers(string);
         },
 
         getPlural: function (n, string, stringPlural, context) {
             var form = gettextPlurals(this.currentLanguage, n);
             string = this.getStringForm(string, form) || prefixDebug(n === 1 ? string : stringPlural);
-            return context ? $interpolate(string)(context) : string;
+            string = context ? $interpolate(string)(context) : string;
+            return addTranslatedMarkers(string);
         },
 
         loadRemote: function (url) {

src/catalog.js

@@ -39,6 +39,13 @@ describe("Catalog", function () {
         assert.equal(catalog.getString("Hello"), "[MISSING]: Hello");
     });
 
+    it("Should add custom prefix for untranslated strings when in debug", function () {
+        catalog.debug = true;
+        catalog.debugPrefix = "#X# ";
+        catalog.currentLanguage = "fr";
+        assert.equal(catalog.getString("Hello"), "#X# Hello");
+    });
+
     it("Should not add prefix for untranslated strings in English", function () {
         catalog.debug = true;
         catalog.currentLanguage = "en";
@@ -104,4 +111,23 @@ describe("Catalog", function () {
         assert.equal(catalog.getPlural(2, "There is {{count}} bird", "There are {{count}} birds", { count: 2 }), "There are 2 birds");
         assert.equal(catalog.getPlural(1, "There is {{count}} bird", "There are {{count}} birds", { count: 1 }), "There is 1 bird");
     });
+
+    it("Should add translation markers when enabled", function () {
+        catalog.showTranslatedMarkers = true;
+        assert.equal(catalog.getString("Bye"), "[Bye]");
+    });
+
+    it("Should add custom translation markers when enabled", function () {
+        catalog.showTranslatedMarkers = true;
+        catalog.translatedMarkerPrefix = "(TRANS: ";
+        catalog.translatedMarkerSuffix = ")";
+        assert.equal(catalog.getString("Bye"), "(TRANS: Bye)");
+    });
+
+    it("Should add prefix for untranslated strings and add translation markers when enabled", function () {
+        catalog.debug = true;
+        catalog.showTranslatedMarkers = true;
+        catalog.currentLanguage = "fr";
+        assert.equal(catalog.getString("Bye"), "[[MISSING]: Bye]");
+    });
 });