summaryrefslogtreecommitdiff
path: root/src/client
diff options
context:
space:
mode:
authortamaina <tamaina@hotmail.co.jp>2020-02-08 13:06:09 +0900
committerGitHub <noreply@github.com>2020-02-08 13:06:09 +0900
commit44d2c0195ac0c174dd49c31666b5be2fcbe69186 (patch)
tree71699173eb72fc6cc5c7508336b4047d5db9f7f2 /src/client
parentUpdate app.vue (diff)
downloadmisskey-44d2c0195ac0c174dd49c31666b5be2fcbe69186.tar.gz
misskey-44d2c0195ac0c174dd49c31666b5be2fcbe69186.tar.bz2
misskey-44d2c0195ac0c174dd49c31666b5be2fcbe69186.zip
翻訳の抜けを修正 (#5875)
* missing translation * fix * fix * :v:
Diffstat (limited to 'src/client')
-rw-r--r--src/client/components/drive.folder.vue2
-rw-r--r--src/client/pages/messaging-room.form.vue2
-rw-r--r--src/client/pages/settings/2fa.vue6
-rw-r--r--src/client/pages/settings/general.vue6
-rw-r--r--src/client/pages/share.vue15
5 files changed, 20 insertions, 11 deletions
diff --git a/src/client/components/drive.folder.vue b/src/client/components/drive.folder.vue
index 39a9588772..658aced3e8 100644
--- a/src/client/components/drive.folder.vue
+++ b/src/client/components/drive.folder.vue
@@ -19,7 +19,7 @@
{{ folder.name }}
</p>
<p class="upload" v-if="$store.state.settings.uploadFolder == folder.id">
- {{ $t('upload-folder') }}
+ {{ $t('uploadFolder') }}
</p>
</div>
</template>
diff --git a/src/client/pages/messaging-room.form.vue b/src/client/pages/messaging-room.form.vue
index 2e6ac758bb..7dff9d6b2e 100644
--- a/src/client/pages/messaging-room.form.vue
+++ b/src/client/pages/messaging-room.form.vue
@@ -8,7 +8,7 @@
ref="text"
@keypress="onKeypress"
@paste="onPaste"
- :placeholder="$t('input-message-here')"
+ :placeholder="$t('inputMessageHere')"
v-autocomplete="{ model: 'text' }"
></textarea>
<div class="file" @click="file = null" v-if="file">{{ file.name }}</div>
diff --git a/src/client/pages/settings/2fa.vue b/src/client/pages/settings/2fa.vue
index 6791894d34..8ec96cf356 100644
--- a/src/client/pages/settings/2fa.vue
+++ b/src/client/pages/settings/2fa.vue
@@ -4,8 +4,8 @@
<div class="_content">
<p v-if="!data && !$store.state.i.twoFactorEnabled"><mk-button @click="register">{{ $t('_2fa.registerDevice') }}</mk-button></p>
<template v-if="$store.state.i.twoFactorEnabled">
- <h2 class="heading">{{ $t('totp-header') }}</h2>
- <p>{{ $t('already-registered') }}</p>
+ <h2 class="heading">{{ $t('_2fa.totpHeader') }}</h2>
+ <p>{{ $t('_2fa.alreadyRegistered') }}</p>
<mk-button @click="unregister">{{ $t('unregister') }}</mk-button>
<template v-if="supportsCredentials">
@@ -24,7 +24,7 @@
<mk-switch v-model="usePasswordLessLogin" @change="updatePasswordLessLogin" v-if="$store.state.i.securityKeysList.length > 0">{{ $t('passwordLessLogin') }}</mk-switch>
<mk-info warn v-if="registration && registration.error">{{ $t('something-went-wrong') }} {{ registration.error }}</mk-info>
- <mk-button v-if="!registration || registration.error" @click="addSecurityKey">{{ $t('register') }}</mk-button>
+ <mk-button v-if="!registration || registration.error" @click="addSecurityKey">{{ $t('_2fa.registerKey') }}</mk-button>
<ol v-if="registration && !registration.error">
<li v-if="registration.stage >= 0">
diff --git a/src/client/pages/settings/general.vue b/src/client/pages/settings/general.vue
index b52254397f..85a4ac2cfe 100644
--- a/src/client/pages/settings/general.vue
+++ b/src/client/pages/settings/general.vue
@@ -18,9 +18,9 @@
</mk-switch>
</div>
<div class="_content">
- <mk-button @click="readAllNotifications">{{ $t('mark-as-read-all-notifications') }}</mk-button>
- <mk-button @click="readAllUnreadNotes">{{ $t('mark-as-read-all-unread-notes') }}</mk-button>
- <mk-button @click="readAllMessagingMessages">{{ $t('mark-as-read-all-talk-messages') }}</mk-button>
+ <mk-button @click="readAllNotifications">{{ $t('markAsReadAllNotifications') }}</mk-button>
+ <mk-button @click="readAllUnreadNotes">{{ $t('markAsReadAllUnreadNotes') }}</mk-button>
+ <mk-button @click="readAllMessagingMessages">{{ $t('markAsReadAllTalkMessages') }}</mk-button>
</div>
<div class="_content">
<mk-switch v-model="reduceAnimation">
diff --git a/src/client/pages/share.vue b/src/client/pages/share.vue
index 07bb70737f..566650e309 100644
--- a/src/client/pages/share.vue
+++ b/src/client/pages/share.vue
@@ -7,7 +7,8 @@
<div class="_title" v-if="title">{{ title }}</div>
<div class="_content">
<div>{{ text }}</div>
- <mk-button @click="post()">{{ $t('post') }}</mk-button>
+ <mk-button @click="post()" v-if="!posted">{{ $t('post') }}</mk-button>
+ <mk-button primary @click="close()" v-else>{{ $t('close') }}</mk-button>
</div>
<div class="_footer" v-if="url">{{ url }}</div>
</section>
@@ -39,6 +40,8 @@ export default Vue.extend({
title: null,
text: null,
url: null,
+ posted: false,
+
faShareAlt
}
},
@@ -64,9 +67,15 @@ export default Vue.extend({
instant: true,
initialText: text.trim()
}).$once('posted', () => {
- alert('a');
- window.close();
+ this.posted = true;
+ this.$root.dialog({
+ type: 'success',
+ iconOnly: true, autoClose: true
+ });
});
+ },
+ close() {
+ window.close()
}
}
});