diff options
| author | nexryai <61890205+nexryai@users.noreply.github.com> | 2023-03-04 19:19:55 +0900 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-03-04 19:19:55 +0900 |
| commit | 72b315491bfc000a433f7cbd4cbcc6df7fedd5d4 (patch) | |
| tree | fa7921e6960e89d9cd844f7b1996bfd6c63ce533 | |
| parent | chore: Replace tab with space (#10185) (diff) | |
| download | sharkey-72b315491bfc000a433f7cbd4cbcc6df7fedd5d4.tar.gz sharkey-72b315491bfc000a433f7cbd4cbcc6df7fedd5d4.tar.bz2 sharkey-72b315491bfc000a433f7cbd4cbcc6df7fedd5d4.zip | |
Fix: If mail delivery is disabled on the server, make the settings page indicate this (#10191)
Co-authored-by: syuilo <Syuilotan@yahoo.co.jp>
| -rw-r--r-- | locales/ja-JP.yml | 1 | ||||
| -rw-r--r-- | packages/frontend/src/pages/settings/email.vue | 7 |
2 files changed, 7 insertions, 1 deletions
diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index ef70469935..f94133c19f 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -956,6 +956,7 @@ exploreOtherServers: "他のサーバーを探す" letsLookAtTimeline: "タイムラインを見てみる" disableFederationWarn: "連合が無効になっています。無効にしても投稿が非公開にはなりません。ほとんどの場合、このオプションを有効にする必要はありません。" invitationRequiredToRegister: "現在このサーバーは招待制です。招待コードをお持ちの方のみ登録できます。" +emailNotSupported: "このサーバーではメール配信はサポートされていません" postToTheChannel: "チャンネルに投稿" _achievements: diff --git a/packages/frontend/src/pages/settings/email.vue b/packages/frontend/src/pages/settings/email.vue index 1734dcfe42..b1e6f223b6 100644 --- a/packages/frontend/src/pages/settings/email.vue +++ b/packages/frontend/src/pages/settings/email.vue @@ -1,5 +1,5 @@ <template> -<div class="_gaps_m"> +<div v-if="instance.enableEmail" class="_gaps_m"> <FormSection first> <template #label>{{ i18n.ts.emailAddress }}</template> <MkInput v-model="emailAddress" type="email" manual-save> @@ -37,17 +37,22 @@ </div> </FormSection> </div> +<div v-if="!instance.enableEmail" class="_gaps_m"> + <MkInfo>{{ i18n.ts.emailNotSupported }}</MkInfo> +</div> </template> <script lang="ts" setup> import { onMounted, ref, watch } from 'vue'; import FormSection from '@/components/form/section.vue'; +import MkInfo from '@/components/MkInfo.vue'; import MkInput from '@/components/MkInput.vue'; import MkSwitch from '@/components/MkSwitch.vue'; import * as os from '@/os'; import { $i } from '@/account'; import { i18n } from '@/i18n'; import { definePageMetadata } from '@/scripts/page-metadata'; +import { instance } from '@/instance'; const emailAddress = ref($i!.email); |