mirror of
https://github.com/scratchfoundation/jquery-timeago.git
synced 2025-03-05 01:18:02 -05:00
Merge remote-tracking branch 'eggli/master'
* eggli/master: add word separator setting for i18n, most Asian languages uses no word separator.
This commit is contained in:
commit
d11a9ccb6d
1 changed files with 2 additions and 1 deletions
|
@ -45,6 +45,7 @@
|
|||
months: "%d months",
|
||||
year: "about a year",
|
||||
years: "%d years",
|
||||
wordSep: " ",
|
||||
numbers: []
|
||||
}
|
||||
},
|
||||
|
@ -83,7 +84,7 @@
|
|||
years < 2 && substitute($l.year, 1) ||
|
||||
substitute($l.years, Math.floor(years));
|
||||
|
||||
return $.trim([prefix, words, suffix].join(" "));
|
||||
return $.trim([prefix, words, suffix].join($l.wordSep));
|
||||
},
|
||||
parse: function(iso8601) {
|
||||
var s = $.trim(iso8601);
|
||||
|
|
Loading…
Reference in a new issue