From beaf92c5e3c9b59598120c2106a93709b6a2406a Mon Sep 17 00:00:00 2001 From: Marc Jauvin Date: Sat, 2 Apr 2022 17:41:39 -0400 Subject: [PATCH 1/8] fix settings in line with new mail config structure --- modules/system/models/MailSetting.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/modules/system/models/MailSetting.php b/modules/system/models/MailSetting.php index f87c864415..b25f672ce5 100644 --- a/modules/system/models/MailSetting.php +++ b/modules/system/models/MailSetting.php @@ -95,32 +95,32 @@ public static function applyConfigValues() { $config = App::make('config'); $settings = self::instance(); - $config->set('mail.driver', $settings->send_mode); + $config->set('mail.default', $settings->send_mode); $config->set('mail.from.name', $settings->sender_name); $config->set('mail.from.address', $settings->sender_email); switch ($settings->send_mode) { case self::MODE_SMTP: - $config->set('mail.host', $settings->smtp_address); - $config->set('mail.port', $settings->smtp_port); + $config->set('mail.mailers.smtp.host', $settings->smtp_address); + $config->set('mail.mailers.smtp.port', $settings->smtp_port); if ($settings->smtp_authorization) { - $config->set('mail.username', $settings->smtp_user); - $config->set('mail.password', $settings->smtp_password); + $config->set('mail.mailers.smtp.username', $settings->smtp_user); + $config->set('mail.mailers.smtp.password', $settings->smtp_password); } else { - $config->set('mail.username', null); - $config->set('mail.password', null); + $config->set('mail.mailers.smtp.username', null); + $config->set('mail.mailers.smtp.password', null); } if ($settings->smtp_encryption) { - $config->set('mail.encryption', $settings->smtp_encryption); + $config->set('mail.mailers.smtp.encryption', $settings->smtp_encryption); } else { - $config->set('mail.encryption', null); + $config->set('mail.mailers.smtp.encryption', null); } break; case self::MODE_SENDMAIL: - $config->set('mail.sendmail', $settings->sendmail_path); + $config->set('mail.mailers.sendmail.path', $settings->sendmail_path); break; case self::MODE_MAILGUN: From 84fabdc4de8dc8b40a51f634c8eebcb157f663f5 Mon Sep 17 00:00:00 2001 From: Marc Jauvin Date: Sun, 3 Apr 2022 08:26:18 -0400 Subject: [PATCH 2/8] add missing "mail" driver --- config/mail.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/config/mail.php b/config/mail.php index 03eae82251..8c27086d94 100644 --- a/config/mail.php +++ b/config/mail.php @@ -52,6 +52,9 @@ 'postmark' => [ 'transport' => 'postmark', ], + 'mail' => [ + 'transport' => 'mail', + ], 'sendmail' => [ 'path' => env('MAIL_SENDMAIL_PATH', '/usr/sbin/sendmail -t -i'), 'transport' => 'sendmail', From a68b57385bb45244dbbc7e46d4e34653d6aa7681 Mon Sep 17 00:00:00 2001 From: Marc Jauvin Date: Sun, 3 Apr 2022 08:49:21 -0400 Subject: [PATCH 3/8] only support native Laravel drivers by default --- modules/system/models/MailSetting.php | 10 ---------- 1 file changed, 10 deletions(-) diff --git a/modules/system/models/MailSetting.php b/modules/system/models/MailSetting.php index b25f672ce5..7d817c854f 100644 --- a/modules/system/models/MailSetting.php +++ b/modules/system/models/MailSetting.php @@ -85,9 +85,7 @@ public function getSendModeOptions() static::MODE_SENDMAIL => 'system::lang.mail.sendmail', static::MODE_SMTP => 'system::lang.mail.smtp', static::MODE_MAILGUN => 'system::lang.mail.mailgun', - static::MODE_MANDRILL => 'system::lang.mail.mandrill', static::MODE_SES => 'system::lang.mail.ses', - static::MODE_SPARKPOST => 'system::lang.mail.sparkpost', ]; } @@ -128,19 +126,11 @@ public static function applyConfigValues() $config->set('services.mailgun.secret', $settings->mailgun_secret); break; - case self::MODE_MANDRILL: - $config->set('services.mandrill.secret', $settings->mandrill_secret); - break; - case self::MODE_SES: $config->set('services.ses.key', $settings->ses_key); $config->set('services.ses.secret', $settings->ses_secret); $config->set('services.ses.region', $settings->ses_region); break; - - case self::MODE_SPARKPOST: - $config->set('services.sparkpost.secret', $settings->sparkpost_secret); - break; } } From e3a05aef3994bbb2239525ff877aab54cbdf0c29 Mon Sep 17 00:00:00 2001 From: Marc Jauvin Date: Sun, 3 Apr 2022 08:50:43 -0400 Subject: [PATCH 4/8] also remove associated driver constants --- modules/system/models/MailSetting.php | 2 -- 1 file changed, 2 deletions(-) diff --git a/modules/system/models/MailSetting.php b/modules/system/models/MailSetting.php index 7d817c854f..c74d9bab63 100644 --- a/modules/system/models/MailSetting.php +++ b/modules/system/models/MailSetting.php @@ -18,9 +18,7 @@ class MailSetting extends Model const MODE_SENDMAIL = 'sendmail'; const MODE_SMTP = 'smtp'; const MODE_MAILGUN = 'mailgun'; - const MODE_MANDRILL = 'mandrill'; const MODE_SES = 'ses'; - const MODE_SPARKPOST = 'sparkpost'; /** * @var array Behaviors implemented by this model. From 300f5e487f1cd8f32dee011b000e2a0ae19b457a Mon Sep 17 00:00:00 2001 From: Marc Jauvin Date: Mon, 4 Apr 2022 09:15:39 -0400 Subject: [PATCH 5/8] move mail drivers into their own plugins (mailgun, sparkpost, mandrill --- modules/system/models/MailSetting.php | 7 ---- modules/system/models/mailsetting/fields.yaml | 39 ------------------- 2 files changed, 46 deletions(-) diff --git a/modules/system/models/MailSetting.php b/modules/system/models/MailSetting.php index c74d9bab63..1240c5129d 100644 --- a/modules/system/models/MailSetting.php +++ b/modules/system/models/MailSetting.php @@ -17,7 +17,6 @@ class MailSetting extends Model const MODE_MAIL = 'mail'; const MODE_SENDMAIL = 'sendmail'; const MODE_SMTP = 'smtp'; - const MODE_MAILGUN = 'mailgun'; const MODE_SES = 'ses'; /** @@ -82,7 +81,6 @@ public function getSendModeOptions() static::MODE_MAIL => 'system::lang.mail.php_mail', static::MODE_SENDMAIL => 'system::lang.mail.sendmail', static::MODE_SMTP => 'system::lang.mail.smtp', - static::MODE_MAILGUN => 'system::lang.mail.mailgun', static::MODE_SES => 'system::lang.mail.ses', ]; } @@ -119,11 +117,6 @@ public static function applyConfigValues() $config->set('mail.mailers.sendmail.path', $settings->sendmail_path); break; - case self::MODE_MAILGUN: - $config->set('services.mailgun.domain', $settings->mailgun_domain); - $config->set('services.mailgun.secret', $settings->mailgun_secret); - break; - case self::MODE_SES: $config->set('services.ses.key', $settings->ses_key); $config->set('services.ses.secret', $settings->ses_secret); diff --git a/modules/system/models/mailsetting/fields.yaml b/modules/system/models/mailsetting/fields.yaml index 44c6c9a6f6..1948a3d487 100644 --- a/modules/system/models/mailsetting/fields.yaml +++ b/modules/system/models/mailsetting/fields.yaml @@ -96,35 +96,6 @@ tabs: field: send_mode condition: value[sendmail] - mailgun_domain: - label: system::lang.mail.mailgun_domain - commentAbove: system::lang.mail.mailgun_domain_comment - tab: system::lang.mail.general - trigger: - action: show - field: send_mode - condition: value[mailgun] - - mailgun_secret: - label: system::lang.mail.mailgun_secret - commentAbove: system::lang.mail.mailgun_secret_comment - tab: system::lang.mail.general - type: sensitive - trigger: - action: show - field: send_mode - condition: value[mailgun] - - mandrill_secret: - label: system::lang.mail.mandrill_secret - commentAbove: system::lang.mail.mandrill_secret_comment - tab: system::lang.mail.general - type: sensitive - trigger: - action: show - field: send_mode - condition: value[mandrill] - ses_key: label: system::lang.mail.ses_key commentAbove: system::lang.mail.ses_key_comment @@ -155,13 +126,3 @@ tabs: action: show field: send_mode condition: value[ses] - - sparkpost_secret: - label: system::lang.mail.sparkpost_secret - commentAbove: system::lang.mail.sparkpost_secret_comment - type: sensitive - tab: system::lang.mail.general - trigger: - action: show - field: send_mode - condition: value[sparkpost] From b0927273c6011893cdcb380db62347f1e3fa1815 Mon Sep 17 00:00:00 2001 From: Marc Jauvin Date: Mon, 4 Apr 2022 13:17:06 -0400 Subject: [PATCH 6/8] move other mail drivers to external plugins --- modules/system/lang/be/lang.php | 10 ---------- modules/system/lang/bg/lang.php | 10 ---------- modules/system/lang/ca/lang.php | 10 ---------- modules/system/lang/cs/lang.php | 10 ---------- modules/system/lang/da/lang.php | 10 ---------- modules/system/lang/de/lang.php | 10 ---------- modules/system/lang/el/lang.php | 10 ---------- modules/system/lang/en/lang.php | 14 +------------- modules/system/lang/es/lang.php | 10 ---------- modules/system/lang/et/lang.php | 10 ---------- modules/system/lang/fa/lang.php | 13 ------------- modules/system/lang/fi/lang.php | 10 ---------- modules/system/lang/fr/lang.php | 14 +------------- modules/system/lang/hu/lang.php | 13 ------------- modules/system/lang/id/lang.php | 8 -------- modules/system/lang/it/lang.php | 10 ---------- modules/system/lang/ja/lang.php | 4 ---- modules/system/lang/kr/lang.php | 7 ------- modules/system/lang/lt/lang.php | 10 ---------- modules/system/lang/lv/lang.php | 13 ------------- modules/system/lang/nb-no/lang.php | 10 ---------- modules/system/lang/nl/lang.php | 13 ------------- modules/system/lang/pl/lang.php | 10 ---------- modules/system/lang/pt-br/lang.php | 13 ------------- modules/system/lang/pt-pt/lang.php | 10 ---------- modules/system/lang/ro/lang.php | 13 ------------- modules/system/lang/rs/lang.php | 13 ------------- modules/system/lang/ru/lang.php | 13 ------------- modules/system/lang/sk/lang.php | 10 ---------- modules/system/lang/sl/lang.php | 13 ------------- modules/system/lang/sv/lang.php | 10 ---------- modules/system/lang/th/lang.php | 10 ---------- modules/system/lang/tr/lang.php | 10 ---------- modules/system/lang/uk/lang.php | 13 ------------- modules/system/lang/vn/lang.php | 10 ---------- modules/system/lang/zh-cn/lang.php | 10 ---------- modules/system/lang/zh-tw/lang.php | 8 -------- modules/system/models/mailsetting/fields.yaml | 15 +++++---------- 38 files changed, 7 insertions(+), 403 deletions(-) diff --git a/modules/system/lang/be/lang.php b/modules/system/lang/be/lang.php index 31e4b2ee89..17214cfe3d 100644 --- a/modules/system/lang/be/lang.php +++ b/modules/system/lang/be/lang.php @@ -133,14 +133,6 @@ 'sendmail' => "Sendmail", 'sendmail_path' => "Шлях sendmail", 'sendmail_path_comment' => "Калі ласка, укажыце шлях дла праграмы sendmail", - 'mailgun' => "Mailgun", - 'mailgun_domain' => "Дамен Mailgun", - 'mailgun_domain_comment' => "Калі ласка, укажыце імя дамена Mailgun", - 'mailgun_secret' => "Сакрэт Mailgun", - 'mailgun_secret_comment' => "Увядзіце ключ Mailgun API", - 'mandrill' => "Mandrill", - 'mandrill_secret' => "Сакрэт Mandrill", - 'mandrill_secret_comment' => "Увядзіце ключ Mandrill API", 'ses' => "SES", 'ses_key' => "Ключ SES", 'ses_key_comment' => "Увядзіце ключ SES API", @@ -148,8 +140,6 @@ 'ses_secret_comment' => "Увядзіце сакрэтны ключ SES API", 'ses_region' => "Рэгіён SES", 'ses_region_comment' => "Увядзіце рэгіён SES (e.g. us-east-1)", - 'drivers_hint_header' => "Драйверы не ўсталяваныя", - 'drivers_hint_content' => "Гэты метад пошты патрабуе, каб \":plugin\" быў усталяваны да таго, як Вы зможаце адпраўляць пошту" ], 'mail_templates' => [ 'menu_label' => "Шаблоны пошты", diff --git a/modules/system/lang/bg/lang.php b/modules/system/lang/bg/lang.php index f9850254fd..854cb9aeef 100644 --- a/modules/system/lang/bg/lang.php +++ b/modules/system/lang/bg/lang.php @@ -132,16 +132,6 @@ 'sendmail' => 'Sendmail', 'sendmail_path' => 'Sendmail директория', 'sendmail_path_comment' => 'Моля, посочете директория на Sendmail програмата.', - 'mailgun' => 'Mailgun', - 'mailgun_domain' => 'Mailgun домейн', - 'mailgun_domain_comment' => 'Моля, посочете домейна за Mailgun.', - 'mailgun_secret' => 'Mailgun тайна', - 'mailgun_secret_comment' => 'Въведете своя Mailgun API ключ.', - 'mandrill' => 'Mandrill', - 'mandrill_secret' => 'Mandrill тайна', - 'mandrill_secret_comment' => 'Въведете своя Mandrill API ключ.', - 'drivers_hint_header' => 'Няма инсталирани драйвъри.', - 'drivers_hint_content' => 'Този имейл метод изисква добавката ":plugin" да се инсталира преди да можете да изпращате имейл.' ], 'mail_templates' => [ 'menu_label' => 'Имейл шаблони', diff --git a/modules/system/lang/ca/lang.php b/modules/system/lang/ca/lang.php index 71f060aa2c..641e4ac541 100644 --- a/modules/system/lang/ca/lang.php +++ b/modules/system/lang/ca/lang.php @@ -141,14 +141,6 @@ 'sendmail' => 'Sendmail', 'sendmail_path' => 'Ruta de sendmail', 'sendmail_path_comment' => "Si us plau especifica una ruta per l'executable de sendmail.", - 'mailgun' => 'Mailgun', - 'mailgun_domain' => 'Domini de Mailgun', - 'mailgun_domain_comment' => 'Si us plau especifica el nom de domini de Mailgun.', - 'mailgun_secret' => 'Secret de Mailgun', - 'mailgun_secret_comment' => 'Introdueix la teva clau API de Mailgun.', - 'mandrill' => 'Mandrill', - 'mandrill_secret' => 'Secret de Mandrill', - 'mandrill_secret_comment' => 'Introdueix la teva clau API de Mandrill.', 'ses' => 'SES', 'ses_key' => 'Clau de SES', 'ses_key_comment' => 'Introdueix la teva clau API de SES', @@ -156,8 +148,6 @@ 'ses_secret_comment' => "Introdueix el teu secret d'API de SES", 'ses_region' => 'Regió de SES', 'ses_region_comment' => 'Introdueix la teva regió de SES (e.g. us-east-1)', - 'drivers_hint_header' => 'Drivers no instal·lats', - 'drivers_hint_content' => 'Aquest mètode de correu requereix instal·lar el plugin ":plugin" abans de que puguis enviar correu.' ], 'mail_templates' => [ 'menu_label' => 'Plantilles de correu', diff --git a/modules/system/lang/cs/lang.php b/modules/system/lang/cs/lang.php index 7c3e398143..3bc55c8700 100644 --- a/modules/system/lang/cs/lang.php +++ b/modules/system/lang/cs/lang.php @@ -136,14 +136,6 @@ 'sendmail' => 'Sendmail', 'sendmail_path' => 'Sendmail cesta', 'sendmail_path_comment' => 'Zadejte prosím cestu k sendmail programu.', - 'mailgun' => 'Mailgun', - 'mailgun_domain' => 'Mailgun doména (domain)', - 'mailgun_domain_comment' => 'Zadejte doménové jméno (domain name) pro Mailgun.', - 'mailgun_secret' => 'Mailgun tajný klíč (secret)', - 'mailgun_secret_comment' => 'Zadejte váš Mailgun API klíč.', - 'mandrill' => 'Mandrill', - 'mandrill_secret' => 'Mandrill tajný klíč (secret)', - 'mandrill_secret_comment' => 'Zadejte váš Mandrill API klíč.', 'ses' => 'SES', 'ses_key' => 'Klíč SES', 'ses_key_comment' => 'Zadejte váš SES API klíč', @@ -151,8 +143,6 @@ 'ses_secret_comment' => 'Zadejte váš SES API tajný klíč (secret key)', 'ses_region' => 'SES oblast (region)', 'ses_region_comment' => 'Zadejte region SES (např. us-east-1)', - 'drivers_hint_header' => 'Ovladač není nainstalovaný', - 'drivers_hint_content' => 'Tato metoda posílání e-mailů vyžaduje nainstalovaný plugin ":plugin" ještě před odesláním první zprávy.' ], 'mail_templates' => [ 'menu_label' => 'E-mailové šablony', diff --git a/modules/system/lang/da/lang.php b/modules/system/lang/da/lang.php index bb5da711af..197825793e 100644 --- a/modules/system/lang/da/lang.php +++ b/modules/system/lang/da/lang.php @@ -133,14 +133,6 @@ 'sendmail' => 'Sendmail', 'sendmail_path' => 'Sendmail sti', 'sendmail_path_comment' => 'Angiv venligst stien til sendmail programmet.', - 'mailgun' => 'Mailgun', - 'mailgun_domain' => 'Mailgun domæne', - 'mailgun_domain_comment' => 'Angiv venligst Mailgun domænenavnet.', - 'mailgun_secret' => 'Mailgun hemmelighed', - 'mailgun_secret_comment' => 'Angiv din Mailgun API key.', - 'mandrill' => 'Mandrill', - 'mandrill_secret' => 'Mandrill hemmelighed', - 'mandrill_secret_comment' => 'Angiv din Mandrill API key.', 'ses' => 'SES', 'ses_key' => 'SES key', 'ses_key_comment' => 'Angiv din SES API key', @@ -148,8 +140,6 @@ 'ses_secret_comment' => 'Angiv din SES API hemmelige nøgle', 'ses_region' => 'SES region', 'ses_region_comment' => 'Angiv din SES region (feks. us-east-1)', - 'drivers_hint_header' => 'Drivere ikke installerede', - 'drivers_hint_content' => 'Denne mail metode kræver at pluginet ":plugin" er installeret, før du kan sende mail.' ], 'mail_templates' => [ 'menu_label' => 'Mail skabeloner', diff --git a/modules/system/lang/de/lang.php b/modules/system/lang/de/lang.php index 130b000e4e..4fe2158ed8 100644 --- a/modules/system/lang/de/lang.php +++ b/modules/system/lang/de/lang.php @@ -89,16 +89,6 @@ 'sendmail' => 'Sendmail', 'sendmail_path' => 'Sendmail Pfad', 'sendmail_path_comment' => 'Bitte gib den (absoluten) Pfad zum Sendmail Programm an.', - 'mailgun' => 'Mailgun', - 'mailgun_domain' => 'Mailgun-Domain', - 'mailgun_domain_comment' => 'Bitte gib die Mailgun-Domain an.', - 'mailgun_secret' => 'Mailgun-Schlüssel', - 'mailgun_secret_comment' => 'Gib Deinen Mailgun-API-Schlüssel an.', - 'mandrill' => 'Mandrill', - 'mandrill_secret' => 'Mandrill-Schlüssel', - 'mandrill_secret_comment' => 'Gib Deinen Mandrill-API-Schlüssel an.', - 'drivers_hint_header' => 'Treiber nicht installiert.', - 'drivers_hint_content' => 'Für diese Mail-Methode muss das Plugin ":plugin" installiert werden, bevor Du Mails verschicken kannst.' ], 'mail_templates' => [ 'menu_label' => 'Mail-Vorlagen', diff --git a/modules/system/lang/el/lang.php b/modules/system/lang/el/lang.php index 172ca0a626..a01ff7a4a5 100644 --- a/modules/system/lang/el/lang.php +++ b/modules/system/lang/el/lang.php @@ -133,14 +133,6 @@ 'sendmail' => 'Sendmail', 'sendmail_path' => 'Διαδρομή Sendmail', 'sendmail_path_comment' => 'Παρακαλούμε καθορίστε την διαδρομή του λογισμικού Sendmail.', - 'mailgun' => 'Mailgun', - 'mailgun_domain' => 'Mailgun Domain', - 'mailgun_domain_comment' => 'Παρακαλούμε καθορίστε το Domain Name του Mailgun.', - 'mailgun_secret' => 'Mailgun Secret', - 'mailgun_secret_comment' => 'Συμπληρώστε το API κλειδί του Mailgun.', - 'mandrill' => 'Mandrill', - 'mandrill_secret' => 'Mandrill Secret', - 'mandrill_secret_comment' => 'Συμπληρώστε το API κλειδί του Mandrill.', 'ses' => 'SES', 'ses_key' => 'Κλειδί SES', 'ses_key_comment' => 'Συμπληρώστε το API κλειδί του SES', @@ -148,8 +140,6 @@ 'ses_secret_comment' => 'Συμπληρώστε το API απόρρητο κλειδί του SES', 'ses_region' => 'Περιοχή SES', 'ses_region_comment' => 'Συμπληρώστε την περιοχή SES (π.χ. us-east-1)', - 'drivers_hint_header' => 'Οι οδηγοί δεν είναι εγκατεστημένοι', - 'drivers_hint_content' => 'Αυτή η μέθοδος ταχυδρομείου απαιτεί να είναι εγκατεστημένο το πρόσθετο ":plugin" πριν μπορέσετε να αποστείλετε ένα ηλεκτρονικό ταχυδρομείο.', ], 'mail_templates' => [ 'menu_label' => 'Πρότυπα', diff --git a/modules/system/lang/en/lang.php b/modules/system/lang/en/lang.php index 40c70ed940..e71641699c 100644 --- a/modules/system/lang/en/lang.php +++ b/modules/system/lang/en/lang.php @@ -190,14 +190,6 @@ 'sendmail' => 'Sendmail', 'sendmail_path' => 'Sendmail path', 'sendmail_path_comment' => 'Please specify the path of the sendmail program.', - 'mailgun' => 'Mailgun', - 'mailgun_domain' => 'Mailgun domain', - 'mailgun_domain_comment' => 'Please specify the Mailgun domain name.', - 'mailgun_secret' => 'Mailgun secret', - 'mailgun_secret_comment' => 'Enter your Mailgun API key.', - 'mandrill' => 'Mandrill', - 'mandrill_secret' => 'Mandrill secret', - 'mandrill_secret_comment' => 'Enter your Mandrill API key.', 'ses' => 'SES', 'ses_key' => 'SES key', 'ses_key_comment' => 'Enter your SES API key', @@ -205,11 +197,7 @@ 'ses_secret_comment' => 'Enter your SES API secret key', 'ses_region' => 'SES region', 'ses_region_comment' => 'Enter your SES region (e.g. us-east-1)', - 'sparkpost' => 'SparkPost', - 'sparkpost_secret' => 'SparkPost secret', - 'sparkpost_secret_comment' => 'Enter your SparkPost API secret key', - 'drivers_hint_header' => 'Drivers not installed', - 'drivers_hint_content' => 'This mail method requires the plugin ":plugin" be installed before you can send mail.', + 'drivers_hint_content' => 'Please see the documentation for installing other Mail methods.', ], 'mail_templates' => [ 'menu_label' => 'Mail templates', diff --git a/modules/system/lang/es/lang.php b/modules/system/lang/es/lang.php index 97e7e25c2e..f329d0a67b 100644 --- a/modules/system/lang/es/lang.php +++ b/modules/system/lang/es/lang.php @@ -134,14 +134,6 @@ 'sendmail' => 'Sendmail', 'sendmail_path' => 'Directorio de Sendmail', 'sendmail_path_comment' => 'Por favor, especifique la ruta de acceso del programa sendmail.', - 'mailgun' => 'Mailgun', - 'mailgun_domain' => 'Dominio Mailgun', - 'mailgun_domain_comment' => 'Por favor, especifique el nombre de dominio Mailgun.', - 'mailgun_secret' => 'Mailgun secret', - 'mailgun_secret_comment' => 'Introduzca su key de Mailgun API.', - 'mandrill' => 'Mandrill', - 'mandrill_secret' => 'Mandrill secret', - 'mandrill_secret_comment' => 'Introduzca su key de Mandrill API.', 'ses' => 'SES', 'ses_key' => 'SES key', 'ses_key_comment' => 'Introduzca su key de SES API', @@ -149,8 +141,6 @@ 'ses_secret_comment' => 'Introduzca su key de SES API', 'ses_region' => 'Región SES', 'ses_region_comment' => 'Introduzca su región SES (e.g. us-east-1)', - 'drivers_hint_header' => 'Drivers no instalados', - 'drivers_hint_content' => 'Este método de correo electrónico requiere que el plugin ":plugin" este instalado antes de poder enviar correo.' ], 'mail_templates' => [ 'menu_label' => 'Plantillas de Correo', diff --git a/modules/system/lang/et/lang.php b/modules/system/lang/et/lang.php index b6689d0a0d..ade05696f4 100644 --- a/modules/system/lang/et/lang.php +++ b/modules/system/lang/et/lang.php @@ -172,14 +172,6 @@ 'sendmail' => 'Sendmail', 'sendmail_path' => 'Sendmaili asukoht', 'sendmail_path_comment' => 'Palun sisesta sendmail programmi asukoht.', - 'mailgun' => 'Mailgun', - 'mailgun_domain' => 'Mailgun domeen', - 'mailgun_domain_comment' => 'Palun sisesta Mailgun domeeni nimi.', - 'mailgun_secret' => 'Mailgun võti', - 'mailgun_secret_comment' => 'Palun sisesta Mailgun API salajane võti.', - 'mandrill' => 'Mandrill', - 'mandrill_secret' => 'Mandrill võti', - 'mandrill_secret_comment' => 'Palun sisesta Mandrill API salajane võti.', 'ses' => 'Amazon SES', 'ses_key' => 'SES avalik võti', 'ses_key_comment' => 'Palun sisesta SES avalik võti', @@ -187,8 +179,6 @@ 'ses_secret_comment' => 'Palun sisesta SES saljane võti', 'ses_region' => 'SES regioon', 'ses_region_comment' => 'Palun sisesta SES regiooni nimi (nt eu-west-1)', - 'drivers_hint_header' => 'Draivereid pole paigaldatud', - 'drivers_hint_content' => 'See e-posti saatmise meetod nõuab plugina ":plugin" paigaldamist.' ], 'mail_templates' => [ 'menu_label' => 'Kirja mallid', diff --git a/modules/system/lang/fa/lang.php b/modules/system/lang/fa/lang.php index 788c1afee3..d424a43579 100644 --- a/modules/system/lang/fa/lang.php +++ b/modules/system/lang/fa/lang.php @@ -190,14 +190,6 @@ 'sendmail' => 'Sendmail', 'sendmail_path' => 'آدرس برنامه Sendmail', 'sendmail_path_comment' => 'لطفا محل ذخیره نرم افزار sendmail را مشخص نمایید.', - 'mailgun' => 'Mailgun', - 'mailgun_domain' => 'دامنه ی Mailgun', - 'mailgun_domain_comment' => 'لطفا نام دامنه ی Mailgun را وارد نمایید.', - 'mailgun_secret' => 'امنیت Mailgun', - 'mailgun_secret_comment' => 'کلید API ی مربوط به Mailgun را وارد نمایید.', - 'mandrill' => 'Mandrill', - 'mandrill_secret' => 'کلمه عبور Mandrill', - 'mandrill_secret_comment' => 'کلید API ی Mandrill را وارد نمایید.', 'ses' => 'SES', 'ses_key' => 'کلید SES', 'ses_key_comment' => 'کلید Api SES را وارد نمایید', @@ -205,11 +197,6 @@ 'ses_secret_comment' => 'کلمه عبور API SES را وارد نمایید', 'ses_region' => 'منطفه SES', 'ses_region_comment' => 'منطقه خود را برای SES وارد نمایید (برای مثال: us-east-1)', - 'sparkpost' => 'SparkPost', - 'sparkpost_secret' => 'SparkPost رمز ', - 'sparkpost_secret_comment' => 'کلید رمز SparkPost API را وارد کنید', - 'drivers_hint_header' => 'درایور ها نصب نشده اند', - 'drivers_hint_content' => 'این روش برای ارسال پست الکترونیکی به افزونه ":plugin" نیاز دارد. جهت استفاده از این روش لطفا افزونه مورد نیاز را نصب نمایید.' ], 'mail_templates' => [ 'menu_label' => 'قالب های نامه الکترونیکی', diff --git a/modules/system/lang/fi/lang.php b/modules/system/lang/fi/lang.php index 4301923b0b..9808d60dcd 100644 --- a/modules/system/lang/fi/lang.php +++ b/modules/system/lang/fi/lang.php @@ -177,14 +177,6 @@ 'sendmail' => 'Sendmail', 'sendmail_path' => 'Sendmail-polku', 'sendmail_path_comment' => 'Määritä polku sendmail-ohjelmaan.', - 'mailgun' => 'Mailgun', - 'mailgun_domain' => 'Mailgun domain', - 'mailgun_domain_comment' => 'Määritä Mailgun domain nimi.', - 'mailgun_secret' => 'Mailgun sala-avain', - 'mailgun_secret_comment' => 'Syötä sinun Mailgun API sala-avain.', - 'mandrill' => 'Mandrill', - 'mandrill_secret' => 'Mandrill sala-avain', - 'mandrill_secret_comment' => 'Syötä sinun Mandrill API sala-avain.', 'ses' => 'SES', 'ses_key' => 'SES key', 'ses_key_comment' => 'Syötä sinun SES API avain.', @@ -192,8 +184,6 @@ 'ses_secret_comment' => 'Syötä sinun SES API sala-avain.', 'ses_region' => 'SES alue', 'ses_region_comment' => 'Syötä sinun SES alue (esim: us-east-1)', - 'drivers_hint_header' => 'Ajureita ei asennettu', - 'drivers_hint_content' => 'Tämä sähköpostimenetelmä vaatii lisäosan ":plugin" asennettavaksi ennen kuin voit lähettää sähköpostia.' ], 'mail_templates' => [ 'menu_label' => 'Sähköpostipohjat', diff --git a/modules/system/lang/fr/lang.php b/modules/system/lang/fr/lang.php index ee45446d7a..e8d05c7d1a 100644 --- a/modules/system/lang/fr/lang.php +++ b/modules/system/lang/fr/lang.php @@ -149,26 +149,14 @@ 'sendmail' => 'Sendmail', 'sendmail_path' => 'Chemin vers Sendmail', 'sendmail_path_comment' => 'Saisir le chemin du programme sendmail.', - 'mailgun' => 'Mailgun', - 'mailgun_domain' => 'Domaine Mailgun', - 'mailgun_domain_comment' => 'Saisir le nom de domaine Mailgun.', - 'mailgun_secret' => 'Clé secrète Mailgun', - 'mailgun_secret_comment' => 'Saisir votre clé API Mailgun.', - 'mandrill' => 'Mandrill', - 'mandrill_secret' => 'Clé secrète Mandrill', - 'mandrill_secret_comment' => 'Saisir votre clé API Mandrill.', 'ses' => 'SES', 'ses_key' => 'Clé SES', 'ses_key_comment' => 'Saisir votre clé API SES', 'ses_secret' => 'Clé secrète SES', 'ses_secret_comment' => 'Saisir votre clé secrète de l\'API SES', - 'sparkpost' => 'SparkPost', - 'sparkpost_secret' => 'Clé secrète SparkPost', - 'sparkpost_secret_comment' => 'Entrez votre clé secrète de l\'API SparkPost', 'ses_region' => 'Région SES', 'ses_region_comment' => 'Saisir votre région SES (e.g. us-east-1)', - 'drivers_hint_header' => 'Les drivers ne sont pas installés', - 'drivers_hint_content' => 'Cette méthode d\'envoi d\'e-mails nécessite que le plugin ":plugin" soit installé avant de pouvoir envoyer des e-mails.' + 'drivers_hint_content' => 'Veuillez lire la documentation pour des méthodes alternatives.', ], 'mail_templates' => [ 'menu_label' => 'Modèles des e-mails', diff --git a/modules/system/lang/hu/lang.php b/modules/system/lang/hu/lang.php index c234c6f2e8..614e44b49d 100644 --- a/modules/system/lang/hu/lang.php +++ b/modules/system/lang/hu/lang.php @@ -142,26 +142,13 @@ 'sendmail' => 'Sendmail', 'sendmail_path' => 'Elérési út', 'sendmail_path_comment' => 'Adja meg a Sendmail elérését.', - 'mailgun' => 'Mailgun', - 'mailgun_domain' => 'Mailgun tartomány', - 'mailgun_domain_comment' => 'Adja meg a Mailgun tartománynevét.', - 'mailgun_secret' => 'Titkos jelszó', - 'mailgun_secret_comment' => 'Adja meg a Mailgun API kulcsát.', - 'mandrill' => 'Mandrill', - 'mandrill_secret' => 'Titkos jelszó', - 'mandrill_secret_comment' => 'Adja meg Mandrill API kulcsát.', 'ses' => 'SES', 'ses_key' => 'SES kulcs', 'ses_key_comment' => 'Adja meg az API kulcsot', 'ses_secret' => 'SES kód', 'ses_secret_comment' => 'Adja meg az API titkos kulcsot', - 'sparkpost' => 'SparkPost', - 'sparkpost_secret' => 'SparkPost kód', - 'sparkpost_secret_comment' => 'Adja meg az API titkos kulcsot', 'ses_region' => 'SES régió', 'ses_region_comment' => 'Adja meg a régiót (pl. us-east-1)', - 'drivers_hint_header' => 'Hiányzó komponens', - 'drivers_hint_content' => 'A levél kiküldéséhez szükséges, hogy telepítve legyen az ":plugin" nevű bővítmény.' ], 'mail_templates' => [ 'menu_label' => 'Sablonok', diff --git a/modules/system/lang/id/lang.php b/modules/system/lang/id/lang.php index 3c3a3230e3..34181dcd23 100644 --- a/modules/system/lang/id/lang.php +++ b/modules/system/lang/id/lang.php @@ -99,14 +99,6 @@ 'sendmail' => 'Sendmail', 'sendmail_path' => 'Jalur Sendmail', 'sendmail_path_comment' => 'Silakan tentukan jalur ke program sendmail.', - 'mailgun' => 'Mailgun', - 'mailgun_domain' => 'Ranah Mailgun', - 'mailgun_domain_comment' => 'Silakan tentukan nama ranah Mailgun.', - 'mailgun_secret' => 'Mailgun Secret', - 'mailgun_secret_comment' => 'Masukan kunci API Mailgun.', - 'mandrill' => 'Mandrill', - 'mandrill_secret' => 'Mandrill Secret', - 'mandrill_secret_comment' => 'Masukan kunci API Mandrill.' ], 'mail_templates' => [ 'menu_label' => 'Acuan Surat', diff --git a/modules/system/lang/it/lang.php b/modules/system/lang/it/lang.php index 958d6b12be..85b93f0b88 100644 --- a/modules/system/lang/it/lang.php +++ b/modules/system/lang/it/lang.php @@ -133,14 +133,6 @@ 'sendmail' => 'Sendmail', 'sendmail_path' => 'Percorso Sendmail', 'sendmail_path_comment' => 'Inserisci il percorso al servizio sendmail.', - 'mailgun' => 'Mailgun', - 'mailgun_domain' => 'Dominio Mailgun', - 'mailgun_domain_comment' => 'Inserisci il nome dominio Mailgun.', - 'mailgun_secret' => 'Chiave Mailgun', - 'mailgun_secret_comment' => 'Inserisci la tua chiave per l\'utilizzo delle API Mailgun.', - 'mandrill' => 'Mandrill', - 'mandrill_secret' => 'Chiave Mandrill', - 'mandrill_secret_comment' => 'Inserisci la tua chiave per l\'utilizzo delle API Mandrill.', 'ses' => 'SES', 'ses_key' => 'Chiave SES', 'ses_key_comment' => 'Inserisci la chiave per l\'utilizzo delle API SES', @@ -148,8 +140,6 @@ 'ses_secret_comment' => 'Inserisci la chiave privata per l\'utilizzo delle API SES', 'ses_region' => 'Regione SES', 'ses_region_comment' => 'Inserisci la tua regione SES (ad es. us-east-1)', - 'drivers_hint_header' => 'Driver non installati', - 'drivers_hint_content' => 'Questa modalità di invio richiede che il plugin ":plugin" sia installato prima che tu possa inviare messaggi.' ], 'mail_templates' => [ 'menu_label' => 'Modelli di e-mail', diff --git a/modules/system/lang/ja/lang.php b/modules/system/lang/ja/lang.php index a1dc6cd5f2..bd19cf9e99 100644 --- a/modules/system/lang/ja/lang.php +++ b/modules/system/lang/ja/lang.php @@ -154,10 +154,6 @@ 'sendmail' => 'Sendmail', 'sendmail_path' => 'Sendmailパス', 'sendmail_path_comment' => 'Sendmailプログラムへのパスを指定してください。', - 'mailgun' => 'Mailgun', - 'mailgun_domain' => 'Mailgunドメイン', - 'mailgun_domain_comment' => 'Mailgunドメイン名を指定してください。', - 'mailgun_secret' => 'Mailgun APIキー', ], 'mail_templates' => [ 'menu_label' => 'メールテンプレート', diff --git a/modules/system/lang/kr/lang.php b/modules/system/lang/kr/lang.php index b97675a7cf..02cb639e31 100644 --- a/modules/system/lang/kr/lang.php +++ b/modules/system/lang/kr/lang.php @@ -134,11 +134,6 @@ 'sendmail' => 'Sendmail', 'sendmail_path' => 'Sendmail 경로', 'sendmail_path_comment' => 'Sendmail프로그램의 경로를 설정해주세요.', - 'mailgun' => 'Mailgun', - 'mailgun_domain' => 'Mailgun도메인', - 'mailgun_domain_comment' => 'Mailgun도메인명을 설정해주세요.', - 'mailgun_secret' => 'Mailgun API키', - 'mailgun_secret_comment' => 'Mailgun API키를 설정해주세요.', 'ses' => 'SES', 'ses_key' => 'SES 키', 'ses_key_comment' => 'SES API 키를 입력해주세요.', @@ -146,8 +141,6 @@ 'ses_secret_comment' => 'SES API 비밀키를 입력해주세요.', 'ses_region' => 'SES 지역', 'ses_region_comment' => 'SES 지역 (예: us-east-1)', - 'drivers_hint_header' => '드라이버가 설치되지 않았습니다', - 'drivers_hint_content' => '이 전송방법은 ":plugin" 플러그인을 필요로 합니다.' ], 'mail_templates' => [ 'menu_label' => '이메일 템플릿', diff --git a/modules/system/lang/lt/lang.php b/modules/system/lang/lt/lang.php index 5792459009..d0a9306a41 100644 --- a/modules/system/lang/lt/lang.php +++ b/modules/system/lang/lt/lang.php @@ -170,14 +170,6 @@ 'sendmail' => 'Sendmail', 'sendmail_path' => 'Sendmail kelias', 'sendmail_path_comment' => 'Nurodykite kelią į sendmail programą.', - 'mailgun' => 'Mailgun', - 'mailgun_domain' => 'Mailgun domenas', - 'mailgun_domain_comment' => 'Nurodykite Mailgun domeno vardą.', - 'mailgun_secret' => 'Mailgun slapukas', - 'mailgun_secret_comment' => 'Įveskite savo Mailgun API raktą.', - 'mandrill' => 'Mandrill', - 'mandrill_secret' => 'Mandrill slapukas', - 'mandrill_secret_comment' => 'Įveskite savo Mandrill API raktą.', 'ses' => 'SES', 'ses_key' => 'SES raktas', 'ses_key_comment' => 'Įveskite savo SES API raktą.', @@ -185,8 +177,6 @@ 'ses_secret_comment' => 'Įveskite savo SES API slaptą raktą', 'ses_region' => 'SES regionas', 'ses_region_comment' => 'Įveskite savo SES regioną (pvz. us-east-1)', - 'drivers_hint_header' => 'Valdikliai neįdiegti', - 'drivers_hint_content' => 'Šis metodas reikalauja, kad būtų įdiegtas ":plugin" įskiepis. Kitokiu atveju paštas nebus siunčiamas.' ], 'mail_templates' => [ 'menu_label' => 'Pašto šablonai', diff --git a/modules/system/lang/lv/lang.php b/modules/system/lang/lv/lang.php index 4265f8518d..80262064f0 100644 --- a/modules/system/lang/lv/lang.php +++ b/modules/system/lang/lv/lang.php @@ -145,14 +145,6 @@ 'sendmail' => 'Sendmail', 'sendmail_path' => 'Sendmail ceļs', 'sendmail_path_comment' => 'Lūdzu, norādiet ceļu uz sendmail programmu.', - 'mailgun' => 'Mailgun', - 'mailgun_domain' => 'Mailgun domēns', - 'mailgun_domain_comment' => 'Lūdzu, norādiet Mailgun domēna vārdu.', - 'mailgun_secret' => 'Mailgun piekļuves atslēga', - 'mailgun_secret_comment' => 'Ievadiet savu Mailgun API atslēgu.', - 'mandrill' => 'Mandrill', - 'mandrill_secret' => 'Mandrill piekļuves atslēga', - 'mandrill_secret_comment' => 'Ievadiet savu Mandrill API atslēgu.', 'ses' => 'SES', 'ses_key' => 'SES atslēga', 'ses_key_comment' => 'Ievadiet savu SES API atslēgu', @@ -160,11 +152,6 @@ 'ses_secret_comment' => 'Ievadiet savu SES API piekļuves atslēgu', 'ses_region' => 'SES reģions', 'ses_region_comment' => 'Ievadiet savu SES reģionu (piemēram, us-east-1)', - 'sparkpost' => 'SparkPost', - 'sparkpost_secret' => 'SparkPost piekļuves atslēga', - 'sparkpost_secret_comment' => 'Ievadiet savu SparkPost API piekļuves atslēgu', - 'drivers_hint_header' => 'Dziņi nav instalēti', - 'drivers_hint_content' => 'Šai pasta metodei nepieciešams instalēt spraudni ":plugin", pirms varat veikt pasta sūtīšanu.', ], 'mail_templates' => [ 'menu_label' => 'E-pasta veidnes', diff --git a/modules/system/lang/nb-no/lang.php b/modules/system/lang/nb-no/lang.php index ace5ba9d75..65ab90a7f3 100644 --- a/modules/system/lang/nb-no/lang.php +++ b/modules/system/lang/nb-no/lang.php @@ -133,14 +133,6 @@ 'sendmail' => 'Sendmail', 'sendmail_path' => 'Sendmail-sti', 'sendmail_path_comment' => 'Vennligst oppgi stien til sendmail-programmet.', - 'mailgun' => 'Mailgun', - 'mailgun_domain' => 'Mailgun-domene', - 'mailgun_domain_comment' => 'Vennligst oppgi Mailgun-domenenavnet.', - 'mailgun_secret' => 'Mailgun Secret', - 'mailgun_secret_comment' => 'Oppgi din Mailgun-API-nøkkel.', - 'mandrill' => 'Mandrill', - 'mandrill_secret' => 'Mandrill Secret', - 'mandrill_secret_comment' => 'Oppgi din Mandrill API-nøkkel.', 'ses' => 'SES', 'ses_key' => 'SES nøkkel', 'ses_key_comment' => 'Oppgi din SES API-nøkkel', @@ -148,8 +140,6 @@ 'ses_secret_comment' => 'Oppgi din hemmelige SES API-nøkkel', 'ses_region' => 'SES region', 'ses_region_comment' => 'Legg inn din SES region (feks. us-east-1)', - 'drivers_hint_header' => 'Drivere ikke installert', - 'drivers_hint_content' => 'Denne mailmetoden krever at plugin ":plugin" er installert før du kan sende mail.' ], 'mail_templates' => [ 'menu_label' => 'E-postmaler', diff --git a/modules/system/lang/nl/lang.php b/modules/system/lang/nl/lang.php index 6af73ed8ac..0c184ce19b 100644 --- a/modules/system/lang/nl/lang.php +++ b/modules/system/lang/nl/lang.php @@ -187,14 +187,6 @@ 'sendmail' => 'Sendmail', 'sendmail_path' => 'Pad naar Sendmail', 'sendmail_path_comment' => 'Geef hier het volledige pad op naar de Sendmail-applicatie.', - 'mailgun' => 'Mailgun', - 'mailgun_domain' => 'Mailgun domein', - 'mailgun_domain_comment' => 'Geef hier het Mailgun domeinnaam op.', - 'mailgun_secret' => 'Mailgun secret', - 'mailgun_secret_comment' => 'Geef hier de Mailgun API key op.', - 'mandrill' => 'Mandrill', - 'mandrill_secret' => 'Mandrill secret', - 'mandrill_secret_comment' => 'Geef hier de Mandrill API key op.', 'ses' => 'SES', 'ses_key' => 'SES key', 'ses_key_comment' => 'Voer SES API key in', @@ -202,11 +194,6 @@ 'ses_secret_comment' => 'Voer SES API secret key in', 'ses_region' => 'SES regio', 'ses_region_comment' => 'Voer SES regio in (bijv. us-east-1)', - 'sparkpost' => 'SparkPost', - 'sparkpost_secret' => 'SparkPost secret', - 'sparkpost_secret_comment' => 'Voer SparkPost API secret key in', - 'drivers_hint_header' => 'Stuurprogramma\'s niet geïnstalleerd', - 'drivers_hint_content' => 'Om deze e-mail methode te gebruiken moet de plugin ":plugin" zijn geïnstalleerd.', ], 'mail_templates' => [ 'menu_label' => 'E-mail sjablonen', diff --git a/modules/system/lang/pl/lang.php b/modules/system/lang/pl/lang.php index 916ee303a6..a922b1a1a6 100644 --- a/modules/system/lang/pl/lang.php +++ b/modules/system/lang/pl/lang.php @@ -151,14 +151,6 @@ 'sendmail' => 'Sendmail', 'sendmail_path' => 'Ścieżka Sendmail', 'sendmail_path_comment' => 'Proszę podać ścieżkę programu sendmail.', - 'mailgun' => 'Mailgun', - 'mailgun_domain' => 'Domena Mailgun', - 'mailgun_domain_comment' => 'Proszę podać nazwę domeny Mailgun.', - 'mailgun_secret' => 'Mailgun Secret', - 'mailgun_secret_comment' => 'Podaj swój klucz API Mailgun.', - 'mandrill' => 'Mandrill', - 'mandrill_secret' => 'Mandrill secret', - 'mandrill_secret_comment' => 'Podaj swój klucz API Mandrill.', 'ses' => 'SES', 'ses_key' => 'SES key', 'ses_key_comment' => 'Podaj swój klucz API SES', @@ -166,8 +158,6 @@ 'ses_secret_comment' => 'Podaj swój sekretny klucz API SES', 'ses_region' => 'Region SES', 'ses_region_comment' => 'Podaj swój region SES (e.g. us-east-1)', - 'drivers_hint_header' => 'Nie zainstalowano sterowników', - 'drivers_hint_content' => 'Ta opcja wysyłki wiadomości wymaga zainstalowania wtyczki ":plugin".', ], 'mail_templates' => [ 'menu_label' => 'Szablony wiadomości email', diff --git a/modules/system/lang/pt-br/lang.php b/modules/system/lang/pt-br/lang.php index cc515b0505..020e202f82 100644 --- a/modules/system/lang/pt-br/lang.php +++ b/modules/system/lang/pt-br/lang.php @@ -187,14 +187,6 @@ 'sendmail' => 'Sendmail', 'sendmail_path' => 'Caminho do Sendmail', 'sendmail_path_comment' => 'Por favor, especifique o caminho do programa Sendmail.', - 'mailgun' => 'Mailgun', - 'mailgun_domain' => 'Domínio do Mailgun', - 'mailgun_domain_comment' => 'Por favor, forneça o domínio do Mailgun.', - 'mailgun_secret' => 'Mailgun Secret', - 'mailgun_secret_comment' => 'Forneça sua chave de API do Mailgun.', - 'mandrill' => 'Mandrill', - 'mandrill_secret' => 'Mandrill Secret', - 'mandrill_secret_comment' => 'Forneça sua chave de API do Mandrill', 'ses' => 'SES', 'ses_key' => 'Chave SES', 'ses_key_comment' => 'Forneça sua chave do SES', @@ -202,11 +194,6 @@ 'ses_secret_comment' => 'Forneça sua chave de API do SES.', 'ses_region' => 'Região SES', 'ses_region_comment' => 'Entre com sua região SES (exemplo: us-east-1)', - 'sparkpost' => 'SparkPost', - 'sparkpost_secret' => 'SparkPost chave secreta', - 'sparkpost_secret_comment' => 'Insira sua chave secreta da API SparkPost', - 'drivers_hint_header' => 'Drivers não instalados', - 'drivers_hint_content' => 'Este método requer que o plugin ":plugin" esteja instalado.' ], 'mail_templates' => [ 'menu_label' => 'Modelos de E-mail', diff --git a/modules/system/lang/pt-pt/lang.php b/modules/system/lang/pt-pt/lang.php index 560f3822f8..a19ec556a4 100644 --- a/modules/system/lang/pt-pt/lang.php +++ b/modules/system/lang/pt-pt/lang.php @@ -170,14 +170,6 @@ 'sendmail' => 'Sendmail', 'sendmail_path' => 'Caminho do Sendmail', 'sendmail_path_comment' => 'Por favor, especifique o caminho do programa Sendmail.', - 'mailgun' => 'Mailgun', - 'mailgun_domain' => 'Domínio do Mailgun', - 'mailgun_domain_comment' => 'Por favor, forneça o domínio do Mailgun.', - 'mailgun_secret' => 'Mailgun Secret', - 'mailgun_secret_comment' => 'Forneça sua chave de API do Mailgun.', - 'mandrill' => 'Mandrill', - 'mandrill_secret' => 'Mandrill Secret', - 'mandrill_secret_comment' => 'Forneça sua chave de API do Mandrill', 'ses' => 'SES', 'ses_key' => 'Chave SES', 'ses_key_comment' => 'Forneça sua chave do SES', @@ -185,8 +177,6 @@ 'ses_secret_comment' => 'Forneça sua chave de API do SES.', 'ses_region' => 'Região SES', 'ses_region_comment' => 'Entre com sua região SES (exemplo: us-east-1)', - 'drivers_hint_header' => 'Drivers não instalados', - 'drivers_hint_content' => 'Este método requer que a extensão ":plugin" esteja instalada.' ], 'mail_templates' => [ 'menu_label' => 'Modelos de E-mail', diff --git a/modules/system/lang/ro/lang.php b/modules/system/lang/ro/lang.php index aa246f913a..f0b67a35fb 100644 --- a/modules/system/lang/ro/lang.php +++ b/modules/system/lang/ro/lang.php @@ -190,14 +190,6 @@ 'sendmail' => 'Sendmail', 'sendmail_path' => 'Calea către Sendmail', 'sendmail_path_comment' => 'Vă rugăm să specificați calea programului Sendmail.', - 'mailgun' => 'Mailgun', - 'mailgun_domain' => 'Domeniu Mailgun', - 'mailgun_domain_comment' => 'Vă rugăm să specificați numele domeniului Mailgun.', - 'mailgun_secret' => 'Cheie secretă pentru Mailgun ', - 'mailgun_secret_comment' => 'Introduceți cheia API Mailgun.', - 'mandrill' => 'Mandrill', - 'mandrill_secret' => 'Cheie secretă pentru Mandrill', - 'mandrill_secret_comment' => 'Introduceți cheia API Mandrill.', 'ses' => 'SES', 'ses_key' => 'Cheia SES', 'ses_key_comment' => 'Introduceți cheia API SES', @@ -205,11 +197,6 @@ 'ses_secret_comment' => 'Introduceți cheia secretă a API-ului SES', 'ses_region' => 'Regiunea SES', 'ses_region_comment' => 'Introduceți regiunea SES (de ex. us-est-1)', - 'sparkpost' => 'SparkPost', - 'sparkpost_secret' => 'Cheie secretă pentru SparkPost', - 'sparkpost_secret_comment' => 'Introduceți cheia secretă API SparkPost', - 'drivers_hint_header' => 'Drivere neinstalate', - 'drivers_hint_content' => 'Această metodă de e-mail necesită instalarea pluginului ":plugin" înainte de a putea trimite e-mail.', ], 'mail_templates' => [ 'menu_label' => 'Șabloane de e-mail', diff --git a/modules/system/lang/rs/lang.php b/modules/system/lang/rs/lang.php index 8ab8af2e56..f675872229 100644 --- a/modules/system/lang/rs/lang.php +++ b/modules/system/lang/rs/lang.php @@ -187,26 +187,13 @@ 'sendmail' => 'Sendmail', 'sendmail_path' => 'Sendmail putanja', 'sendmail_path_comment' => 'Specificiraj putanju Sendmail programa.', - 'mailgun' => 'Mailgun', - 'mailgun_domain' => 'Mailgun domen', - 'mailgun_domain_comment' => 'Specificiraj Mailgun domen.', - 'mailgun_secret' => 'Mailgun tajna', - 'mailgun_secret_comment' => 'Unesi svoj Mailgun API ključ.', - 'mandrill' => 'Mandrill', - 'mandrill_secret' => 'Mandrill tajna', - 'mandrill_secret_comment' => 'Unesi svoj Mandrill API ključ.', 'ses' => 'SES', 'ses_key' => 'SES ključ', 'ses_key_comment' => 'Unesi svoj SES API ključ.', 'ses_secret' => 'SES tajna', 'ses_secret_comment' => 'Unesi svoju SES API tajnu.', - 'sparkpost' => 'SparkPost', - 'sparkpost_secret' => 'SparkPost tajna', - 'sparkpost_secret_comment' => 'Unesi svoju SparkPost API tajnu.', 'ses_region' => 'SES region', 'ses_region_comment' => 'Unesi svoj SES region. (e.g. us-east-1)', - 'drivers_hint_header' => 'Drajveri nisu instalirani.', - 'drivers_hint_content' => 'Ovaj metod pošte zahteva instaliranje ":plugin" priključka.', ], 'mail_templates' => [ 'menu_label' => 'Šabloni pošte', diff --git a/modules/system/lang/ru/lang.php b/modules/system/lang/ru/lang.php index b2bd336978..7eefa13c14 100644 --- a/modules/system/lang/ru/lang.php +++ b/modules/system/lang/ru/lang.php @@ -190,26 +190,13 @@ 'sendmail' => 'Sendmail', 'sendmail_path' => 'Путь к Sendmail', 'sendmail_path_comment' => 'Пожалуйста, укажите путь к sendmail.', - 'mailgun' => 'Mailgun', - 'mailgun_domain' => 'Домен Mailgun', - 'mailgun_domain_comment' => 'Пожалуйста, укажите домен Mailgun.', - 'mailgun_secret' => 'Секретный API-ключ', - 'mailgun_secret_comment' => 'Введите ваш Mailgun API-ключ.', - 'mandrill' => 'Mandrill', - 'mandrill_secret' => 'Секретный ключ Mandrill', - 'mandrill_secret_comment' => 'Введите ваш Mandrill API-ключ.', 'ses' => 'SES', 'ses_key' => 'SES API-ключ', 'ses_key_comment' => 'Введите ваш SES API-ключ', 'ses_secret' => 'SES секретный API-ключ', 'ses_secret_comment' => 'Введите ваш секретный SES API-ключ', - 'sparkpost' => 'SparkPost', - 'sparkpost_secret' => 'SparkPost secret', - 'sparkpost_secret_comment' => 'Введите ваш SparkPost API secret key', 'ses_region' => 'SES регион', 'ses_region_comment' => 'Введите ваш SES регион (например, us-east-1)', - 'drivers_hint_header' => 'Драйвера не установлены', - 'drivers_hint_content' => 'Этот почтовый метод требует плагин ":plugin", установленный прежде, чем можно будет отправлять почту.', ], 'mail_templates' => [ 'menu_label' => 'Шаблоны почты', diff --git a/modules/system/lang/sk/lang.php b/modules/system/lang/sk/lang.php index 9bd537fe2f..293c8eedcd 100644 --- a/modules/system/lang/sk/lang.php +++ b/modules/system/lang/sk/lang.php @@ -188,14 +188,6 @@ 'sendmail' => 'Sendmail', 'sendmail_path' => 'Sendmail cest', 'sendmail_path_comment' => 'Prosím zadajte cestu k sendmail programu.', - 'mailgun' => 'Mailgun', - 'mailgun_domain' => 'Mailgun doména', - 'mailgun_domain_comment' => 'Prosím zadajte názov Mailgun domény.', - 'mailgun_secret' => 'Mailgun tajný kľúč (secret)', - 'mailgun_secret_comment' => 'Zadajta váš Mailgun API kľúč.', - 'mandrill' => 'Mandrill', - 'mandrill_secret' => 'Mandrill tajný kľúč (secret)', - 'mandrill_secret_comment' => 'Zadajta váš Mandrill API kľúč.', 'ses' => 'SES', 'ses_key' => 'SES kľúč', 'ses_key_comment' => 'Zadajta váš SES API kľúč.', @@ -203,8 +195,6 @@ 'ses_secret_comment' => 'Zadajta váš SES API tajný kľúč.', 'ses_region' => 'SES región', 'ses_region_comment' => 'Zadajta váš SES región (napríiklad us-east-1)', - 'drivers_hint_header' => 'Ovládače nie sú nainštalované', - 'drivers_hint_content' => 'Táto metóda posielania e-mailov vyžaduje nainštalovaný plugin ":plugin" predtým ako môžete posielať e-maily.' ], 'mail_templates' => [ 'menu_label' => 'E-mailové šablóny', diff --git a/modules/system/lang/sl/lang.php b/modules/system/lang/sl/lang.php index fe2731f659..62f8eb2223 100644 --- a/modules/system/lang/sl/lang.php +++ b/modules/system/lang/sl/lang.php @@ -187,26 +187,13 @@ 'sendmail' => 'Sendmail', 'sendmail_path' => 'Sendmail lokacija', 'sendmail_path_comment' => 'Določite lokacijo Sendmail programa.', - 'mailgun' => 'Mailgun', - 'mailgun_domain' => 'Mailgun domena', - 'mailgun_domain_comment' => 'Določite domensko ime za Mailgun (Mailgun domain name).', - 'mailgun_secret' => 'Mailgun geslo', - 'mailgun_secret_comment' => 'Vnesite API ključ za Mailgun (Mailgun API key).', - 'mandrill' => 'Mandrill', - 'mandrill_secret' => 'Mandrill geslo', - 'mandrill_secret_comment' => 'Vnesite API ključ za Mandrill (Mandrill API key).', 'ses' => 'SES', 'ses_key' => 'SES ključ', 'ses_key_comment' => 'Vnesite API ključ za SES.', 'ses_secret' => 'SES geslo', 'ses_secret_comment' => 'Vnesite API ključ za SES (SES API secret key).', - 'sparkpost' => 'SparkPost', - 'sparkpost_secret' => 'SparkPost geslo', - 'sparkpost_secret_comment' => 'Vnesite skrivni API ključ za SparkPost (SparkPost API secret key).', 'ses_region' => 'SES regija', 'ses_region_comment' => 'Vnesite SES regijo (SES region, npr. us-east-1).', - 'drivers_hint_header' => 'Gonilniki niso nameščeni', - 'drivers_hint_content' => 'Ta način pošiljanja potrebuje namestitev vtičnika ":plugin".', ], 'mail_templates' => [ 'menu_label' => 'E-poštne predloge', diff --git a/modules/system/lang/sv/lang.php b/modules/system/lang/sv/lang.php index 6f5db6c768..fddae9e88c 100644 --- a/modules/system/lang/sv/lang.php +++ b/modules/system/lang/sv/lang.php @@ -133,16 +133,6 @@ 'sendmail' => 'Sendmail', 'sendmail_path' => 'Sendmail-sökväg', 'sendmail_path_comment' => 'Vänligen ange sökvägen till sendmail', - 'mailgun' => 'Mailgun', - 'mailgun_domain' => 'Mailgun domän', - 'mailgun_domain_comment' => 'Vänligen ange Mailgun domännamnet.', - 'mailgun_secret' => 'Mailgun hemlighet', - 'mailgun_secret_comment' => 'Ange din Mailgun API-nyckel.', - 'mandrill' => 'Mandrill', - 'mandrill_secret' => 'Mandrill hemlighet', - 'mandrill_secret_comment' => 'Ange din API-nyckel.', - 'drivers_hint_header' => 'Drivrutiner är inte installerade', - 'drivers_hint_content' => 'Den här e-postmetoden kräver att tillägget ":plugin" är installerat innan du kan skicka e-post.' ], 'mail_templates' => [ 'menu_label' => 'E-postmall', diff --git a/modules/system/lang/th/lang.php b/modules/system/lang/th/lang.php index 58a7c970f4..465e00e464 100644 --- a/modules/system/lang/th/lang.php +++ b/modules/system/lang/th/lang.php @@ -141,14 +141,6 @@ 'sendmail' => 'Sendmail', 'sendmail_path' => 'Sendmail path', 'sendmail_path_comment' => 'กรุณากำหนด path ของโปรแกรม sendmail', - 'mailgun' => 'Mailgun', - 'mailgun_domain' => 'โดเมน Mailgun', - 'mailgun_domain_comment' => 'กรุณากำหนดโดเมนเนมของ Mailgun', - 'mailgun_secret' => 'Mailgun secret', - 'mailgun_secret_comment' => 'ใส่ Mailgun API key ของท่าน', - 'mandrill' => 'Mandrill', - 'mandrill_secret' => 'Mandrill secret', - 'mandrill_secret_comment' => 'ใส่ Mandrill API key ของท่าน', 'ses' => 'SES', 'ses_key' => 'SES key', 'ses_key_comment' => 'ใส่ SES API key ของท่าน', @@ -156,8 +148,6 @@ 'ses_secret_comment' => 'ใส่ SES API secret key ของท่าน', 'ses_region' => 'SES region', 'ses_region_comment' => 'ใส่ SES region ของท่าน (เช่น us-east-1)', - 'drivers_hint_header' => 'ยังไม่ได้ติดตั้งไดรเวอร์', - 'drivers_hint_content' => 'วิธีการส่งอีเมลนี้ต้องมีการติดตั้งปลั๊กอิน ":plugin" ก่อนถึงจะส่งอีเมลได้', ], 'mail_templates' => [ 'menu_label' => 'แม่แบบอีเมล (template)', diff --git a/modules/system/lang/tr/lang.php b/modules/system/lang/tr/lang.php index 56f61b166e..059eb56970 100644 --- a/modules/system/lang/tr/lang.php +++ b/modules/system/lang/tr/lang.php @@ -191,14 +191,6 @@ 'sendmail' => 'Sendmail', 'sendmail_path' => 'Sendmail Yolu', 'sendmail_path_comment' => 'Sendmail programının yolunu belirtin.', - 'mailgun' => 'Mailgun', - 'mailgun_domain' => 'Mailgun Domain', - 'mailgun_domain_comment' => 'Mailgun domain belirtin.', - 'mailgun_secret' => 'Mailgun Gizli Anahtarı', - 'mailgun_secret_comment' => 'Mailgun API anahtarını girin.', - 'mandrill' => 'Mandrill', - 'mandrill_secret' => 'Mandrill Gizli Anahtarı', - 'mandrill_secret_comment' => 'Mandrill API anahtarını girin.', 'ses' => 'SES', 'ses_key' => 'SES key', 'ses_key_comment' => 'SES API keyi girin', @@ -206,8 +198,6 @@ 'ses_secret_comment' => 'SES API secret keyi girin', 'ses_region' => 'SES bölgesi', 'ses_region_comment' => 'SES bölgenizi girin (örnek: us-east-1)', - 'drivers_hint_header' => 'Sürücüler yüklenmemiş', - 'drivers_hint_content' => 'Bu eposta yöntemiyle eposta gönderebilmeniz için ":plugin" eklentisinin kurulmuş olması gerekir.', ], 'mail_templates' => [ 'menu_label' => 'Mail şablonları', diff --git a/modules/system/lang/uk/lang.php b/modules/system/lang/uk/lang.php index 958f99bb6a..8cc0338249 100644 --- a/modules/system/lang/uk/lang.php +++ b/modules/system/lang/uk/lang.php @@ -190,26 +190,13 @@ 'sendmail' => 'Sendmail', 'sendmail_path' => 'Sendmail шлях', 'sendmail_path_comment' => 'Будь ласка, вкажіть шлях до sendmail.', - 'mailgun' => 'Mailgun', - 'mailgun_domain' => 'Mailgun домен', - 'mailgun_domain_comment' => 'Будь ласка, вкажіть Mailgun домен.', - 'mailgun_secret' => 'Секретний API-ключ', - 'mailgun_secret_comment' => 'Введіть ваш Mailgun API-ключ.', - 'mandrill' => 'Mandrill', - 'mandrill_secret' => 'Секретний ключ Mandrill', - 'mandrill_secret_comment' => 'Введіть ваш Mandrill API-ключ.', 'ses' => 'SES', 'ses_key' => 'SES API-ключ', 'ses_key_comment' => 'Введіть ваш SES API-ключ', 'ses_secret' => 'SES секретний API-ключ', 'ses_secret_comment' => 'Введіть ваш секретний SES API-ключ', - 'sparkpost' => 'SparkPost', - 'sparkpost_secret' => 'SparkPost secret', - 'sparkpost_secret_comment' => 'Введіть ваш SparkPost API secret key', 'ses_region' => 'SES регіон', 'ses_region_comment' => 'Введіть ваш SES регіон (наприклад, us-east-1)', - 'drivers_hint_header' => 'Драйвера не встановлені', - 'drivers_hint_content' => "Необхідно встановити плагін ':plugin', перш ніж можна буде відправляти пошту.", ], 'mail_templates' => [ 'menu_label' => 'Шаблони пошти', diff --git a/modules/system/lang/vn/lang.php b/modules/system/lang/vn/lang.php index 3fc9672416..de26f87fbb 100644 --- a/modules/system/lang/vn/lang.php +++ b/modules/system/lang/vn/lang.php @@ -178,14 +178,6 @@ 'sendmail' => 'Gửi mail', 'sendmail_path' => 'Đường dẫn gửi mail', 'sendmail_path_comment' => 'Please specify the path of the sendmail program.', - 'mailgun' => 'Mailgun', - 'mailgun_domain' => 'Tên miền trên Mailgun', - 'mailgun_domain_comment' => 'Điền tên miền trên Mailgun', - 'mailgun_secret' => 'Mã bí mật trên Mailgun(secret key)', - 'mailgun_secret_comment' => 'Điền vào mã Mailgun API của bạn', - 'mandrill' => 'Mandrill', - 'mandrill_secret' => 'Mã bí mật trên Mandrill (secret key)', - 'mandrill_secret_comment' => 'Điền vào mã Mandrill API của bạn.', 'ses' => 'SES', 'ses_key' => 'Mã SES', 'ses_key_comment' => 'Điền vào mã SES API của bạn', @@ -193,8 +185,6 @@ 'ses_secret_comment' => 'Điền vào mã bí mật trên SES API của bạn (secret key)', 'ses_region' => 'Ku vực SES', 'ses_region_comment' => 'Điền vào khu vực SES (ví dụ us-east-1)', - 'drivers_hint_header' => 'Trình điều khiển chưa được cài đặt', - 'drivers_hint_content' => 'Phương thức gửi mail này cần phải cài ":plugin" plugin, bạn cần phải cài đặt nó trước mới gửi được mail' ], 'mail_templates' => [ 'menu_label' => 'Các mẫu mail', diff --git a/modules/system/lang/zh-cn/lang.php b/modules/system/lang/zh-cn/lang.php index a7948d2c55..7cfaee00e1 100644 --- a/modules/system/lang/zh-cn/lang.php +++ b/modules/system/lang/zh-cn/lang.php @@ -127,16 +127,6 @@ 'sendmail' => 'Sendmail', 'sendmail_path' => 'Sendmail 路径', 'sendmail_path_comment' => '请确认 Sendmail 路径.', - 'mailgun' => 'Mailgun', - 'mailgun_domain' => 'Mailgun 域名', - 'mailgun_domain_comment' => '请确认 Mailgun 域名.', - 'mailgun_secret' => 'Mailgun Secret', - 'mailgun_secret_comment' => '输入你的 Mailgun API key.', - 'mandrill' => 'Mandrill', - 'mandrill_secret' => 'Mandrill Secret', - 'mandrill_secret_comment' => '输入你的 Mandrill API key.', - 'drivers_hint_header' => '驱动未安装', - 'drivers_hint_content' => '这个邮件发送方法需要安装插件":plugin"。' ], 'mail_templates' => [ 'menu_label' => '邮件模板', diff --git a/modules/system/lang/zh-tw/lang.php b/modules/system/lang/zh-tw/lang.php index cf7ea6be53..d45a60e36d 100644 --- a/modules/system/lang/zh-tw/lang.php +++ b/modules/system/lang/zh-tw/lang.php @@ -120,14 +120,6 @@ 'sendmail' => 'Sendmail', 'sendmail_path' => 'Sendmail 路徑', 'sendmail_path_comment' => '請確認 Sendmail 路徑.', - 'mailgun' => 'Mailgun', - 'mailgun_domain' => 'Mailgun 域名', - 'mailgun_domain_comment' => '請確認 Mailgun 域名.', - 'mailgun_secret' => 'Mailgun Secret', - 'mailgun_secret_comment' => '輸入您的 Mailgun API key.', - 'mandrill' => 'Mandrill', - 'mandrill_secret' => 'Mandrill Secret', - 'mandrill_secret_comment' => '輸入您的 Mandrill API key.' ], 'mail_templates' => [ 'menu_label' => '郵件模板', diff --git a/modules/system/models/mailsetting/fields.yaml b/modules/system/models/mailsetting/fields.yaml index 1948a3d487..4bf1750632 100644 --- a/modules/system/models/mailsetting/fields.yaml +++ b/modules/system/models/mailsetting/fields.yaml @@ -4,7 +4,6 @@ tabs: fields: - sender_name: label: system::lang.mail.sender_name span: auto @@ -16,20 +15,16 @@ tabs: type: email tab: system::lang.mail.general + driver_hint: + type: hint + path: ~/modules/system/models/mailsetting/_drivers_hint.htm + tab: system::lang.mail.general + send_mode: label: system::lang.mail.method type: dropdown tab: system::lang.mail.general - drivers_hint: - type: partial - path: ~/modules/system/models/mailsetting/_drivers_hint.htm - tab: system::lang.mail.general - trigger: - action: show - field: send_mode - condition: value[mandrill][mailgun][ses] - smtp_address: label: system::lang.mail.smtp_address tab: system::lang.mail.general From 0e46f6c34648759acf25d170b14111d2dce4718c Mon Sep 17 00:00:00 2001 From: Marc Jauvin Date: Mon, 4 Apr 2022 13:31:58 -0400 Subject: [PATCH 7/8] update drivers_hint partial with link to documentation --- .../system/models/mailsetting/_drivers_hint.htm | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) diff --git a/modules/system/models/mailsetting/_drivers_hint.htm b/modules/system/models/mailsetting/_drivers_hint.htm index 26b505d498..1e67cfca77 100644 --- a/modules/system/models/mailsetting/_drivers_hint.htm +++ b/modules/system/models/mailsetting/_drivers_hint.htm @@ -1,11 +1,4 @@ -hasPlugin('Winter.Drivers')): ?> -
-
- -

-
-
-

'Winter.Drivers'])) ?>

-
-
- \ No newline at end of file +$docUrl]); From 66f727e998b53cf7c52ca351462e73cb7d0c5e6b Mon Sep 17 00:00:00 2001 From: Marc Jauvin Date: Tue, 5 Apr 2022 15:39:44 -0400 Subject: [PATCH 8/8] remove ses mail driver, will move to its own plugin --- modules/system/lang/be/lang.php | 7 ------- modules/system/lang/ca/lang.php | 7 ------- modules/system/lang/cs/lang.php | 7 ------- modules/system/lang/da/lang.php | 7 ------- modules/system/lang/el/lang.php | 7 ------- modules/system/lang/en/lang.php | 7 ------- modules/system/lang/es/lang.php | 7 ------- modules/system/lang/et/lang.php | 7 ------- modules/system/lang/fa/lang.php | 7 ------- modules/system/lang/fi/lang.php | 7 ------- modules/system/lang/fr/lang.php | 7 ------- modules/system/lang/hu/lang.php | 7 ------- modules/system/lang/it/lang.php | 7 ------- modules/system/lang/kr/lang.php | 7 ------- modules/system/lang/lt/lang.php | 7 ------- modules/system/lang/lv/lang.php | 7 ------- modules/system/lang/nb-no/lang.php | 7 ------- modules/system/lang/nl/lang.php | 7 ------- modules/system/lang/pl/lang.php | 7 ------- modules/system/lang/pt-br/lang.php | 7 ------- modules/system/lang/pt-pt/lang.php | 7 ------- modules/system/lang/ro/lang.php | 7 ------- modules/system/lang/rs/lang.php | 7 ------- modules/system/lang/ru/lang.php | 7 ------- modules/system/lang/sk/lang.php | 7 ------- modules/system/lang/sl/lang.php | 7 ------- modules/system/lang/th/lang.php | 7 ------- modules/system/lang/tr/lang.php | 7 ------- modules/system/lang/uk/lang.php | 7 ------- modules/system/lang/vn/lang.php | 7 ------- modules/system/models/MailSetting.php | 8 -------- 31 files changed, 218 deletions(-) diff --git a/modules/system/lang/be/lang.php b/modules/system/lang/be/lang.php index 17214cfe3d..ad88c7a672 100644 --- a/modules/system/lang/be/lang.php +++ b/modules/system/lang/be/lang.php @@ -133,13 +133,6 @@ 'sendmail' => "Sendmail", 'sendmail_path' => "Шлях sendmail", 'sendmail_path_comment' => "Калі ласка, укажыце шлях дла праграмы sendmail", - 'ses' => "SES", - 'ses_key' => "Ключ SES", - 'ses_key_comment' => "Увядзіце ключ SES API", - 'ses_secret' => "Сакрэт SES", - 'ses_secret_comment' => "Увядзіце сакрэтны ключ SES API", - 'ses_region' => "Рэгіён SES", - 'ses_region_comment' => "Увядзіце рэгіён SES (e.g. us-east-1)", ], 'mail_templates' => [ 'menu_label' => "Шаблоны пошты", diff --git a/modules/system/lang/ca/lang.php b/modules/system/lang/ca/lang.php index 641e4ac541..6252ae0e66 100644 --- a/modules/system/lang/ca/lang.php +++ b/modules/system/lang/ca/lang.php @@ -141,13 +141,6 @@ 'sendmail' => 'Sendmail', 'sendmail_path' => 'Ruta de sendmail', 'sendmail_path_comment' => "Si us plau especifica una ruta per l'executable de sendmail.", - 'ses' => 'SES', - 'ses_key' => 'Clau de SES', - 'ses_key_comment' => 'Introdueix la teva clau API de SES', - 'ses_secret' => 'Secret de SES', - 'ses_secret_comment' => "Introdueix el teu secret d'API de SES", - 'ses_region' => 'Regió de SES', - 'ses_region_comment' => 'Introdueix la teva regió de SES (e.g. us-east-1)', ], 'mail_templates' => [ 'menu_label' => 'Plantilles de correu', diff --git a/modules/system/lang/cs/lang.php b/modules/system/lang/cs/lang.php index 3bc55c8700..20895d3914 100644 --- a/modules/system/lang/cs/lang.php +++ b/modules/system/lang/cs/lang.php @@ -136,13 +136,6 @@ 'sendmail' => 'Sendmail', 'sendmail_path' => 'Sendmail cesta', 'sendmail_path_comment' => 'Zadejte prosím cestu k sendmail programu.', - 'ses' => 'SES', - 'ses_key' => 'Klíč SES', - 'ses_key_comment' => 'Zadejte váš SES API klíč', - 'ses_secret' => 'SES tajný klíč (secret)', - 'ses_secret_comment' => 'Zadejte váš SES API tajný klíč (secret key)', - 'ses_region' => 'SES oblast (region)', - 'ses_region_comment' => 'Zadejte region SES (např. us-east-1)', ], 'mail_templates' => [ 'menu_label' => 'E-mailové šablony', diff --git a/modules/system/lang/da/lang.php b/modules/system/lang/da/lang.php index 197825793e..4c50960244 100644 --- a/modules/system/lang/da/lang.php +++ b/modules/system/lang/da/lang.php @@ -133,13 +133,6 @@ 'sendmail' => 'Sendmail', 'sendmail_path' => 'Sendmail sti', 'sendmail_path_comment' => 'Angiv venligst stien til sendmail programmet.', - 'ses' => 'SES', - 'ses_key' => 'SES key', - 'ses_key_comment' => 'Angiv din SES API key', - 'ses_secret' => 'SES hemmelighed', - 'ses_secret_comment' => 'Angiv din SES API hemmelige nøgle', - 'ses_region' => 'SES region', - 'ses_region_comment' => 'Angiv din SES region (feks. us-east-1)', ], 'mail_templates' => [ 'menu_label' => 'Mail skabeloner', diff --git a/modules/system/lang/el/lang.php b/modules/system/lang/el/lang.php index a01ff7a4a5..46df5a48e5 100644 --- a/modules/system/lang/el/lang.php +++ b/modules/system/lang/el/lang.php @@ -133,13 +133,6 @@ 'sendmail' => 'Sendmail', 'sendmail_path' => 'Διαδρομή Sendmail', 'sendmail_path_comment' => 'Παρακαλούμε καθορίστε την διαδρομή του λογισμικού Sendmail.', - 'ses' => 'SES', - 'ses_key' => 'Κλειδί SES', - 'ses_key_comment' => 'Συμπληρώστε το API κλειδί του SES', - 'ses_secret' => 'Απόρρητο SES', - 'ses_secret_comment' => 'Συμπληρώστε το API απόρρητο κλειδί του SES', - 'ses_region' => 'Περιοχή SES', - 'ses_region_comment' => 'Συμπληρώστε την περιοχή SES (π.χ. us-east-1)', ], 'mail_templates' => [ 'menu_label' => 'Πρότυπα', diff --git a/modules/system/lang/en/lang.php b/modules/system/lang/en/lang.php index e71641699c..02eb23604d 100644 --- a/modules/system/lang/en/lang.php +++ b/modules/system/lang/en/lang.php @@ -190,13 +190,6 @@ 'sendmail' => 'Sendmail', 'sendmail_path' => 'Sendmail path', 'sendmail_path_comment' => 'Please specify the path of the sendmail program.', - 'ses' => 'SES', - 'ses_key' => 'SES key', - 'ses_key_comment' => 'Enter your SES API key', - 'ses_secret' => 'SES secret', - 'ses_secret_comment' => 'Enter your SES API secret key', - 'ses_region' => 'SES region', - 'ses_region_comment' => 'Enter your SES region (e.g. us-east-1)', 'drivers_hint_content' => 'Please see the documentation for installing other Mail methods.', ], 'mail_templates' => [ diff --git a/modules/system/lang/es/lang.php b/modules/system/lang/es/lang.php index f329d0a67b..cd493add73 100644 --- a/modules/system/lang/es/lang.php +++ b/modules/system/lang/es/lang.php @@ -134,13 +134,6 @@ 'sendmail' => 'Sendmail', 'sendmail_path' => 'Directorio de Sendmail', 'sendmail_path_comment' => 'Por favor, especifique la ruta de acceso del programa sendmail.', - 'ses' => 'SES', - 'ses_key' => 'SES key', - 'ses_key_comment' => 'Introduzca su key de SES API', - 'ses_secret' => 'SES secret', - 'ses_secret_comment' => 'Introduzca su key de SES API', - 'ses_region' => 'Región SES', - 'ses_region_comment' => 'Introduzca su región SES (e.g. us-east-1)', ], 'mail_templates' => [ 'menu_label' => 'Plantillas de Correo', diff --git a/modules/system/lang/et/lang.php b/modules/system/lang/et/lang.php index ade05696f4..d21cf16fc7 100644 --- a/modules/system/lang/et/lang.php +++ b/modules/system/lang/et/lang.php @@ -172,13 +172,6 @@ 'sendmail' => 'Sendmail', 'sendmail_path' => 'Sendmaili asukoht', 'sendmail_path_comment' => 'Palun sisesta sendmail programmi asukoht.', - 'ses' => 'Amazon SES', - 'ses_key' => 'SES avalik võti', - 'ses_key_comment' => 'Palun sisesta SES avalik võti', - 'ses_secret' => 'SES salajane võti', - 'ses_secret_comment' => 'Palun sisesta SES saljane võti', - 'ses_region' => 'SES regioon', - 'ses_region_comment' => 'Palun sisesta SES regiooni nimi (nt eu-west-1)', ], 'mail_templates' => [ 'menu_label' => 'Kirja mallid', diff --git a/modules/system/lang/fa/lang.php b/modules/system/lang/fa/lang.php index d424a43579..73c8b2321d 100644 --- a/modules/system/lang/fa/lang.php +++ b/modules/system/lang/fa/lang.php @@ -190,13 +190,6 @@ 'sendmail' => 'Sendmail', 'sendmail_path' => 'آدرس برنامه Sendmail', 'sendmail_path_comment' => 'لطفا محل ذخیره نرم افزار sendmail را مشخص نمایید.', - 'ses' => 'SES', - 'ses_key' => 'کلید SES', - 'ses_key_comment' => 'کلید Api SES را وارد نمایید', - 'ses_secret' => 'کلمه عبور SES', - 'ses_secret_comment' => 'کلمه عبور API SES را وارد نمایید', - 'ses_region' => 'منطفه SES', - 'ses_region_comment' => 'منطقه خود را برای SES وارد نمایید (برای مثال: us-east-1)', ], 'mail_templates' => [ 'menu_label' => 'قالب های نامه الکترونیکی', diff --git a/modules/system/lang/fi/lang.php b/modules/system/lang/fi/lang.php index 9808d60dcd..c11f57e0ce 100644 --- a/modules/system/lang/fi/lang.php +++ b/modules/system/lang/fi/lang.php @@ -177,13 +177,6 @@ 'sendmail' => 'Sendmail', 'sendmail_path' => 'Sendmail-polku', 'sendmail_path_comment' => 'Määritä polku sendmail-ohjelmaan.', - 'ses' => 'SES', - 'ses_key' => 'SES key', - 'ses_key_comment' => 'Syötä sinun SES API avain.', - 'ses_secret' => 'SES sala-avain', - 'ses_secret_comment' => 'Syötä sinun SES API sala-avain.', - 'ses_region' => 'SES alue', - 'ses_region_comment' => 'Syötä sinun SES alue (esim: us-east-1)', ], 'mail_templates' => [ 'menu_label' => 'Sähköpostipohjat', diff --git a/modules/system/lang/fr/lang.php b/modules/system/lang/fr/lang.php index e8d05c7d1a..3725f6a383 100644 --- a/modules/system/lang/fr/lang.php +++ b/modules/system/lang/fr/lang.php @@ -149,13 +149,6 @@ 'sendmail' => 'Sendmail', 'sendmail_path' => 'Chemin vers Sendmail', 'sendmail_path_comment' => 'Saisir le chemin du programme sendmail.', - 'ses' => 'SES', - 'ses_key' => 'Clé SES', - 'ses_key_comment' => 'Saisir votre clé API SES', - 'ses_secret' => 'Clé secrète SES', - 'ses_secret_comment' => 'Saisir votre clé secrète de l\'API SES', - 'ses_region' => 'Région SES', - 'ses_region_comment' => 'Saisir votre région SES (e.g. us-east-1)', 'drivers_hint_content' => 'Veuillez lire la documentation pour des méthodes alternatives.', ], 'mail_templates' => [ diff --git a/modules/system/lang/hu/lang.php b/modules/system/lang/hu/lang.php index 614e44b49d..e1273d4737 100644 --- a/modules/system/lang/hu/lang.php +++ b/modules/system/lang/hu/lang.php @@ -142,13 +142,6 @@ 'sendmail' => 'Sendmail', 'sendmail_path' => 'Elérési út', 'sendmail_path_comment' => 'Adja meg a Sendmail elérését.', - 'ses' => 'SES', - 'ses_key' => 'SES kulcs', - 'ses_key_comment' => 'Adja meg az API kulcsot', - 'ses_secret' => 'SES kód', - 'ses_secret_comment' => 'Adja meg az API titkos kulcsot', - 'ses_region' => 'SES régió', - 'ses_region_comment' => 'Adja meg a régiót (pl. us-east-1)', ], 'mail_templates' => [ 'menu_label' => 'Sablonok', diff --git a/modules/system/lang/it/lang.php b/modules/system/lang/it/lang.php index 85b93f0b88..aae1390e8b 100644 --- a/modules/system/lang/it/lang.php +++ b/modules/system/lang/it/lang.php @@ -133,13 +133,6 @@ 'sendmail' => 'Sendmail', 'sendmail_path' => 'Percorso Sendmail', 'sendmail_path_comment' => 'Inserisci il percorso al servizio sendmail.', - 'ses' => 'SES', - 'ses_key' => 'Chiave SES', - 'ses_key_comment' => 'Inserisci la chiave per l\'utilizzo delle API SES', - 'ses_secret' => 'Chiave privata SES', - 'ses_secret_comment' => 'Inserisci la chiave privata per l\'utilizzo delle API SES', - 'ses_region' => 'Regione SES', - 'ses_region_comment' => 'Inserisci la tua regione SES (ad es. us-east-1)', ], 'mail_templates' => [ 'menu_label' => 'Modelli di e-mail', diff --git a/modules/system/lang/kr/lang.php b/modules/system/lang/kr/lang.php index 02cb639e31..465f942d71 100644 --- a/modules/system/lang/kr/lang.php +++ b/modules/system/lang/kr/lang.php @@ -134,13 +134,6 @@ 'sendmail' => 'Sendmail', 'sendmail_path' => 'Sendmail 경로', 'sendmail_path_comment' => 'Sendmail프로그램의 경로를 설정해주세요.', - 'ses' => 'SES', - 'ses_key' => 'SES 키', - 'ses_key_comment' => 'SES API 키를 입력해주세요.', - 'ses_secret' => 'SES 비밀키', - 'ses_secret_comment' => 'SES API 비밀키를 입력해주세요.', - 'ses_region' => 'SES 지역', - 'ses_region_comment' => 'SES 지역 (예: us-east-1)', ], 'mail_templates' => [ 'menu_label' => '이메일 템플릿', diff --git a/modules/system/lang/lt/lang.php b/modules/system/lang/lt/lang.php index d0a9306a41..767c8c9eba 100644 --- a/modules/system/lang/lt/lang.php +++ b/modules/system/lang/lt/lang.php @@ -170,13 +170,6 @@ 'sendmail' => 'Sendmail', 'sendmail_path' => 'Sendmail kelias', 'sendmail_path_comment' => 'Nurodykite kelią į sendmail programą.', - 'ses' => 'SES', - 'ses_key' => 'SES raktas', - 'ses_key_comment' => 'Įveskite savo SES API raktą.', - 'ses_secret' => 'SES slapukas', - 'ses_secret_comment' => 'Įveskite savo SES API slaptą raktą', - 'ses_region' => 'SES regionas', - 'ses_region_comment' => 'Įveskite savo SES regioną (pvz. us-east-1)', ], 'mail_templates' => [ 'menu_label' => 'Pašto šablonai', diff --git a/modules/system/lang/lv/lang.php b/modules/system/lang/lv/lang.php index 80262064f0..13e5171027 100644 --- a/modules/system/lang/lv/lang.php +++ b/modules/system/lang/lv/lang.php @@ -145,13 +145,6 @@ 'sendmail' => 'Sendmail', 'sendmail_path' => 'Sendmail ceļs', 'sendmail_path_comment' => 'Lūdzu, norādiet ceļu uz sendmail programmu.', - 'ses' => 'SES', - 'ses_key' => 'SES atslēga', - 'ses_key_comment' => 'Ievadiet savu SES API atslēgu', - 'ses_secret' => 'SES piekļuves atslēga', - 'ses_secret_comment' => 'Ievadiet savu SES API piekļuves atslēgu', - 'ses_region' => 'SES reģions', - 'ses_region_comment' => 'Ievadiet savu SES reģionu (piemēram, us-east-1)', ], 'mail_templates' => [ 'menu_label' => 'E-pasta veidnes', diff --git a/modules/system/lang/nb-no/lang.php b/modules/system/lang/nb-no/lang.php index 65ab90a7f3..b2dc6a1cee 100644 --- a/modules/system/lang/nb-no/lang.php +++ b/modules/system/lang/nb-no/lang.php @@ -133,13 +133,6 @@ 'sendmail' => 'Sendmail', 'sendmail_path' => 'Sendmail-sti', 'sendmail_path_comment' => 'Vennligst oppgi stien til sendmail-programmet.', - 'ses' => 'SES', - 'ses_key' => 'SES nøkkel', - 'ses_key_comment' => 'Oppgi din SES API-nøkkel', - 'ses_secret' => 'SES secret', - 'ses_secret_comment' => 'Oppgi din hemmelige SES API-nøkkel', - 'ses_region' => 'SES region', - 'ses_region_comment' => 'Legg inn din SES region (feks. us-east-1)', ], 'mail_templates' => [ 'menu_label' => 'E-postmaler', diff --git a/modules/system/lang/nl/lang.php b/modules/system/lang/nl/lang.php index 0c184ce19b..c7eb9f4522 100644 --- a/modules/system/lang/nl/lang.php +++ b/modules/system/lang/nl/lang.php @@ -187,13 +187,6 @@ 'sendmail' => 'Sendmail', 'sendmail_path' => 'Pad naar Sendmail', 'sendmail_path_comment' => 'Geef hier het volledige pad op naar de Sendmail-applicatie.', - 'ses' => 'SES', - 'ses_key' => 'SES key', - 'ses_key_comment' => 'Voer SES API key in', - 'ses_secret' => 'SES secret', - 'ses_secret_comment' => 'Voer SES API secret key in', - 'ses_region' => 'SES regio', - 'ses_region_comment' => 'Voer SES regio in (bijv. us-east-1)', ], 'mail_templates' => [ 'menu_label' => 'E-mail sjablonen', diff --git a/modules/system/lang/pl/lang.php b/modules/system/lang/pl/lang.php index a922b1a1a6..12bd9723c9 100644 --- a/modules/system/lang/pl/lang.php +++ b/modules/system/lang/pl/lang.php @@ -151,13 +151,6 @@ 'sendmail' => 'Sendmail', 'sendmail_path' => 'Ścieżka Sendmail', 'sendmail_path_comment' => 'Proszę podać ścieżkę programu sendmail.', - 'ses' => 'SES', - 'ses_key' => 'SES key', - 'ses_key_comment' => 'Podaj swój klucz API SES', - 'ses_secret' => 'SES secret', - 'ses_secret_comment' => 'Podaj swój sekretny klucz API SES', - 'ses_region' => 'Region SES', - 'ses_region_comment' => 'Podaj swój region SES (e.g. us-east-1)', ], 'mail_templates' => [ 'menu_label' => 'Szablony wiadomości email', diff --git a/modules/system/lang/pt-br/lang.php b/modules/system/lang/pt-br/lang.php index 020e202f82..0a20f16626 100644 --- a/modules/system/lang/pt-br/lang.php +++ b/modules/system/lang/pt-br/lang.php @@ -187,13 +187,6 @@ 'sendmail' => 'Sendmail', 'sendmail_path' => 'Caminho do Sendmail', 'sendmail_path_comment' => 'Por favor, especifique o caminho do programa Sendmail.', - 'ses' => 'SES', - 'ses_key' => 'Chave SES', - 'ses_key_comment' => 'Forneça sua chave do SES', - 'ses_secret' => 'SES Secret', - 'ses_secret_comment' => 'Forneça sua chave de API do SES.', - 'ses_region' => 'Região SES', - 'ses_region_comment' => 'Entre com sua região SES (exemplo: us-east-1)', ], 'mail_templates' => [ 'menu_label' => 'Modelos de E-mail', diff --git a/modules/system/lang/pt-pt/lang.php b/modules/system/lang/pt-pt/lang.php index a19ec556a4..e79fddbecc 100644 --- a/modules/system/lang/pt-pt/lang.php +++ b/modules/system/lang/pt-pt/lang.php @@ -170,13 +170,6 @@ 'sendmail' => 'Sendmail', 'sendmail_path' => 'Caminho do Sendmail', 'sendmail_path_comment' => 'Por favor, especifique o caminho do programa Sendmail.', - 'ses' => 'SES', - 'ses_key' => 'Chave SES', - 'ses_key_comment' => 'Forneça sua chave do SES', - 'ses_secret' => 'SES Secret', - 'ses_secret_comment' => 'Forneça sua chave de API do SES.', - 'ses_region' => 'Região SES', - 'ses_region_comment' => 'Entre com sua região SES (exemplo: us-east-1)', ], 'mail_templates' => [ 'menu_label' => 'Modelos de E-mail', diff --git a/modules/system/lang/ro/lang.php b/modules/system/lang/ro/lang.php index f0b67a35fb..20ddb31def 100644 --- a/modules/system/lang/ro/lang.php +++ b/modules/system/lang/ro/lang.php @@ -190,13 +190,6 @@ 'sendmail' => 'Sendmail', 'sendmail_path' => 'Calea către Sendmail', 'sendmail_path_comment' => 'Vă rugăm să specificați calea programului Sendmail.', - 'ses' => 'SES', - 'ses_key' => 'Cheia SES', - 'ses_key_comment' => 'Introduceți cheia API SES', - 'ses_secret' => 'Cheie secretă pentru SES', - 'ses_secret_comment' => 'Introduceți cheia secretă a API-ului SES', - 'ses_region' => 'Regiunea SES', - 'ses_region_comment' => 'Introduceți regiunea SES (de ex. us-est-1)', ], 'mail_templates' => [ 'menu_label' => 'Șabloane de e-mail', diff --git a/modules/system/lang/rs/lang.php b/modules/system/lang/rs/lang.php index f675872229..aa710cb23c 100644 --- a/modules/system/lang/rs/lang.php +++ b/modules/system/lang/rs/lang.php @@ -187,13 +187,6 @@ 'sendmail' => 'Sendmail', 'sendmail_path' => 'Sendmail putanja', 'sendmail_path_comment' => 'Specificiraj putanju Sendmail programa.', - 'ses' => 'SES', - 'ses_key' => 'SES ključ', - 'ses_key_comment' => 'Unesi svoj SES API ključ.', - 'ses_secret' => 'SES tajna', - 'ses_secret_comment' => 'Unesi svoju SES API tajnu.', - 'ses_region' => 'SES region', - 'ses_region_comment' => 'Unesi svoj SES region. (e.g. us-east-1)', ], 'mail_templates' => [ 'menu_label' => 'Šabloni pošte', diff --git a/modules/system/lang/ru/lang.php b/modules/system/lang/ru/lang.php index 7eefa13c14..c59bc03712 100644 --- a/modules/system/lang/ru/lang.php +++ b/modules/system/lang/ru/lang.php @@ -190,13 +190,6 @@ 'sendmail' => 'Sendmail', 'sendmail_path' => 'Путь к Sendmail', 'sendmail_path_comment' => 'Пожалуйста, укажите путь к sendmail.', - 'ses' => 'SES', - 'ses_key' => 'SES API-ключ', - 'ses_key_comment' => 'Введите ваш SES API-ключ', - 'ses_secret' => 'SES секретный API-ключ', - 'ses_secret_comment' => 'Введите ваш секретный SES API-ключ', - 'ses_region' => 'SES регион', - 'ses_region_comment' => 'Введите ваш SES регион (например, us-east-1)', ], 'mail_templates' => [ 'menu_label' => 'Шаблоны почты', diff --git a/modules/system/lang/sk/lang.php b/modules/system/lang/sk/lang.php index 293c8eedcd..f3e7cfac67 100644 --- a/modules/system/lang/sk/lang.php +++ b/modules/system/lang/sk/lang.php @@ -188,13 +188,6 @@ 'sendmail' => 'Sendmail', 'sendmail_path' => 'Sendmail cest', 'sendmail_path_comment' => 'Prosím zadajte cestu k sendmail programu.', - 'ses' => 'SES', - 'ses_key' => 'SES kľúč', - 'ses_key_comment' => 'Zadajta váš SES API kľúč.', - 'ses_secret' => 'SES tajný kľúč (secret)', - 'ses_secret_comment' => 'Zadajta váš SES API tajný kľúč.', - 'ses_region' => 'SES región', - 'ses_region_comment' => 'Zadajta váš SES región (napríiklad us-east-1)', ], 'mail_templates' => [ 'menu_label' => 'E-mailové šablóny', diff --git a/modules/system/lang/sl/lang.php b/modules/system/lang/sl/lang.php index 62f8eb2223..2506b35f02 100644 --- a/modules/system/lang/sl/lang.php +++ b/modules/system/lang/sl/lang.php @@ -187,13 +187,6 @@ 'sendmail' => 'Sendmail', 'sendmail_path' => 'Sendmail lokacija', 'sendmail_path_comment' => 'Določite lokacijo Sendmail programa.', - 'ses' => 'SES', - 'ses_key' => 'SES ključ', - 'ses_key_comment' => 'Vnesite API ključ za SES.', - 'ses_secret' => 'SES geslo', - 'ses_secret_comment' => 'Vnesite API ključ za SES (SES API secret key).', - 'ses_region' => 'SES regija', - 'ses_region_comment' => 'Vnesite SES regijo (SES region, npr. us-east-1).', ], 'mail_templates' => [ 'menu_label' => 'E-poštne predloge', diff --git a/modules/system/lang/th/lang.php b/modules/system/lang/th/lang.php index 465e00e464..cd4bb4b45b 100644 --- a/modules/system/lang/th/lang.php +++ b/modules/system/lang/th/lang.php @@ -141,13 +141,6 @@ 'sendmail' => 'Sendmail', 'sendmail_path' => 'Sendmail path', 'sendmail_path_comment' => 'กรุณากำหนด path ของโปรแกรม sendmail', - 'ses' => 'SES', - 'ses_key' => 'SES key', - 'ses_key_comment' => 'ใส่ SES API key ของท่าน', - 'ses_secret' => 'SES secret', - 'ses_secret_comment' => 'ใส่ SES API secret key ของท่าน', - 'ses_region' => 'SES region', - 'ses_region_comment' => 'ใส่ SES region ของท่าน (เช่น us-east-1)', ], 'mail_templates' => [ 'menu_label' => 'แม่แบบอีเมล (template)', diff --git a/modules/system/lang/tr/lang.php b/modules/system/lang/tr/lang.php index 059eb56970..ef2dbe8953 100644 --- a/modules/system/lang/tr/lang.php +++ b/modules/system/lang/tr/lang.php @@ -191,13 +191,6 @@ 'sendmail' => 'Sendmail', 'sendmail_path' => 'Sendmail Yolu', 'sendmail_path_comment' => 'Sendmail programının yolunu belirtin.', - 'ses' => 'SES', - 'ses_key' => 'SES key', - 'ses_key_comment' => 'SES API keyi girin', - 'ses_secret' => 'SES secret', - 'ses_secret_comment' => 'SES API secret keyi girin', - 'ses_region' => 'SES bölgesi', - 'ses_region_comment' => 'SES bölgenizi girin (örnek: us-east-1)', ], 'mail_templates' => [ 'menu_label' => 'Mail şablonları', diff --git a/modules/system/lang/uk/lang.php b/modules/system/lang/uk/lang.php index 8cc0338249..78fcf37db3 100644 --- a/modules/system/lang/uk/lang.php +++ b/modules/system/lang/uk/lang.php @@ -190,13 +190,6 @@ 'sendmail' => 'Sendmail', 'sendmail_path' => 'Sendmail шлях', 'sendmail_path_comment' => 'Будь ласка, вкажіть шлях до sendmail.', - 'ses' => 'SES', - 'ses_key' => 'SES API-ключ', - 'ses_key_comment' => 'Введіть ваш SES API-ключ', - 'ses_secret' => 'SES секретний API-ключ', - 'ses_secret_comment' => 'Введіть ваш секретний SES API-ключ', - 'ses_region' => 'SES регіон', - 'ses_region_comment' => 'Введіть ваш SES регіон (наприклад, us-east-1)', ], 'mail_templates' => [ 'menu_label' => 'Шаблони пошти', diff --git a/modules/system/lang/vn/lang.php b/modules/system/lang/vn/lang.php index de26f87fbb..82554ea40e 100644 --- a/modules/system/lang/vn/lang.php +++ b/modules/system/lang/vn/lang.php @@ -178,13 +178,6 @@ 'sendmail' => 'Gửi mail', 'sendmail_path' => 'Đường dẫn gửi mail', 'sendmail_path_comment' => 'Please specify the path of the sendmail program.', - 'ses' => 'SES', - 'ses_key' => 'Mã SES', - 'ses_key_comment' => 'Điền vào mã SES API của bạn', - 'ses_secret' => 'Mã bí mật trên SES (secret key)', - 'ses_secret_comment' => 'Điền vào mã bí mật trên SES API của bạn (secret key)', - 'ses_region' => 'Ku vực SES', - 'ses_region_comment' => 'Điền vào khu vực SES (ví dụ us-east-1)', ], 'mail_templates' => [ 'menu_label' => 'Các mẫu mail', diff --git a/modules/system/models/MailSetting.php b/modules/system/models/MailSetting.php index 1240c5129d..f79854bc62 100644 --- a/modules/system/models/MailSetting.php +++ b/modules/system/models/MailSetting.php @@ -17,7 +17,6 @@ class MailSetting extends Model const MODE_MAIL = 'mail'; const MODE_SENDMAIL = 'sendmail'; const MODE_SMTP = 'smtp'; - const MODE_SES = 'ses'; /** * @var array Behaviors implemented by this model. @@ -81,7 +80,6 @@ public function getSendModeOptions() static::MODE_MAIL => 'system::lang.mail.php_mail', static::MODE_SENDMAIL => 'system::lang.mail.sendmail', static::MODE_SMTP => 'system::lang.mail.smtp', - static::MODE_SES => 'system::lang.mail.ses', ]; } @@ -116,12 +114,6 @@ public static function applyConfigValues() case self::MODE_SENDMAIL: $config->set('mail.mailers.sendmail.path', $settings->sendmail_path); break; - - case self::MODE_SES: - $config->set('services.ses.key', $settings->ses_key); - $config->set('services.ses.secret', $settings->ses_secret); - $config->set('services.ses.region', $settings->ses_region); - break; } }