for hustcc#73 in while -> right now

controlshift · Sep 21, 2016 · 371678b · 371678b
1 parent cde9577
commit 371678b
Show file tree

Hide file tree

Showing 11 changed files with 11 additions and 11 deletions.
diff --git a/README.md b/README.md
@@ -133,7 +133,7 @@ var test_local_dict = function(number, index) {
   // number: the timeago / timein number;
   // index: the index of array below;
   return [
-    ['just now', 'a while'],
+    ['just now', 'right now'],
     ['%s seconds ago', 'in %s seconds'],
     ['1 minute ago', 'in 1 minute'],
     ['%s minutes ago', 'in %s minutes'],

diff --git a/dist/timeago.js b/dist/timeago.js
@@ -17,7 +17,7 @@ function () {
     // build-in locales: en & zh_CN
     locales = {
       'en': function(number, index) {
-        if (index === 0) return ['just now', 'a while'];
+        if (index === 0) return ['just now', 'right now'];
         var unit = indexMapEn[parseInt(index / 2)];
         if (number > 1) unit += 's';
         return [number + ' ' + unit + ' ago', 'in ' + number + ' ' + unit];

diff --git a/dist/timeago.locales.min.js b/dist/timeago.locales.min.js
diff --git a/dist/timeago.min.js b/dist/timeago.min.js
diff --git a/index.html b/index.html
@@ -106,7 +106,7 @@ <h3>Locales register ?</h3>
   // number: the timeago / timein number;
   // index: the index of array below;
   return [
-    ['just now', 'a while'],
+    ['just now', 'right now'],
     ['%s seconds ago', 'in %s seconds'],
     ['1 minute ago', 'in 1 minute'],
     ['%s minutes ago', 'in %s minutes'],

diff --git a/locales/en.js b/locales/en.js
@@ -1,6 +1,6 @@
 module.exports = function(number, index) {
   return [
-    ['just now', 'a while'],
+    ['just now', 'right now'],
     ['%s seconds ago', 'in %s seconds'],
     ['1 minute ago', 'in 1 minute'],
     ['%s minutes ago', 'in %s minutes'],

diff --git a/locales/en_short.js b/locales/en_short.js
@@ -1,6 +1,6 @@
 module.exports = function(number, index) {
   return [
-    ['just now', 'a while'],
+    ['just now', 'right now'],
     ['%ss ago', 'in %ss'],
     ['1m ago', 'in 1m'],
     ['%sm ago', 'in %sm'],

diff --git a/src/timeago.js b/src/timeago.js
@@ -17,7 +17,7 @@ function () {
     // build-in locales: en & zh_CN
     locales = {
       'en': function(number, index) {
-        if (index === 0) return ['just now', 'a while'];
+        if (index === 0) return ['just now', 'right now'];
         var unit = indexMapEn[parseInt(index / 2)];
         if (number > 1) unit += 's';
         return [number + ' ' + unit + ' ago', 'in ' + number + ' ' + unit];

diff --git a/tests/locales/en.js b/tests/locales/en.js
@@ -4,7 +4,7 @@ module.exports = function(t, tb) {
   t.equal(tb.subSeconds(10),  '10 seconds ago');
   t.equal(tb.subSeconds(21), '21 seconds ago');
   t.equal(tb.subSeconds(22), '22 seconds ago');
-  t.equal(tb.addSeconds(1), 'a while');
+  t.equal(tb.addSeconds(1), 'right now');
   t.equal(tb.addSeconds(10), 'in 10 seconds');
   t.equal(tb.addSeconds(21), 'in 21 seconds');
   t.equal(tb.addSeconds(22), 'in 22 seconds');

diff --git a/tests/locales/en_short.js b/tests/locales/en_short.js
@@ -4,7 +4,7 @@ module.exports = function(t, tb) {
   t.equal(tb.subSeconds(10), '10s ago');
   t.equal(tb.subSeconds(21), '21s ago');
   t.equal(tb.subSeconds(22), '22s ago');
-  t.equal(tb.addSeconds(1), 'a while');
+  t.equal(tb.addSeconds(1), 'right now');
   t.equal(tb.addSeconds(10), 'in 10s');
   t.equal(tb.addSeconds(21), 'in 21s');
   t.equal(tb.addSeconds(22), 'in 22s');

diff --git a/tests/test.js b/tests/test.js
@@ -29,7 +29,7 @@ test('timeago.js should be tested', t => {
   // test register locale
   const timeagoReg = timeago('2016-06-23');
   timeago.register('test_local', (number, index) => [
-      ["just xxx", "a while"],
+      ["just xxx", "right now"],
       ["%s seconds xxx", "in %s seconds"],
       ["1 minute xxx", "in 1 minute"],
       ["%s minutes xxx", "in %s minutes"],