profxadke/misskey
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge branch 'develop' of https://github.com/syuilo/misskey into develop

Browse source
This commit is contained in:
syuilo 2019-07-24 02:17:04 +09:00
commit fd2ae6d3cf
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/client/app/common/views/components/post-form-attaches.vue
View file

@ -36,7 +36,7 @@ export default Vue.extend({
required: true required: true
}, },
detachMediaFn: { detachMediaFn: {
type: Object, type: Function,
required: false required: false
} }
}, },

4
src/client/app/desktop/views/components/post-form-window.vue
View file

@ -5,8 +5,8 @@
<span class="icon" v-if="geo"><fa icon="map-marker-alt"/></span> <span class="icon" v-if="geo"><fa icon="map-marker-alt"/></span>
<span v-if="!reply">{{ $t('note') }}</span> <span v-if="!reply">{{ $t('note') }}</span>
<span v-if="reply">{{ $t('reply') }}</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="files.length != 0">{{ $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="uploadings.length != 0">{{ $t('uploading-media').replace('{}', uploadings.length) }}<mk-ellipsis/></span>
</span> </span>
</template> </template>