thegamer/Cable-Desktop
2
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Fix timestamp tests

Browse source 
These were failing because chrome's i18n functions aren't available in
test.

// FREEBIE
This commit is contained in:
lilia 2016-08-05 17:28:14 -07:00
parent 688b297050
commit 4d9b6917d7
1 changed files with 17 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
js/views/timestamp_view.js
View file

@ -44,7 +44,7 @@
return timestamp.format(this._format.y); return timestamp.format(this._format.y);
} else if (timediff.months() > 0 || timediff.days() > 6) { } else if (timediff.months() > 0 || timediff.days() > 6) {
this.delay = null; this.delay = null;
return timestamp.format(this._format.m); return timestamp.format(this._format.mo);
} else if (timediff.days() > 0) { } else if (timediff.days() > 0) {
this.delay = moment(timestamp).add(timediff.days() + 1,'d').diff(moment()); this.delay = moment(timestamp).add(timediff.days() + 1,'d').diff(moment());
return timestamp.format(this._format.d); return timestamp.format(this._format.d);
@ -66,21 +66,33 @@
} }
}, },
relativeTime : function (number, string, isFuture) { relativeTime : function (number, string, isFuture) {
return i18n("timestamp_"+string).replace(/%d/i, number); var format = i18n("timestamp_"+string) || this._format[string];
return format.replace(/%d/i, number);
}, },
_format: { _format: {
s: "now",
m: "1 min",
mm: "%d min",
h: "1 hour",
hh: "%d hours",
y: "MMM D, YYYY", y: "MMM D, YYYY",
m: "MMM D", mo: "MMM D",
d: "ddd" d: "ddd"
} }
}); });
Whisper.ExtendedTimestampView = Whisper.TimestampView.extend({ Whisper.ExtendedTimestampView = Whisper.TimestampView.extend({
relativeTime : function (number, string, isFuture) { relativeTime : function (number, string, isFuture) {
return i18n("extendedTimestamp_"+string).replace(/%d/i, number); var format = i18n("extendedTimestamp_"+string) || this._format[string];
return format.replace(/%d/i, number);
}, },
_format: { _format: {
s: "now",
m: "%d minute ago",
mm: "%d minutes ago",
h: "%d hour ago",
hh: "%d hours ago",
y: "MMM D, YYYY LT", y: "MMM D, YYYY LT",
m: "MMM D LT", mo: "MMM D LT",
d: "ddd LT" d: "ddd LT"
} }
}); });