Skip to content

translatePlural and translateContext #150

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

translatePlural and translateContext #150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
67 changes: 60 additions & 7 deletions dist/angular-gettext.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,10 @@ angular.module('gettext').factory('gettextCatalog', ["gettextPlurals", "$http",
},

getPlural: function (n, string, stringPlural, scope, context) {
if (!n && n !== 0) {
return this.getString(string, scope, context);
}

var form = gettextPlurals(this.currentLanguage, n);
string = this.getStringForm(string, form, context) || prefixDebug(n === 1 ? string : stringPlural);
if (scope) {
Expand Down Expand Up @@ -206,13 +210,62 @@ 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);
}
filter.$stateful = true;
return filter;
}]);
(function () {
var translate = function (gettextCatalog, $gettext) {
var message = gettextCatalog.getPlural($gettext.n, $gettext.msgid, $gettext.plural, null, $gettext.context);
if ($gettext.n || $gettext.n === 0) {
// replace $count with n, preserving leading whitespace
return message.replace(/(^|\s)\$count\b/g, '$1' + $gettext.n);
} else {
return message;
}
};

angular.module('gettext').filter('translate', ["gettextCatalog", function (gettextCatalog) {
function filter(msgid) {
var $gettext = msgid.$gettext || { msgid: msgid };

// translate is the only filter that returns a string primitive
return translate(gettextCatalog, $gettext);
}
filter.$stateful = true;
return filter;
}]);

angular.module('gettext').filter('translatePlural', ["gettextCatalog", function (gettextCatalog) {
function filter(msgid, n, plural) {
var $gettext = msgid.$gettext || { msgid: msgid };
$gettext.n = n;
$gettext.plural = plural;

/*jshint -W053 */
// might as well return the correct String, even if it is a wrapper type
var message = new String(translate(gettextCatalog, $gettext));
/*jshint +W053 */

message.$gettext = $gettext;
return message;
}
filter.$stateful = true;
return filter;
}]);

angular.module('gettext').filter('translateContext', ["gettextCatalog", function (gettextCatalog) {
function filter(msgid, context) {
var $gettext = msgid.$gettext || { msgid: msgid };
$gettext.context = context;

/*jshint -W053 */
var message = new String(translate(gettextCatalog, $gettext));
/*jshint +W053 */

message.$gettext = $gettext;
return message;
}
filter.$stateful = true;
return filter;
}]);
})();

// Do not edit this file, it is autogenerated using genplurals.py!
angular.module("gettext").factory("gettextPlurals", function () {
Expand Down
2 changes: 1 addition & 1 deletion dist/angular-gettext.min.js
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 4 additions & 0 deletions src/catalog.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,10 @@ angular.module('gettext').factory('gettextCatalog', function (gettextPlurals, $h
},

getPlural: function (n, string, stringPlural, scope, context) {
if (!n && n !== 0) {
return this.getString(string, scope, context);
}

var form = gettextPlurals(this.currentLanguage, n);
string = this.getStringForm(string, form, context) || prefixDebug(n === 1 ? string : stringPlural);
if (scope) {
Expand Down
63 changes: 56 additions & 7 deletions src/filter.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,56 @@
angular.module('gettext').filter('translate', function (gettextCatalog) {
function filter(input, context) {
return gettextCatalog.getString(input, null, context);
}
filter.$stateful = true;
return filter;
});
(function () {
var translate = function (gettextCatalog, $gettext) {
var message = gettextCatalog.getPlural($gettext.n, $gettext.msgid, $gettext.plural, null, $gettext.context);
if ($gettext.n || $gettext.n === 0) {
// replace $count with n, preserving leading whitespace
return message.replace(/(^|\s)\$count\b/g, '$1' + $gettext.n);
} else {
return message;
}
};

angular.module('gettext').filter('translate', function (gettextCatalog) {
function filter(msgid) {
var $gettext = msgid.$gettext || { msgid: msgid };

// translate is the only filter that returns a string primitive
return translate(gettextCatalog, $gettext);
}
filter.$stateful = true;
return filter;
});

angular.module('gettext').filter('translatePlural', function (gettextCatalog) {
function filter(msgid, n, plural) {
var $gettext = msgid.$gettext || { msgid: msgid };
$gettext.n = n;
$gettext.plural = plural;

/*jshint -W053 */
// might as well return the correct String, even if it is a wrapper type
var message = new String(translate(gettextCatalog, $gettext));
/*jshint +W053 */

message.$gettext = $gettext;
return message;
}
filter.$stateful = true;
return filter;
});

angular.module('gettext').filter('translateContext', function (gettextCatalog) {
function filter(msgid, context) {
var $gettext = msgid.$gettext || { msgid: msgid };
$gettext.context = context;

/*jshint -W053 */
var message = new String(translate(gettextCatalog, $gettext));
/*jshint +W053 */

message.$gettext = $gettext;
return message;
}
filter.$stateful = true;
return filter;
});
})();
Loading