Skip to content

Commit

Permalink
クール→リアクション
Browse files Browse the repository at this point in the history
  • Loading branch information
mei23 committed Feb 22, 2020
1 parent ea4c505 commit 9da5e95
Show file tree
Hide file tree
Showing 6 changed files with 11 additions and 11 deletions.
6 changes: 3 additions & 3 deletions locales/en-US.yml
Expand Up @@ -1112,7 +1112,7 @@ desktop/views/components/timeline.vue:
hybrid: "Social"
hybrid-desc: "Home+Local"
global: "Global"
cool: "Cool"
reacted: "Reacted"
mentions: "Mentions"
messages: "Direct posts"
list: "Lists"
Expand Down Expand Up @@ -1669,7 +1669,7 @@ mobile/views/pages/home.vue:
local: "Local"
hybrid: "Social"
global: "Global"
cool: "Cool"
reacted: "Reacted"
mentions: "Mentions"
messages: "Direct posts"
mobile/views/pages/tag.vue:
Expand Down Expand Up @@ -1727,7 +1727,7 @@ deck:
hybrid: "Social"
hashtag: "Hashtag"
global: "Global"
cool: "Cool"
reacted: "Reacted"
mentions: "Mentions"
direct: "Direct posts"
notifications: "Notifications"
Expand Down
6 changes: 3 additions & 3 deletions locales/ja-JP.yml
Expand Up @@ -1225,7 +1225,7 @@ desktop/views/components/timeline.vue:
hybrid: "ソーシャル"
hybrid-desc: "ホーム+ローカル"
global: "グローバル"
cool: "クール"
reacted: "リアクション"
mentions: "あなた宛て"
messages: "ダイレクト投稿"
list: "リスト"
Expand Down Expand Up @@ -1855,7 +1855,7 @@ mobile/views/pages/home.vue:
local: "ローカル"
hybrid: "ソーシャル"
global: "グローバル"
cool: "クール"
reacted: "リアクション"
mentions: "あなた宛て"
messages: "ダイレクト投稿"

Expand Down Expand Up @@ -1927,7 +1927,7 @@ deck:
hybrid: "ソーシャル"
hashtag: "ハッシュタグ"
global: "グローバル"
cool: "クール"
reacted: "リアクション"
mentions: "あなた宛て"
direct: "ダイレクト投稿"
notifications: "通知"
Expand Down
2 changes: 1 addition & 1 deletion src/client/app/common/views/deck/deck.tl-column.vue
Expand Up @@ -91,7 +91,7 @@ export default Vue.extend({
case 'local': return this.$t('@deck.local');
case 'hybrid': return this.$t('@deck.hybrid');
case 'global': return this.$t('@deck.global');
case 'hot': return this.$t('@deck.cool');
case 'hot': return this.$t('@deck.reacted');
case 'list': return this.column.list.title;
case 'hashtag': return this.$store.state.settings.tagTimelines.find(x => x.id == this.column.tagTlId).title;
}
Expand Down
2 changes: 1 addition & 1 deletion src/client/app/common/views/deck/deck.vue
Expand Up @@ -165,7 +165,7 @@ export default Vue.extend({
}
}, {
icon: faThumbsUp,
text: this.$t('@deck.cool'),
text: this.$t('@deck.reacted'),
action: () => {
this.$store.commit('device/addDeckColumn', {
id: uuid(),
Expand Down
2 changes: 1 addition & 1 deletion src/client/app/desktop/views/home/timeline.vue
Expand Up @@ -11,7 +11,7 @@
<div :data-active="src == 'tag'" @click="src = 'tag'" v-if="tagTl"><fa icon="hashtag"/> {{ tagTl.title }}</div>
<div :data-active="src == 'list'" @click="src = 'list'" v-if="list"><fa icon="list"/> {{ list.title }}</div>
<div class="buttons">
<button :data-active="src == 'hot'" @click="src = 'hot'" :title="$t('cool')"><fa :icon="faThumbsUp"/></button>
<button :data-active="src == 'hot'" @click="src = 'hot'" :title="$t('reacted')"><fa :icon="faThumbsUp"/></button>
<button :data-active="src == 'mentions'" @click="src = 'mentions'" :title="$t('mentions')"><fa icon="at"/><i class="indicator" v-if="$store.state.i.hasUnreadMentions"><fa icon="circle"/></i></button>
<button :data-active="src == 'messages'" @click="src = 'messages'" :title="$t('messages')"><fa :icon="['far', 'envelope']"/><i class="indicator" v-if="$store.state.i.hasUnreadSpecifiedNotes"><fa icon="circle"/></i></button>
<button @click="chooseTag" :title="$t('hashtag')" ref="tagButton"><fa icon="hashtag"/></button>
Expand Down
4 changes: 2 additions & 2 deletions src/client/app/mobile/views/pages/home.vue
Expand Up @@ -7,7 +7,7 @@
<span v-if="src == 'local'"><fa :icon="['far', 'comments']"/>{{ $t('local') }}</span>
<span v-if="src == 'hybrid'"><fa icon="share-alt"/>{{ $t('hybrid') }}</span>
<span v-if="src == 'global'"><fa icon="globe"/>{{ $t('global') }}</span>
<span v-if="src == 'hot'"><fa :icon="faThumbsUp"/>{{ $t('cool') }}</span>
<span v-if="src == 'hot'"><fa :icon="faThumbsUp"/>{{ $t('reacted') }}</span>
<span v-if="src == 'mentions'"><fa icon="at"/>{{ $t('mentions') }}</span>
<span v-if="src == 'messages'"><fa :icon="['far', 'envelope']"/>{{ $t('messages') }}</span>
<span v-if="src == 'list'"><fa icon="list"/>{{ list.title }}</span>
Expand Down Expand Up @@ -36,7 +36,7 @@
<span :data-active="src == 'hybrid'" @click="src = 'hybrid'" v-if="enableLocalTimeline"><fa icon="share-alt"/> {{ $t('hybrid') }}</span>
<span :data-active="src == 'global'" @click="src = 'global'" v-if="enableGlobalTimeline"><fa icon="globe"/> {{ $t('global') }}</span>
<div class="hr"></div>
<span :data-active="src == 'hot'" @click="src = 'hot'" v-if="enableGlobalTimeline"><fa :icon="faThumbsUp"/> {{ $t('cool') }}</span>
<span :data-active="src == 'hot'" @click="src = 'hot'" v-if="enableGlobalTimeline"><fa :icon="faThumbsUp"/> {{ $t('reacted') }}</span>
<span :data-active="src == 'mentions'" @click="src = 'mentions'"><fa icon="at"/> {{ $t('mentions') }}<i class="badge" v-if="$store.state.i.hasUnreadMentions"><fa icon="circle"/></i></span>
<span :data-active="src == 'messages'" @click="src = 'messages'"><fa :icon="['far', 'envelope']"/> {{ $t('messages') }}<i class="badge" v-if="$store.state.i.hasUnreadSpecifiedNotes"><fa icon="circle"/></i></span>
<template v-if="lists">
Expand Down

0 comments on commit 9da5e95

Please sign in to comment.