diff options
| author | syuilo <syuilotan@yahoo.co.jp> | 2018-11-27 01:21:16 +0900 |
|---|---|---|
| committer | syuilo <syuilotan@yahoo.co.jp> | 2018-11-27 01:21:16 +0900 |
| commit | 7ed50b90bdd33b7bbc9101dd3eb38ef6359c0bf0 (patch) | |
| tree | a78a7b810476a1fe8c8889bd6dc8cdbe508fbc3e | |
| parent | No caching /api/ (#3411) (diff) | |
| download | misskey-7ed50b90bdd33b7bbc9101dd3eb38ef6359c0bf0.tar.gz misskey-7ed50b90bdd33b7bbc9101dd3eb38ef6359c0bf0.tar.bz2 misskey-7ed50b90bdd33b7bbc9101dd3eb38ef6359c0bf0.zip | |
[Client] Resolve #3323
| -rw-r--r-- | locales/ja-JP.yml | 6 | ||||
| -rw-r--r-- | src/client/app/admin/views/instance.vue | 9 |
2 files changed, 8 insertions, 7 deletions
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index bec810a53f..2395339986 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -1092,17 +1092,17 @@ admin/views/instance.vue: recaptcha-site-key: "reCAPTCHA site key" recaptcha-secret-key: "reCAPTCHA secret key" twitter-integration-config: "Twitter連携の設定" - twitter-integration-info: "コールバックURLは /api/tw/cb に設定します。" + twitter-integration-info: "コールバックURLは {url} に設定します。" enable-twitter-integration: "Twitter連携を有効にする" twitter-integration-consumer-key: "Consumer key" twitter-integration-consumer-secret: "Consumer secret" github-integration-config: "GitHub連携の設定" - github-integration-info: "コールバックURLは /api/gh/cb に設定します。" + github-integration-info: "コールバックURLは {url} に設定します。" enable-github-integration: "GitHub連携を有効にする" github-integration-client-id: "Client ID" github-integration-client-secret: "Client Secret" discord-integration-config: "Discord連携の設定" - discord-integration-info: "コールバックURLは /api/dc/cb に設定します。" + discord-integration-info: "コールバックURLは {url} に設定します。" enable-discord-integration: "Discord連携を有効にする" discord-integration-client-id: "Client ID" discord-integration-client-secret: "Client Secret" diff --git a/src/client/app/admin/views/instance.vue b/src/client/app/admin/views/instance.vue index 88738717a4..da27b1e470 100644 --- a/src/client/app/admin/views/instance.vue +++ b/src/client/app/admin/views/instance.vue @@ -69,7 +69,7 @@ <div slot="title"><fa :icon="['fab', 'twitter']"/> {{ $t('twitter-integration-config') }}</div> <section> <ui-switch v-model="enableTwitterIntegration">{{ $t('enable-twitter-integration') }}</ui-switch> - <ui-info>{{ $t('twitter-integration-info') }}</ui-info> + <ui-info>{{ $t('twitter-integration-info', { url: `${url}/api/tw/cb` }) }}</ui-info> <ui-input v-model="twitterConsumerKey" :disabled="!enableTwitterIntegration"><i slot="icon"><fa icon="key"/></i>{{ $t('twitter-integration-consumer-key') }}</ui-input> <ui-input v-model="twitterConsumerSecret" :disabled="!enableTwitterIntegration"><i slot="icon"><fa icon="key"/></i>{{ $t('twitter-integration-consumer-secret') }}</ui-input> <ui-button @click="updateMeta">{{ $t('save') }}</ui-button> @@ -80,7 +80,7 @@ <div slot="title"><fa :icon="['fab', 'github']"/> {{ $t('github-integration-config') }}</div> <section> <ui-switch v-model="enableGithubIntegration">{{ $t('enable-github-integration') }}</ui-switch> - <ui-info>{{ $t('github-integration-info') }}</ui-info> + <ui-info>{{ $t('github-integration-info', { url: `${url}/api/gh/cb` }) }}</ui-info> <ui-input v-model="githubClientId" :disabled="!enableGithubIntegration"><i slot="icon"><fa icon="key"/></i>{{ $t('github-integration-client-id') }}</ui-input> <ui-input v-model="githubClientSecret" :disabled="!enableGithubIntegration"><i slot="icon"><fa icon="key"/></i>{{ $t('github-integration-client-secret') }}</ui-input> <ui-button @click="updateMeta">{{ $t('save') }}</ui-button> @@ -91,7 +91,7 @@ <div slot="title"><fa :icon="['fab', 'discord']"/> {{ $t('discord-integration-config') }}</div> <section> <ui-switch v-model="enableDiscordIntegration">{{ $t('enable-discord-integration') }}</ui-switch> - <ui-info>{{ $t('discord-integration-info') }}</ui-info> + <ui-info>{{ $t('discord-integration-info', { url: `${url}/api/dc/cb` }) }}</ui-info> <ui-input v-model="discordClientId" :disabled="!enableDiscordIntegration"><i slot="icon"><fa icon="key"/></i>{{ $t('discord-integration-client-id') }}</ui-input> <ui-input v-model="discordClientSecret" :disabled="!enableDiscordIntegration"><i slot="icon"><fa icon="key"/></i>{{ $t('discord-integration-client-secret') }}</ui-input> <ui-button @click="updateMeta">{{ $t('save') }}</ui-button> @@ -103,7 +103,7 @@ <script lang="ts"> import Vue from 'vue'; import i18n from '../../i18n'; -import { host } from '../../config'; +import { url, host } from '../../config'; import { toUnicode } from 'punycode'; import { faHeadset, faShieldAlt, faGhost, faUserPlus } from '@fortawesome/free-solid-svg-icons'; @@ -112,6 +112,7 @@ export default Vue.extend({ data() { return { + url, host: toUnicode(host), maintainerName: null, maintainerEmail: null, |