summaryrefslogtreecommitdiff
path: root/src/web
diff options
context:
space:
mode:
authorsyuilo <syuilotan@yahoo.co.jp>2017-03-23 06:31:46 +0900
committersyuilo <syuilotan@yahoo.co.jp>2017-03-23 06:31:46 +0900
commitd850b157f48564ccc5c6a8919007f7d642705fc9 (patch)
tree5d359ff18b889cde7fa5cff6972931f53def2c85 /src/web
parentwip #313 (diff)
downloadsharkey-d850b157f48564ccc5c6a8919007f7d642705fc9.tar.gz
sharkey-d850b157f48564ccc5c6a8919007f7d642705fc9.tar.bz2
sharkey-d850b157f48564ccc5c6a8919007f7d642705fc9.zip
wip #313
Diffstat (limited to 'src/web')
-rw-r--r--src/web/app/common/tags/time.tag20
-rw-r--r--src/web/app/desktop/tags/ui-header-nav.tag2
2 files changed, 11 insertions, 11 deletions
diff --git a/src/web/app/common/tags/time.tag b/src/web/app/common/tags/time.tag
index b4e6dcdbd3..b0d7d24533 100644
--- a/src/web/app/common/tags/time.tag
+++ b/src/web/app/common/tags/time.tag
@@ -34,16 +34,16 @@
const now = new Date();
const ago = (now - this.time) / 1000/*ms*/;
this.relative =
- ago >= 31536000 ? ~~(ago / 31536000) + '年前' :
- ago >= 2592000 ? ~~(ago / 2592000) + 'ヶ月前' :
- ago >= 604800 ? ~~(ago / 604800) + '週間前' :
- ago >= 86400 ? ~~(ago / 86400) + '日前' :
- ago >= 3600 ? ~~(ago / 3600) + '時間前' :
- ago >= 60 ? ~~(ago / 60) + '分前' :
- ago >= 10 ? ~~(ago % 60) + '秒前' :
- ago >= 0 ? 'たった今' :
- ago < 0 ? '未来' :
- 'なぞのじかん';
+ ago >= 31536000 ? '%i18n:common.time.years_ago%' .replace('{}', ~~(ago / 31536000)) :
+ ago >= 2592000 ? '%i18n:common.time.months_ago%' .replace('{}', ~~(ago / 2592000)) :
+ ago >= 604800 ? '%i18n:common.time.weeks_ago%' .replace('{}', ~~(ago / 604800)) :
+ ago >= 86400 ? '%i18n:common.time.days_ago%' .replace('{}', ~~(ago / 86400)) :
+ ago >= 3600 ? '%i18n:common.time.hours_ago%' .replace('{}', ~~(ago / 3600)) :
+ ago >= 60 ? '%i18n:common.time.minutes_ago%'.replace('{}', ~~(ago / 60)) :
+ ago >= 10 ? '%i18n:common.time.seconds_ago%'.replace('{}', ~~(ago % 60)) :
+ ago >= 0 ? '%i18n:common.time.just_now%' :
+ ago < 0 ? '%i18n:common.time.future%' :
+ '%i18n:common.time.unknown%';
this.update();
};
</script>
diff --git a/src/web/app/desktop/tags/ui-header-nav.tag b/src/web/app/desktop/tags/ui-header-nav.tag
index 5ffa392f5c..2fb0f8c513 100644
--- a/src/web/app/desktop/tags/ui-header-nav.tag
+++ b/src/web/app/desktop/tags/ui-header-nav.tag
@@ -3,7 +3,7 @@
<li class="home { active: page == 'home' }">
<a href={ CONFIG.url }>
<i class="fa fa-home"></i>
- <p>'i18n:home'</p>
+ <p>%i18n:desktop.tags.mk-ui-header-nav.home%</p>
</a>
</li>
<li class="messaging">