diff options
| author | tamaina <tamaina@hotmail.co.jp> | 2020-02-12 06:27:11 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-02-12 06:27:11 +0900 |
| commit | c2d5a96bb6f3524c573e980c467482b20436f971 (patch) | |
| tree | 42179bf6cbb20538cde354e8750340ff2d240b56 /src/client/components | |
| parent | Fix #5919 (diff) | |
| download | sharkey-c2d5a96bb6f3524c573e980c467482b20436f971.tar.gz sharkey-c2d5a96bb6f3524c573e980c467482b20436f971.tar.bz2 sharkey-c2d5a96bb6f3524c573e980c467482b20436f971.zip | |
翻訳の抜けを修正その2 (#5893)
* Missing translation
* use npx
* :v:
* Update ja-JP.yml
* Update signup.vue
* Update ja-JP.yml
* Update messaging-room.vue
* Update ja-JP.yml
* Update signup.vue
* Update ja-JP.yml
* Update signin.vue
* Update ja-JP.yml
* Update index.vue
* Update ja-JP.yml
* Update signup.vue
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
Diffstat (limited to 'src/client/components')
| -rw-r--r-- | src/client/components/drive.vue | 4 | ||||
| -rw-r--r-- | src/client/components/google.vue | 2 | ||||
| -rw-r--r-- | src/client/components/post-form.vue | 4 | ||||
| -rw-r--r-- | src/client/components/reaction-picker.vue | 2 | ||||
| -rw-r--r-- | src/client/components/signin.vue | 13 | ||||
| -rw-r--r-- | src/client/components/signup.vue | 27 | ||||
| -rw-r--r-- | src/client/components/time.vue | 2 | ||||
| -rw-r--r-- | src/client/components/user-list.vue | 2 |
8 files changed, 28 insertions, 28 deletions
diff --git a/src/client/components/drive.vue b/src/client/components/drive.vue index 8a4349ae35..bb35b156aa 100644 --- a/src/client/components/drive.vue +++ b/src/client/components/drive.vue @@ -23,13 +23,13 @@ <x-folder v-for="folder in folders" :key="folder.id" class="folder" :folder="folder"/> <!-- SEE: https://stackoverflow.com/questions/18744164/flex-box-align-last-row-to-grid --> <div class="padding" v-for="n in 16"></div> - <mk-button v-if="moreFolders">{{ $t('@.load-more') }}</mk-button> + <mk-button v-if="moreFolders">{{ $t('loadMore') }}</mk-button> </div> <div class="files" ref="filesContainer" v-if="files.length > 0"> <x-file v-for="file in files" :key="file.id" class="file" :file="file" :select-mode="selectMode"/> <!-- SEE: https://stackoverflow.com/questions/18744164/flex-box-align-last-row-to-grid --> <div class="padding" v-for="n in 16"></div> - <mk-button v-if="moreFiles" @click="fetchMoreFiles">{{ $t('@.load-more') }}</mk-button> + <mk-button v-if="moreFiles" @click="fetchMoreFiles">{{ $t('loadMore') }}</mk-button> </div> <div class="empty" v-if="files.length == 0 && folders.length == 0 && !fetching"> <p v-if="draghover">{{ $t('empty-draghover') }}</p> diff --git a/src/client/components/google.vue b/src/client/components/google.vue index e6ef7f7d90..21560008f6 100644 --- a/src/client/components/google.vue +++ b/src/client/components/google.vue @@ -1,7 +1,7 @@ <template> <div class="mk-google"> <input type="search" v-model="query" :placeholder="q"> - <button @click="search"><fa icon="search"/> {{ $t('@.search') }}</button> + <button @click="search"><fa icon="search"/> {{ $t('search') }}</button> </div> </template> diff --git a/src/client/components/post-form.vue b/src/client/components/post-form.vue index 3fe14eee97..2e6285cb06 100644 --- a/src/client/components/post-form.vue +++ b/src/client/components/post-form.vue @@ -21,7 +21,7 @@ <div class="form"> <x-note-preview class="preview" v-if="reply" :note="reply"/> <x-note-preview class="preview" v-if="renote" :note="renote"/> - <div class="with-quote" v-if="quoteId"><fa icon="quote-left"/> {{ $t('@.post-form.quote-attached') }}<button @click="quoteId = null"><fa icon="times"/></button></div> + <div class="with-quote" v-if="quoteId"><fa icon="quote-left"/> {{ $t('quoteAttached') }}<button @click="quoteId = null"><fa icon="times"/></button></div> <div v-if="visibility === 'specified'" class="to-specified"> <span style="margin-right: 8px;">{{ $t('recipient') }}</span> <div class="visibleUsers"> @@ -445,7 +445,7 @@ export default Vue.extend({ this.$root.dialog({ type: 'info', - text: this.$t('@.post-form.quote-question'), + text: this.$t('quoteQuestion'), showCancelButton: true }).then(({ canceled }) => { if (canceled) { diff --git a/src/client/components/reaction-picker.vue b/src/client/components/reaction-picker.vue index ccf6eaa51e..9380e6a78d 100644 --- a/src/client/components/reaction-picker.vue +++ b/src/client/components/reaction-picker.vue @@ -13,7 +13,7 @@ mode="out-in" appear > - <button class="_button" v-for="(reaction, i) in rs" :key="reaction" @click="react(reaction)" :tabindex="i + 1" :title="/^[a-z]+$/.test(reaction) ? $t('@.reactions.' + reaction) : reaction"><x-reaction-icon :reaction="reaction"/></button> + <button class="_button" v-for="(reaction, i) in rs" :key="reaction" @click="react(reaction)" :tabindex="i + 1" :title="reaction"><x-reaction-icon :reaction="reaction"/></button> </transition-group> <input class="text" v-model="text" :placeholder="$t('enterEmoji')" @keyup.enter="reactText" @input="tryReactText" v-autocomplete="{ model: 'text' }"> </div> diff --git a/src/client/components/signin.vue b/src/client/components/signin.vue index 22b5ec804c..758bc59107 100644 --- a/src/client/components/signin.vue +++ b/src/client/components/signin.vue @@ -12,15 +12,15 @@ <template #prefix><fa :icon="faLock"/></template> </mk-input> <mk-button type="submit" primary :disabled="signing" style="margin: 0 auto;">{{ signing ? $t('loggingIn') : $t('login') }}</mk-button> - <p v-if="meta && meta.enableTwitterIntegration" style="margin: 8px 0;"><a :href="`${apiUrl}/signin/twitter`"><fa :icon="['fab', 'twitter']"/> {{ $t('signin-with-twitter') }}</a></p> - <p v-if="meta && meta.enableGithubIntegration" style="margin: 8px 0;"><a :href="`${apiUrl}/signin/github`"><fa :icon="['fab', 'github']"/> {{ $t('signin-with-github') }}</a></p> - <p v-if="meta && meta.enableDiscordIntegration" style="margin: 8px 0;"><a :href="`${apiUrl}/signin/discord`"><fa :icon="['fab', 'discord']"/> {{ $t('signin-with-discord') /* TODO: Make these layouts better */ }}</a></p> + <p v-if="meta && meta.enableTwitterIntegration" style="margin: 8px 0;"><a :href="`${apiUrl}/signin/twitter`"><fa :icon="faTwitter"/> {{ $t('signinWith', { x: 'Twitter' }) }}</a></p> + <p v-if="meta && meta.enableGithubIntegration" style="margin: 8px 0;"><a :href="`${apiUrl}/signin/github`"><fa :icon="faGithub"/> {{ $t('signinWith', { x: 'GitHub' }) }}</a></p> + <p v-if="meta && meta.enableDiscordIntegration" style="margin: 8px 0;"><a :href="`${apiUrl}/signin/discord`"><fa :icon="faDiscord"/> {{ $t('signinWith', { x: 'Discord' }) }}</a></p> </div> <div class="2fa-signin" v-if="totpLogin" :class="{ securityKeys: user && user.securityKeys }"> <div v-if="user && user.securityKeys" class="twofa-group tap-group"> - <p>{{ $t('tap-key') }}</p> + <p>{{ $t('tapSecurityKey') }}</p> <mk-button @click="queryKey" v-if="!queryingKey"> - {{ $t('@.error.retry') }} + {{ $t('retry') }} </mk-button> </div> <div class="or-hr" v-if="user && user.securityKeys"> @@ -46,6 +46,7 @@ import Vue from 'vue'; import { toUnicode } from 'punycode'; import { faLock, faGavel } from '@fortawesome/free-solid-svg-icons'; +import { faTwitter, faDiscord, faGithub } from '@fortawesome/free-brands-svg-icons'; import MkButton from './ui/button.vue'; import MkInput from './ui/input.vue'; import i18n from '../i18n'; @@ -86,7 +87,7 @@ export default Vue.extend({ credential: null, challengeData: null, queryingKey: false, - faLock, faGavel + faLock, faGavel, faTwitter, faDiscord, faGithub }; }, diff --git a/src/client/components/signup.vue b/src/client/components/signup.vue index 47c32a3364..b821af396c 100644 --- a/src/client/components/signup.vue +++ b/src/client/components/signup.vue @@ -2,9 +2,8 @@ <form class="mk-signup" @submit.prevent="onSubmit" :autocomplete="Math.random()"> <template v-if="meta"> <mk-input v-if="meta.disableRegistration" v-model="invitationCode" type="text" :autocomplete="Math.random()" spellcheck="false" required> - <span>{{ $t('invitation-code') }}</span> - <template #prefix><fa icon="id-card-alt"/></template> - <template #desc v-html="this.$t('invitation-info').replace('{}', 'mailto:' + meta.maintainerEmail)"></template> + <span>{{ $t('invitationCode') }}</span> + <template #prefix><fa :icon="faKey"/></template> </mk-input> <mk-input v-model="username" type="text" pattern="^[a-zA-Z0-9_]{1,20}$" :autocomplete="Math.random()" spellcheck="false" required @input="onChangeUsername"> <span>{{ $t('username') }}</span> @@ -15,26 +14,26 @@ <span v-if="usernameState == 'ok'" style="color:#3CB7B5"><fa :icon="faCheck" fixed-width/> {{ $t('available') }}</span> <span v-if="usernameState == 'unavailable'" style="color:#FF1161"><fa :icon="faExclamationTriangle" fixed-width/> {{ $t('unavailable') }}</span> <span v-if="usernameState == 'error'" style="color:#FF1161"><fa :icon="faExclamationTriangle" fixed-width/> {{ $t('error') }}</span> - <span v-if="usernameState == 'invalid-format'" style="color:#FF1161"><fa :icon="faExclamationTriangle" fixed-width/> {{ $t('invalid-format') }}</span> - <span v-if="usernameState == 'min-range'" style="color:#FF1161"><fa :icon="faExclamationTriangle" fixed-width/> {{ $t('too-short') }}</span> - <span v-if="usernameState == 'max-range'" style="color:#FF1161"><fa :icon="faExclamationTriangle" fixed-width/> {{ $t('too-long') }}</span> + <span v-if="usernameState == 'invalid-format'" style="color:#FF1161"><fa :icon="faExclamationTriangle" fixed-width/> {{ $t('usernameInvalidFormat') }}</span> + <span v-if="usernameState == 'min-range'" style="color:#FF1161"><fa :icon="faExclamationTriangle" fixed-width/> {{ $t('tooShort') }}</span> + <span v-if="usernameState == 'max-range'" style="color:#FF1161"><fa :icon="faExclamationTriangle" fixed-width/> {{ $t('tooLong') }}</span> </template> </mk-input> <mk-input v-model="password" type="password" :autocomplete="Math.random()" required @input="onChangePassword"> <span>{{ $t('password') }}</span> <template #prefix><fa :icon="faLock"/></template> <template #desc> - <p v-if="passwordStrength == 'low'" style="color:#FF1161"><fa :icon="faExclamationTriangle" fixed-width/> {{ $t('weak-password') }}</p> - <p v-if="passwordStrength == 'medium'" style="color:#3CB7B5"><fa :icon="faCheck" fixed-width/> {{ $t('normal-password') }}</p> - <p v-if="passwordStrength == 'high'" style="color:#3CB7B5"><fa :icon="faCheck" fixed-width/> {{ $t('strong-password') }}</p> + <p v-if="passwordStrength == 'low'" style="color:#FF1161"><fa :icon="faExclamationTriangle" fixed-width/> {{ $t('weakPassword') }}</p> + <p v-if="passwordStrength == 'medium'" style="color:#3CB7B5"><fa :icon="faCheck" fixed-width/> {{ $t('normalPassword') }}</p> + <p v-if="passwordStrength == 'high'" style="color:#3CB7B5"><fa :icon="faCheck" fixed-width/> {{ $t('strongPassword') }}</p> </template> </mk-input> <mk-input v-model="retypedPassword" type="password" :autocomplete="Math.random()" required @input="onChangePasswordRetype"> <span>{{ $t('password') }} ({{ $t('retype') }})</span> <template #prefix><fa :icon="faLock"/></template> <template #desc> - <p v-if="passwordRetypeState == 'match'" style="color:#3CB7B5"><fa :icon="faCheck" fixed-width/> {{ $t('password-matched') }}</p> - <p v-if="passwordRetypeState == 'not-match'" style="color:#FF1161"><fa :icon="faExclamationTriangle" fixed-width/> {{ $t('password-not-matched') }}</p> + <p v-if="passwordRetypeState == 'match'" style="color:#3CB7B5"><fa :icon="faCheck" fixed-width/> {{ $t('passwordMatched') }}</p> + <p v-if="passwordRetypeState == 'not-match'" style="color:#FF1161"><fa :icon="faExclamationTriangle" fixed-width/> {{ $t('passwordNotMatched') }}</p> </template> </mk-input> <mk-switch v-model="ToSAgreement" v-if="meta.tosUrl"> @@ -50,7 +49,7 @@ <script lang="ts"> import Vue from 'vue'; -import { faLock, faExclamationTriangle, faSpinner, faCheck } from '@fortawesome/free-solid-svg-icons'; +import { faLock, faExclamationTriangle, faSpinner, faCheck, faKey } from '@fortawesome/free-solid-svg-icons'; const getPasswordStrength = require('syuilo-password-strength'); import { toUnicode } from 'punycode'; import i18n from '../i18n'; @@ -81,7 +80,7 @@ export default Vue.extend({ passwordRetypeState: null, submitting: false, ToSAgreement: false, - faLock, faExclamationTriangle, faSpinner, faCheck + faLock, faExclamationTriangle, faSpinner, faCheck, faKey } }, @@ -175,7 +174,7 @@ export default Vue.extend({ this.$root.dialog({ type: 'error', - text: this.$t('some-error') + text: this.$t('error') }); if (this.meta.enableRecaptcha) { diff --git a/src/client/components/time.vue b/src/client/components/time.vue index 922067b4d5..6d092cf4f8 100644 --- a/src/client/components/time.vue +++ b/src/client/components/time.vue @@ -48,7 +48,7 @@ export default Vue.extend({ ago >= 10 ? this.$t('_ago.secondsAgo', { n: (~~(ago % 60)).toString() }) : ago >= -1 ? this.$t('_ago.justNow') : ago < -1 ? this.$t('_ago.future') : - this.$t('@.time.unknown')); + this.$t('_ago.unknown')); } }, created() { diff --git a/src/client/components/user-list.vue b/src/client/components/user-list.vue index a0c16266eb..dbd00f7fbb 100644 --- a/src/client/components/user-list.vue +++ b/src/client/components/user-list.vue @@ -23,7 +23,7 @@ <mk-follow-button class="koudoku-button" v-if="$store.getters.isSignedIn && user.id != $store.state.i.id" :user="user" mini/> </div> <button class="more" :class="{ fetching: moreFetching }" v-if="more" @click="fetchMore()" :disabled="moreFetching"> - <template v-if="moreFetching"><fa icon="spinner" pulse fixed-width/></template>{{ moreFetching ? $t('@.loading') : $t('@.load-more') }} + <template v-if="moreFetching"><fa icon="spinner" pulse fixed-width/></template>{{ moreFetching ? $t('loading') : $t('loadMore') }} </button> </div> </mk-container> |