added canIEmail help so people can check if the elements used are email supported
Some checks failed
API report (misskey.js) / report (pull_request) Successful in 2m39s
Lint / pnpm_install (pull_request) Successful in 2m12s
Test (backend) / unit (22.x) (pull_request) Successful in 7m4s
Test (backend) / e2e (22.x) (pull_request) Failing after 8m26s
Test (frontend) / vitest (22.x) (pull_request) Successful in 3m14s
Test (misskey.js) / test (22.x) (pull_request) Successful in 2m53s
Test (production install and build) / production (22.x) (pull_request) Successful in 2m47s
Test (backend) / validate-api-json (22.x) (pull_request) Successful in 4m31s
Lint / lint (backend) (pull_request) Failing after 2m21s
Lint / lint (frontend) (pull_request) Failing after 8m34s
Lint / lint (misskey-js) (pull_request) Successful in 2m22s
Lint / lint (sw) (pull_request) Successful in 2m10s
Lint / typecheck (backend) (pull_request) Failing after 2m47s
Lint / typecheck (misskey-js) (pull_request) Successful in 3m0s
Some checks failed
API report (misskey.js) / report (pull_request) Successful in 2m39s
Lint / pnpm_install (pull_request) Successful in 2m12s
Test (backend) / unit (22.x) (pull_request) Successful in 7m4s
Test (backend) / e2e (22.x) (pull_request) Failing after 8m26s
Test (frontend) / vitest (22.x) (pull_request) Successful in 3m14s
Test (misskey.js) / test (22.x) (pull_request) Successful in 2m53s
Test (production install and build) / production (22.x) (pull_request) Successful in 2m47s
Test (backend) / validate-api-json (22.x) (pull_request) Successful in 4m31s
Lint / lint (backend) (pull_request) Failing after 2m21s
Lint / lint (frontend) (pull_request) Failing after 8m34s
Lint / lint (misskey-js) (pull_request) Successful in 2m22s
Lint / lint (sw) (pull_request) Successful in 2m10s
Lint / typecheck (backend) (pull_request) Failing after 2m47s
Lint / typecheck (misskey-js) (pull_request) Successful in 3m0s
This commit is contained in:
parent
139341d866
commit
6d3c66f8c1
4 changed files with 15 additions and 2 deletions
|
@ -677,7 +677,8 @@ smtpUser: "Username"
|
||||||
smtpPass: "Password"
|
smtpPass: "Password"
|
||||||
customEmailTemplate: {
|
customEmailTemplate: {
|
||||||
title: "Custom Email Template (Advanced)",
|
title: "Custom Email Template (Advanced)",
|
||||||
description: "This allows you to modify the default email template that is used for any automated sent emails."
|
description: "This allows you to modify the default email template that is used for any automated sent emails.",
|
||||||
|
reference: "Please refer to {link} to check if what you want to use is supported by email.",
|
||||||
}
|
}
|
||||||
emptyToDisableSmtpAuth: "Leave username and password empty to disable SMTP authentication"
|
emptyToDisableSmtpAuth: "Leave username and password empty to disable SMTP authentication"
|
||||||
smtpSecure: "Use implicit SSL/TLS for SMTP connections"
|
smtpSecure: "Use implicit SSL/TLS for SMTP connections"
|
||||||
|
|
4
locales/index.d.ts
vendored
4
locales/index.d.ts
vendored
|
@ -2729,6 +2729,10 @@ export interface Locale extends ILocale {
|
||||||
* これにより、自動送信メールに使用されるデフォルトのメールテンプレートを変更することができます。
|
* これにより、自動送信メールに使用されるデフォルトのメールテンプレートを変更することができます。
|
||||||
*/
|
*/
|
||||||
"description": string;
|
"description": string;
|
||||||
|
/**
|
||||||
|
* {link}を参照して、使用したいものが電子メールでサポートされているかどうかを確認してください。
|
||||||
|
*/
|
||||||
|
"reference": ParameterizedString<"link">;
|
||||||
};
|
};
|
||||||
/**
|
/**
|
||||||
* ユーザー名とパスワードを空欄にすることで、SMTP認証を無効化出来ます
|
* ユーザー名とパスワードを空欄にすることで、SMTP認証を無効化出来ます
|
||||||
|
|
|
@ -678,7 +678,8 @@ smtpUser: "ユーザー名"
|
||||||
smtpPass: "パスワード"
|
smtpPass: "パスワード"
|
||||||
customEmailTemplate: {
|
customEmailTemplate: {
|
||||||
title: "カスタムメールテンプレート(上級者向け)",
|
title: "カスタムメールテンプレート(上級者向け)",
|
||||||
description: "これにより、自動送信メールに使用されるデフォルトのメールテンプレートを変更することができます。"
|
description: "これにより、自動送信メールに使用されるデフォルトのメールテンプレートを変更することができます。",
|
||||||
|
reference: "{link}を参照して、使用したいものが電子メールでサポートされているかどうかを確認してください。",
|
||||||
}
|
}
|
||||||
emptyToDisableSmtpAuth: "ユーザー名とパスワードを空欄にすることで、SMTP認証を無効化出来ます"
|
emptyToDisableSmtpAuth: "ユーザー名とパスワードを空欄にすることで、SMTP認証を無効化出来ます"
|
||||||
smtpSecure: "SMTP 接続に暗黙的なSSL/TLSを使用する"
|
smtpSecure: "SMTP 接続に暗黙的なSSL/TLSを使用する"
|
||||||
|
|
|
@ -51,6 +51,13 @@ SPDX-License-Identifier: AGPL-3.0-only
|
||||||
<MkCodeEditor v-model="emailTemplate" lang="html">
|
<MkCodeEditor v-model="emailTemplate" lang="html">
|
||||||
<template #label>{{ i18n.ts.customEmailTemplate.description }}</template>
|
<template #label>{{ i18n.ts.customEmailTemplate.description }}</template>
|
||||||
</MkCodeEditor>
|
</MkCodeEditor>
|
||||||
|
<I18n :src="i18n.ts.customEmailTemplate.reference" tag="small">
|
||||||
|
<template #link>
|
||||||
|
<a href="https://www.caniemail.com/">https://www.caniemail.com/</a>
|
||||||
|
</template>
|
||||||
|
</I18n>
|
||||||
|
|
||||||
|
<!-- <span>{{i18n.ts.customEmailTemplate.reference}}</span>-->
|
||||||
</div>
|
</div>
|
||||||
</MkFolder>
|
</MkFolder>
|
||||||
</div>
|
</div>
|
||||||
|
|
Loading…
Reference in a new issue