Add translatePlural filter

.gitignore

@@ -4,4 +4,5 @@
 /libpeerconnection.log
 /unit-results.xml
 /e2e-results.xml
-/.idea
+/.idea
+.project

.jshintrc

@@ -24,9 +24,13 @@
         "beforeEach",
         "browser",
         "describe",
+        "ddescribe",
         "element",
         "expect",
         "inject",
-        "it"
+        "it",
+        "iit",
+        "xdescribe",
+        "xit"
     ]
 }

dist/angular-gettext.js

@@ -81,6 +81,10 @@ angular.module('gettext').factory('gettextCatalog', ["gettextPlurals", "$http",
         getPlural: function (n, string, stringPlural, context) {
             var form = gettextPlurals(this.currentLanguage, n);
             string = this.getStringForm(string, form) || prefixDebug(n === 1 ? string : stringPlural);
+
+            // Replace {} pattern with number
+            string = string.replace(/\{\}/g, n);
+
             string = context ? $interpolate(string)(context) : string;
             return addTranslatedMarkers(string);
         },
@@ -178,6 +182,14 @@ angular.module('gettext').filter('translate', ["gettextCatalog", function (gette
     return filter;
 }]);
 
+angular.module('gettext').filter('translatePlural', ['gettextCatalog', function (gettextCatalog) {
+    function filter(string, n, stringPlural) {
+        return gettextCatalog.getPlural(n, string, stringPlural);
+    }
+    filter.$stateful = true;
+    return filter;
+}]);
+
 // Do not edit this file, it is autogenerated using genplurals.py!
 angular.module("gettext").factory("gettextPlurals", function () {
     return function (langCode, n) {

src/catalog.js

@@ -69,6 +69,10 @@ angular.module('gettext').factory('gettextCatalog', function (gettextPlurals, $h
         getPlural: function (n, string, stringPlural, context) {
             var form = gettextPlurals(this.currentLanguage, n);
             string = this.getStringForm(string, form) || prefixDebug(n === 1 ? string : stringPlural);
+
+            // Replace {} pattern with number
+            string = string.replace(/\{\}/g, n);
+
             string = context ? $interpolate(string)(context) : string;
             return addTranslatedMarkers(string);
         },

src/filter.js

@@ -5,3 +5,11 @@ angular.module('gettext').filter('translate', function (gettextCatalog) {
     filter.$stateful = true;
     return filter;
 });
+
+angular.module('gettext').filter('translatePlural', ['gettextCatalog', function (gettextCatalog) {
+    function filter(string, n, stringPlural) {
+        return gettextCatalog.getPlural(n, string, stringPlural);
+    }
+    filter.$stateful = true;
+    return filter;
+}]);

test/unit/catalog.js

@@ -112,6 +112,16 @@ describe("Catalog", function () {
         assert.equal(catalog.getPlural(1, "There is {{count}} bird", "There are {{count}} birds", { count: 1 }), "There is 1 bird");
     });
 
+    it("Can return an interpolated plural string for special {} pattern", function () {
+        assert.deepEqual(catalog.strings, {});
+        catalog.currentLanguage = "gb";
+        catalog.setStrings("gb", {
+            "There is {} bird": ["There is {} bird", "There are {} birds"]
+        });
+        assert.equal(catalog.getPlural(2, "There is {} bird", "There are {} birds"), "There are 2 birds");
+        assert.equal(catalog.getPlural(1, "There is {} bird", "There are {} birds"), "There is 1 bird");
+    });
+
     it("Should add translation markers when enabled", function () {
         catalog.showTranslatedMarkers = true;
         assert.equal(catalog.getString("Bye"), "[Bye]");

test/unit/filter.js

@@ -36,3 +36,56 @@ describe("Filter", function () {
         assert.equal(el.attr("placeholder"), "Hallo");
     });
 });
+
+describe("Filter: translatePlural", function () {
+    var catalog = null;
+    var $rootScope = null;
+    var $compile = null;
+
+    beforeEach(module("gettext"));
+
+    beforeEach(inject(function ($injector, gettextCatalog) {
+        $rootScope = $injector.get("$rootScope");
+        $compile = $injector.get("$compile");
+        catalog = gettextCatalog;
+        catalog.setStrings("nl", {
+            Hello: "Hallo",
+            "Hello {{name}}!": "Hallo {{name}}!",
+            "One boat": ["Een boot", "{} boten"]
+        });
+
+        $rootScope.n = 1;
+    }));
+
+    it("Should have a translatePlural filter", function () {
+        var el = $compile("<h1>{{\"One boat\"|translatePlural:n:\"{} boats\"}}</h1>")($rootScope);
+        $rootScope.$digest();
+        assert.equal(el.text(), "One boat");
+
+        $rootScope.n = 2;
+        $rootScope.$digest();
+        assert.equal(el.text(), "2 boats");
+    });
+
+    it("Should translate known strings", function () {
+        catalog.currentLanguage = "nl";
+        var el = $compile("<span>{{\"One boat\"|translatePlural:n:\"{} boten\"}}</span>")($rootScope);
+        $rootScope.$digest();
+        assert.equal(el.text(), "Een boot");
+
+        $rootScope.n = 2;
+        $rootScope.$digest();
+        assert.equal(el.text(), "2 boten");
+    });
+
+    it("Can use filter in attribute values", function () {
+        catalog.currentLanguage = "nl";
+        var el = $compile("<input type=\"text\" placeholder=\"{{'One boat'|translatePlural:n:'{} boten'}}\" />")($rootScope);
+        $rootScope.$digest();
+        assert.equal(el.attr("placeholder"), "Een boot");
+
+        $rootScope.n = 2;
+        $rootScope.$digest();
+        assert.equal(el.attr("placeholder"), "2 boten");
+    });
+});