diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2018-05-17 15:29:18 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-05-17 15:29:18 +0900 |
| commit | 12cd3714e0d55024131dda8181d2f77ecc83576c (patch) | |
| tree | dd7c03538c4d4beb9b23ee26b059b677d4cd4c6f /src/client | |
| parent | New translations ja.yml (Korean) (diff) | |
| parent | oops (diff) | |
| download | misskey-12cd3714e0d55024131dda8181d2f77ecc83576c.tar.gz misskey-12cd3714e0d55024131dda8181d2f77ecc83576c.tar.bz2 misskey-12cd3714e0d55024131dda8181d2f77ecc83576c.zip | |
Merge branch 'master' into l10n_master
Diffstat (limited to 'src/client')
| -rw-r--r-- | src/client/app/desktop/views/components/calendar.vue | 2 | ||||
| -rw-r--r-- | src/client/app/desktop/views/components/timeline.vue | 8 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/client/app/desktop/views/components/calendar.vue b/src/client/app/desktop/views/components/calendar.vue index 1d8cc4f3a9..757eefac7e 100644 --- a/src/client/app/desktop/views/components/calendar.vue +++ b/src/client/app/desktop/views/components/calendar.vue @@ -64,7 +64,7 @@ export default Vue.extend({ '%i18n:!common.weekday-short.wednesday%', '%i18n:!common.weekday-short.thursday%', '%i18n:!common.weekday-short.friday%', - '%i18n:!common.weekday-short.satruday%' + '%i18n:!common.weekday-short.saturday%' ] }; }, diff --git a/src/client/app/desktop/views/components/timeline.vue b/src/client/app/desktop/views/components/timeline.vue index 855d032586..a776e40a24 100644 --- a/src/client/app/desktop/views/components/timeline.vue +++ b/src/client/app/desktop/views/components/timeline.vue @@ -1,11 +1,11 @@ <template> <div class="mk-timeline"> <header> - <span :data-active="src == 'home'" @click="src = 'home'">%fa:home% ホーム</span> - <span :data-active="src == 'local'" @click="src = 'local'">%fa:R comments% ローカル</span> - <span :data-active="src == 'global'" @click="src = 'global'">%fa:globe% グローバル</span> + <span :data-active="src == 'home'" @click="src = 'home'">%fa:home% %i18n:@home%</span> + <span :data-active="src == 'local'" @click="src = 'local'">%fa:R comments% %i18n:@local%</span> + <span :data-active="src == 'global'" @click="src = 'global'">%fa:globe% %i18n:@global%</span> <span :data-active="src == 'list'" @click="src = 'list'" v-if="list">%fa:list% {{ list.title }}</span> - <button @click="chooseList" title="リスト">%fa:list%</button> + <button @click="chooseList" title="%i18n:@list%">%fa:list%</button> </header> <x-core v-if="src == 'home'" ref="tl" key="home" src="home"/> <x-core v-if="src == 'local'" ref="tl" key="local" src="local"/> |