diff options
| author | luigi1111 <luigi1111w@gmail.com> | 2019-01-21 14:56:27 -0600 |
|---|---|---|
| committer | luigi1111 <luigi1111w@gmail.com> | 2019-01-21 14:56:27 -0600 |
| commit | 2b3be5ef9a1af6e82fda15158d302b7c5f74f207 (patch) | |
| tree | 778c4e6b66e40dd2beffcc429e1c45ad49270c9c /js | |
| parent | b44bcffd6fca6ba30f75a683a243ce315b2494ac (diff) | |
| parent | 84c509c00d3d7ce7e5917fe7a37026b6349ddca7 (diff) | |
| download | monzero-gui-2b3be5ef9a1af6e82fda15158d302b7c5f74f207.tar.gz monzero-gui-2b3be5ef9a1af6e82fda15158d302b7c5f74f207.tar.xz monzero-gui-2b3be5ef9a1af6e82fda15158d302b7c5f74f207.zip | |
Merge pull request #1894
3840126 merchant: hide color stripe (selsta)
2d18821 merchant: round in ago() function (selsta)
aa82615 merchant: fix payment tracker sorting (selsta)
84c509c merchant: fix timezone offset (selsta)
Diffstat (limited to 'js')
| -rw-r--r-- | js/Utils.js | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/js/Utils.js b/js/Utils.js index 8ba7fa85..8bf7660c 100644 --- a/js/Utils.js +++ b/js/Utils.js @@ -57,7 +57,11 @@ function ago(epoch) { var delta = now - epoch; if(delta < 60) { - return delta + " " + qsTr("seconds ago") + if (delta <= 1) { + return 1 + " " + qsTr("second ago") + } else { + return Math.floor(delta) + " " + qsTr("seconds ago") + } } else if (delta >= 60 && delta <= 3600) { if(delta >= 60 && delta < 120){ return 1 + " " + qsTr("minute ago") |