From fed4b5e032d885da10c49460bdf34d3e129022ae Mon Sep 17 00:00:00 2001
From: Aya Morisawa <AyaMorisawa4869@gmail.com>
Date: Thu, 27 Dec 2018 19:58:57 +0900
Subject: [PATCH] Show on the CW button that there is a poll (#3769)
---
locales/ja-JP.yml | 1 +
.../app/common/views/components/cw-button.vue | 17 ++++++++++++-----
2 files changed, 13 insertions(+), 5 deletions(-)
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml
index 120860a45..ab8c8b36f 100644
--- a/locales/ja-JP.yml
+++ b/locales/ja-JP.yml
@@ -324,6 +324,7 @@ common/views/components/cw-button.vue:
show: "もっと見る"
chars: "{count}文字"
files: "{count}ファイル"
+ poll: "アンケート"
common/views/components/messaging.vue:
search-user: "ユーザーを探す"
diff --git a/src/client/app/common/views/components/cw-button.vue b/src/client/app/common/views/components/cw-button.vue
index 034848a11..098aa021d 100644
--- a/src/client/app/common/views/components/cw-button.vue
+++ b/src/client/app/common/views/components/cw-button.vue
@@ -1,11 +1,7 @@
<template>
<button class="nrvgflfuaxwgkxoynpnumyookecqrrvh" @click="toggle">
<b>{{ value ? this.$t('hide') : this.$t('show') }}</b>
- <span v-if="!value">
- <span v-if="note.text">{{ this.$t('chars', { count: length(note.text) }) | number }}</span>
- <span v-if="note.text && note.files && note.files.length > 0"> / </span>
- <span v-if="note.files && note.files.length > 0">{{ this.$t('files', { count: note.files.length }) }}</span>
- </span>
+ <span v-if="!value">{{ this.label }}</span>
</button>
</template>
@@ -13,6 +9,7 @@
import Vue from 'vue';
import i18n from '../../../i18n';
import { length } from 'stringz';
+import { concat } from '../../../../../prelude/array';
export default Vue.extend({
i18n: i18n('common/views/components/cw-button.vue'),
@@ -28,6 +25,16 @@ export default Vue.extend({
}
},
+ computed: {
+ label(): string {
+ return concat([
+ this.note.text ? [this.$t('chars', { count: length(this.note.text) })] : [],
+ this.note.files && this.note.files.length !== 0 ? [this.$t('files', { count: this.note.files.length }) ] : [],
+ this.note.poll != null ? [this.$t('poll')] : []
+ ] as string[][]).join(' / ');
+ }
+ },
+
methods: {
length,