diff options
| author | Vidhin Mehta (OpenERP) <vme@tinyerp.com> | 2012-07-03 19:19:40 +0530 |
|---|---|---|
| committer | Vidhin Mehta (OpenERP) <vme@tinyerp.com> | 2012-07-03 19:19:40 +0530 |
| commit | d86457a270afeb4ee2e5f7cfb906c73639fa54f2 (patch) | |
| tree | 546b5fb24c38652a34728aa89bb6f27001ea9df6 /addons/web/static/src/js/coresetup.js | |
| parent | c6ffd20a31c1413adb71716c952f36d74e15533c (diff) | |
| parent | 50413828c552636b596b1b572addc68fae5c261c (diff) | |
[merge]main branch.
bzr revid: vme@tinyerp.com-20120703134940-27u7n3k8lp43hzep
Diffstat (limited to 'addons/web/static/src/js/coresetup.js')
| -rw-r--r-- | addons/web/static/src/js/coresetup.js | 32 |
1 files changed, 24 insertions, 8 deletions
diff --git a/addons/web/static/src/js/coresetup.js b/addons/web/static/src/js/coresetup.js index ee421bee092..a00ca4002e5 100644 --- a/addons/web/static/src/js/coresetup.js +++ b/addons/web/static/src/js/coresetup.js @@ -608,15 +608,31 @@ instance.web.qweb.preprocess_node = function() { }; /** Setup jQuery timeago */ -var timeago_setup = function () { - var s = $.timeago.settings.strings; - _.each(s, function(v,k) { - if(_.isString(v)) { - s[k] = instance.web._t(v); - } - }); +var _t = instance.web._t; +/* + * Strings in timeago are "composed" with prefixes, words and suffixes. This + * makes their detection by our translating system impossible. Use all literal + * strings we're using with a translation mark here so the extractor can do its + * job. + */ +{ + _t('less than a minute ago'); + _t('about a minute ago'); + _t('%d minutes ago'); + _t('about an hour ago'); + _t('%d hours ago'); + _t('a day ago'); + _t('%d days ago'); + _t('about a month ago'); + _t('%d months ago'); + _t('about a year ago'); + _t('%d years ago'); } -instance.connection.on('module_loaded', this, timeago_setup); + +instance.connection.on('module_loaded', this, function () { + // provide timeago.js with our own translator method + $.timeago.settings.translator = instance.web._t; +}); /** * Registry for all the client actions key: tag value: widget |