Merge branch 'develop' of https://github.com/syuilo/misskey into develop
This commit is contained in:
commit
fd2ae6d3cf
@ -36,7 +36,7 @@ export default Vue.extend({
|
||||
required: true
|
||||
},
|
||||
detachMediaFn: {
|
||||
type: Object,
|
||||
type: Function,
|
||||
required: false
|
||||
}
|
||||
},
|
||||
|
@ -5,8 +5,8 @@
|
||||
<span class="icon" v-if="geo"><fa icon="map-marker-alt"/></span>
|
||||
<span v-if="!reply">{{ $t('note') }}</span>
|
||||
<span v-if="reply">{{ $t('reply') }}</span>
|
||||
<span class="count" v-if="files.length != 0">{{ this.$t('attaches').replace('{}', files.length) }}</span>
|
||||
<span class="count" v-if="uploadings.length != 0">{{ this.$t('uploading-media').replace('{}', uploadings.length) }}<mk-ellipsis/></span>
|
||||
<span class="count" v-if="files.length != 0">{{ $t('attaches').replace('{}', files.length) }}</span>
|
||||
<span class="count" v-if="uploadings.length != 0">{{ $t('uploading-media').replace('{}', uploadings.length) }}<mk-ellipsis/></span>
|
||||
</span>
|
||||
</template>
|
||||
|
||||
|
Loading…
Reference in New Issue
Block a user