diff --git a/dist/angular-gettext.js b/dist/angular-gettext.js index b192bc8..327673c 100644 --- a/dist/angular-gettext.js +++ b/dist/angular-gettext.js @@ -206,9 +206,30 @@ angular.module('gettext').directive('translate', ["gettextCatalog", "$parse", "$ }; }]); -angular.module('gettext').filter('translate', ["gettextCatalog", function (gettextCatalog) { - function filter(input, context) { - return gettextCatalog.getString(input, null, context); +angular.module('gettext').filter('translate', ["$parse", "$interpolate", "gettextCatalog", function ($parse, $interpolate, gettextCatalog) { + function filter(msgid, options) { + options = options || {}; + msgid = options.msgid || msgid; + + if (!angular.isObject(options)) { + options = $parse(options)(this) || {}; + } + + var plural = options.plural; + var pluralScope = options.scope; + if (angular.isString(plural)) { + if (!pluralScope) { + throw new Error('You need to pass options.scope to translateFilter when using plural'); + } + pluralScope = pluralScope.$new(); + pluralScope.$count = angular.isString(options.n) ? $parse(options.n)(pluralScope) : options.n; + plural = $interpolate(plural)(pluralScope); + } + if (plural || plural === 0) { + return gettextCatalog.getPlural(pluralScope.$count, msgid, plural, null, options.context); + } + + return gettextCatalog.getString(msgid, options.scope, options.context); } filter.$stateful = true; return filter; diff --git a/dist/angular-gettext.min.js b/dist/angular-gettext.min.js index a7cb823..edfff46 100644 --- a/dist/angular-gettext.min.js +++ b/dist/angular-gettext.min.js @@ -1 +1 @@ -angular.module("gettext",[]),angular.module("gettext").constant("gettext",function(a){return a}),angular.module("gettext").factory("gettextCatalog",["gettextPlurals","$http","$cacheFactory","$interpolate","$rootScope",function(a,b,c,d,e){function f(){e.$broadcast("gettextLanguageChanged")}var g,h="$$noContext",i="test",j=angular.element(""+i+"").html()!==i,k=function(a){return g.debug&&g.currentLanguage!==g.baseLanguage?g.debugPrefix+a:a},l=function(a){return g.showTranslatedMarkers?g.translatedMarkerPrefix+a+g.translatedMarkerSuffix:a};return g={debug:!1,debugPrefix:"[MISSING]: ",showTranslatedMarkers:!1,translatedMarkerPrefix:"[",translatedMarkerSuffix:"]",strings:{},baseLanguage:"en",currentLanguage:"en",cache:c("strings"),setCurrentLanguage:function(a){this.currentLanguage=a,f()},setStrings:function(a,b){this.strings[a]||(this.strings[a]={});for(var c in b){var d=b[c];if(j&&(c=angular.element(""+c+"").html()),angular.isString(d)||angular.isArray(d)){var e={};e[h]=d,d=e}for(var g in d){var i=d[g];d[g]=angular.isArray(i)?i:[i]}this.strings[a][c]=d}f()},getStringForm:function(a,b,c){var d=this.strings[this.currentLanguage]||{},e=d[a]||{},f=e[c||h]||[];return f[b]},getString:function(a,b,c){return a=this.getStringForm(a,0,c)||k(a),a=b?d(a)(b):a,l(a)},getPlural:function(b,c,e,f,g){var h=a(this.currentLanguage,b);return c=this.getStringForm(c,h,g)||k(1===b?c:e),f&&(f.$count=b,c=d(c)(f)),l(c)},loadRemote:function(a){return b({method:"GET",url:a,cache:g.cache}).success(function(a){for(var b in a)g.setStrings(b,a[b])})}}}]),angular.module("gettext").directive("translate",["gettextCatalog","$parse","$animate","$compile","$window",function(a,b,c,d,e){function f(a,b,c){if(!a)throw new Error("You should add a "+b+" attribute whenever you add a "+c+" attribute.")}var g=function(){return String.prototype.trim?function(a){return"string"==typeof a?a.trim():a}:function(a){return"string"==typeof a?a.replace(/^\s*/,"").replace(/\s*$/,""):a}}(),h=parseInt((/msie (\d+)/.exec(angular.lowercase(e.navigator.userAgent))||[])[1],10);return{restrict:"AE",terminal:!0,compile:function(e,i){f(!i.translatePlural||i.translateN,"translate-n","translate-plural"),f(!i.translateN||i.translatePlural,"translate-plural","translate-n");var j=g(e.html()),k=i.translatePlural,l=i.translateContext;return 8>=h&&""===j.slice(-13)&&(j=j.slice(0,-13)),{post:function(e,f,g){function h(){var b;k?(e=m||(m=e.$new()),e.$count=i(e),b=a.getPlural(e.$count,j,k,null,l)):b=a.getString(j,null,l);var g=angular.element(""+b+"");d(g.contents())(e);var h=f.contents(),n=g.contents();c.enter(n,f),c.leave(h)}var i=b(g.translateN),m=null;g.translateN&&e.$watch(g.translateN,h),e.$on("gettextLanguageChanged",h),h()}}}}}]),angular.module("gettext").filter("translate",["gettextCatalog",function(a){function b(b,c){return a.getString(b,null,c)}return b.$stateful=!0,b}]),angular.module("gettext").factory("gettextPlurals",function(){return function(a,b){switch(a){case"ay":case"bo":case"cgg":case"dz":case"fa":case"id":case"ja":case"jbo":case"ka":case"kk":case"km":case"ko":case"ky":case"lo":case"ms":case"my":case"sah":case"su":case"th":case"tt":case"ug":case"vi":case"wo":case"zh":return 0;case"is":return b%10!=1||b%100==11?1:0;case"jv":return 0!=b?1:0;case"mk":return 1==b||b%10==1?0:1;case"ach":case"ak":case"am":case"arn":case"br":case"fil":case"fr":case"gun":case"ln":case"mfe":case"mg":case"mi":case"oc":case"pt_BR":case"tg":case"ti":case"tr":case"uz":case"wa":case"zh":return b>1?1:0;case"lv":return b%10==1&&b%100!=11?0:0!=b?1:2;case"lt":return b%10==1&&b%100!=11?0:b%10>=2&&(10>b%100||b%100>=20)?1:2;case"be":case"bs":case"hr":case"ru":case"sr":case"uk":return b%10==1&&b%100!=11?0:b%10>=2&&4>=b%10&&(10>b%100||b%100>=20)?1:2;case"mnk":return 0==b?0:1==b?1:2;case"ro":return 1==b?0:0==b||b%100>0&&20>b%100?1:2;case"pl":return 1==b?0:b%10>=2&&4>=b%10&&(10>b%100||b%100>=20)?1:2;case"cs":case"sk":return 1==b?0:b>=2&&4>=b?1:2;case"sl":return b%100==1?1:b%100==2?2:b%100==3||b%100==4?3:0;case"mt":return 1==b?0:0==b||b%100>1&&11>b%100?1:b%100>10&&20>b%100?2:3;case"gd":return 1==b||11==b?0:2==b||12==b?1:b>2&&20>b?2:3;case"cy":return 1==b?0:2==b?1:8!=b&&11!=b?2:3;case"kw":return 1==b?0:2==b?1:3==b?2:3;case"ga":return 1==b?0:2==b?1:7>b?2:11>b?3:4;case"ar":return 0==b?0:1==b?1:2==b?2:b%100>=3&&10>=b%100?3:b%100>=11?4:5;default:return 1!=b?1:0}}}); \ No newline at end of file +angular.module("gettext",[]),angular.module("gettext").constant("gettext",function(a){return a}),angular.module("gettext").factory("gettextCatalog",["gettextPlurals","$http","$cacheFactory","$interpolate","$rootScope",function(a,b,c,d,e){function f(){e.$broadcast("gettextLanguageChanged")}var g,h="$$noContext",i="test",j=angular.element(""+i+"").html()!==i,k=function(a){return g.debug&&g.currentLanguage!==g.baseLanguage?g.debugPrefix+a:a},l=function(a){return g.showTranslatedMarkers?g.translatedMarkerPrefix+a+g.translatedMarkerSuffix:a};return g={debug:!1,debugPrefix:"[MISSING]: ",showTranslatedMarkers:!1,translatedMarkerPrefix:"[",translatedMarkerSuffix:"]",strings:{},baseLanguage:"en",currentLanguage:"en",cache:c("strings"),setCurrentLanguage:function(a){this.currentLanguage=a,f()},setStrings:function(a,b){this.strings[a]||(this.strings[a]={});for(var c in b){var d=b[c];if(j&&(c=angular.element(""+c+"").html()),angular.isString(d)||angular.isArray(d)){var e={};e[h]=d,d=e}for(var g in d){var i=d[g];d[g]=angular.isArray(i)?i:[i]}this.strings[a][c]=d}f()},getStringForm:function(a,b,c){var d=this.strings[this.currentLanguage]||{},e=d[a]||{},f=e[c||h]||[];return f[b]},getString:function(a,b,c){return a=this.getStringForm(a,0,c)||k(a),a=b?d(a)(b):a,l(a)},getPlural:function(b,c,e,f,g){var h=a(this.currentLanguage,b);return c=this.getStringForm(c,h,g)||k(1===b?c:e),f&&(f.$count=b,c=d(c)(f)),l(c)},loadRemote:function(a){return b({method:"GET",url:a,cache:g.cache}).success(function(a){for(var b in a)g.setStrings(b,a[b])})}}}]),angular.module("gettext").directive("translate",["gettextCatalog","$parse","$animate","$compile","$window",function(a,b,c,d,e){function f(a,b,c){if(!a)throw new Error("You should add a "+b+" attribute whenever you add a "+c+" attribute.")}var g=function(){return String.prototype.trim?function(a){return"string"==typeof a?a.trim():a}:function(a){return"string"==typeof a?a.replace(/^\s*/,"").replace(/\s*$/,""):a}}(),h=parseInt((/msie (\d+)/.exec(angular.lowercase(e.navigator.userAgent))||[])[1],10);return{restrict:"AE",terminal:!0,compile:function(e,i){f(!i.translatePlural||i.translateN,"translate-n","translate-plural"),f(!i.translateN||i.translatePlural,"translate-plural","translate-n");var j=g(e.html()),k=i.translatePlural,l=i.translateContext;return 8>=h&&""===j.slice(-13)&&(j=j.slice(0,-13)),{post:function(e,f,g){function h(){var b;k?(e=m||(m=e.$new()),e.$count=i(e),b=a.getPlural(e.$count,j,k,null,l)):b=a.getString(j,null,l);var g=angular.element(""+b+"");d(g.contents())(e);var h=f.contents(),n=g.contents();c.enter(n,f),c.leave(h)}var i=b(g.translateN),m=null;g.translateN&&e.$watch(g.translateN,h),e.$on("gettextLanguageChanged",h),h()}}}}}]),angular.module("gettext").filter("translate",["$parse","$interpolate","gettextCatalog",function(a,b,c){function d(d,e){e=e||{},d=e.msgid||d,angular.isObject(e)||(e=a(e)(this)||{});var f=e.plural,g=e.scope;if(angular.isString(f)){if(!g)throw new Error("You need to pass options.scope to translateFilter when using plural");g=g.$new(),g.$count=angular.isString(e.n)?a(e.n)(g):e.n,f=b(f)(g)}return f||0===f?c.getPlural(g.$count,d,f,null,e.context):c.getString(d,e.scope,e.context)}return d.$stateful=!0,d}]),angular.module("gettext").factory("gettextPlurals",function(){return function(a,b){switch(a){case"ay":case"bo":case"cgg":case"dz":case"fa":case"id":case"ja":case"jbo":case"ka":case"kk":case"km":case"ko":case"ky":case"lo":case"ms":case"my":case"sah":case"su":case"th":case"tt":case"ug":case"vi":case"wo":case"zh":return 0;case"is":return b%10!=1||b%100==11?1:0;case"jv":return 0!=b?1:0;case"mk":return 1==b||b%10==1?0:1;case"ach":case"ak":case"am":case"arn":case"br":case"fil":case"fr":case"gun":case"ln":case"mfe":case"mg":case"mi":case"oc":case"pt_BR":case"tg":case"ti":case"tr":case"uz":case"wa":case"zh":return b>1?1:0;case"lv":return b%10==1&&b%100!=11?0:0!=b?1:2;case"lt":return b%10==1&&b%100!=11?0:b%10>=2&&(10>b%100||b%100>=20)?1:2;case"be":case"bs":case"hr":case"ru":case"sr":case"uk":return b%10==1&&b%100!=11?0:b%10>=2&&4>=b%10&&(10>b%100||b%100>=20)?1:2;case"mnk":return 0==b?0:1==b?1:2;case"ro":return 1==b?0:0==b||b%100>0&&20>b%100?1:2;case"pl":return 1==b?0:b%10>=2&&4>=b%10&&(10>b%100||b%100>=20)?1:2;case"cs":case"sk":return 1==b?0:b>=2&&4>=b?1:2;case"sl":return b%100==1?1:b%100==2?2:b%100==3||b%100==4?3:0;case"mt":return 1==b?0:0==b||b%100>1&&11>b%100?1:b%100>10&&20>b%100?2:3;case"gd":return 1==b||11==b?0:2==b||12==b?1:b>2&&20>b?2:3;case"cy":return 1==b?0:2==b?1:8!=b&&11!=b?2:3;case"kw":return 1==b?0:2==b?1:3==b?2:3;case"ga":return 1==b?0:2==b?1:7>b?2:11>b?3:4;case"ar":return 0==b?0:1==b?1:2==b?2:b%100>=3&&10>=b%100?3:b%100>=11?4:5;default:return 1!=b?1:0}}}); \ No newline at end of file diff --git a/src/filter.js b/src/filter.js index db065ee..7410ee5 100644 --- a/src/filter.js +++ b/src/filter.js @@ -1,6 +1,27 @@ -angular.module('gettext').filter('translate', function (gettextCatalog) { - function filter(input, context) { - return gettextCatalog.getString(input, null, context); +angular.module('gettext').filter('translate', function ($parse, $interpolate, gettextCatalog) { + function filter(msgid, options) { + options = options || {}; + msgid = options.msgid || msgid; + + if (!angular.isObject(options)) { + options = $parse(options)(this) || {}; + } + + var plural = options.plural; + var pluralScope = options.scope; + if (angular.isString(plural)) { + if (!pluralScope) { + throw new Error('You need to pass options.scope to translateFilter when using plural'); + } + pluralScope = pluralScope.$new(); + pluralScope.$count = angular.isString(options.n) ? $parse(options.n)(pluralScope) : options.n; + plural = $interpolate(plural)(pluralScope); + } + if (plural || plural === 0) { + return gettextCatalog.getPlural(pluralScope.$count, msgid, plural, null, options.context); + } + + return gettextCatalog.getString(msgid, options.scope, options.context); } filter.$stateful = true; return filter; diff --git a/test/unit/filter.js b/test/unit/filter.js index 0bd36e3..9cdac17 100644 --- a/test/unit/filter.js +++ b/test/unit/filter.js @@ -1,13 +1,17 @@ describe("Filter", function () { - var catalog = null; - var $rootScope = null; - var $compile = null; + var catalog; + var filter; + var $rootScope; + var $compile; + var $injector; beforeEach(module("gettext")); - beforeEach(inject(function ($injector, gettextCatalog) { + beforeEach(inject(function (_$injector_, gettextCatalog, translateFilter) { + $injector = _$injector_; $rootScope = $injector.get("$rootScope"); $compile = $injector.get("$compile"); + filter = translateFilter; catalog = gettextCatalog; catalog.setStrings("nl", { Hello: "Hallo", @@ -32,21 +36,50 @@ describe("Filter", function () { it("Should translate known strings according to translate context", function () { catalog.setCurrentLanguage("nl"); - var el = $compile("{{\"Archive\"|translate:'verb'}}")($rootScope); + var el = $compile("{{'Archive' | translate:'{context:\"verb\"}'}}")($rootScope); $rootScope.$digest(); assert.equal(el.text(), "Archiveren"); - el = $compile("{{\"Archive\"|translate:'noun'}}")($rootScope); + el = $compile("{{'Archive' | translate:'{context:\"noun\"}'}}")($rootScope); $rootScope.$digest(); assert.equal(el.text(), "Archief"); - el = $compile("{{\"Archive\"|translate}}")($rootScope); + el = $compile("{{'Archive' | translate}}")($rootScope); $rootScope.$digest(); assert.equal(el.text(), "Archief (no context)"); }); + it("Should support passing object directly to filter", function () { + catalog.setCurrentLanguage("nl"); + assert.equal(filter("Archive", { context: "verb" }), "Archiveren"); + }); + it("Can use filter in attribute values", function () { catalog.setCurrentLanguage("nl"); var el = $compile("")($rootScope); $rootScope.$digest(); assert.equal(el.attr("placeholder"), "Hallo"); }); + + describe("plurals", function () { + it("Should work if n is a number", function () { + catalog.setCurrentLanguage("nl"); + var scope = $rootScope.$new(); + + assert.equal(filter("Een boot", { plural: "{{$count}} boten", n: 2, scope: scope }), "2 boten"); + assert.equal(filter("Een boot", { plural: "{{$count}} boten", n: 1, scope: scope }), "Een boot"); + }); + + it("Should work if n is an expression string", function () { + catalog.setCurrentLanguage("nl"); + var scope = $rootScope.$new(); + + scope.count = 2; + $rootScope.$digest(); + assert.equal(filter("Een boot", { plural: "{{$count}} boten", n: "count", scope: scope }), "2 boten"); + + scope.count = 1; + $rootScope.$digest(); + assert.equal(filter("Een boot", { plural: "{{$count}} boten", n: "count", scope: scope }), "Een boot"); + }); + }); + });