Merge remote-tracking branch 'eggli/master'

rmm5t · rmm5t · commit d11a9ccb6d00 · 2012-03-03T15:18:27.000-05:00
* eggli/master:
  add word separator setting for i18n, most Asian languages uses no word separator.
diff --git a/jquery.timeago.js b/jquery.timeago.js
@@ -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);
