From 347dee3d4193e864824132352ab993817a37cf37 Mon Sep 17 00:00:00 2001 From: Richard Henkenjohann Date: Mon, 24 Aug 2020 11:35:18 +0200 Subject: [PATCH 1/2] Fix showing false-positive SMTP warning --- library/NotificationCenter/ContaoHelper.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/library/NotificationCenter/ContaoHelper.php b/library/NotificationCenter/ContaoHelper.php index 43f3f77d..7c129dfc 100644 --- a/library/NotificationCenter/ContaoHelper.php +++ b/library/NotificationCenter/ContaoHelper.php @@ -175,7 +175,7 @@ public function addQueueToUserNavigation($arrModules, $blnShowAll) */ public function alertLegacySmtpSetting() { - if (version_compare(VERSION, '4.10', '<') && $this->objModel->email_overrideSmtp) { + if (version_compare(VERSION, '4.10', '<')) { return ''; } From 4bcdda2f821c3e92c71d5c94c9e103cb0de6b7d4 Mon Sep 17 00:00:00 2001 From: Richard Henkenjohann Date: Mon, 24 Aug 2020 11:51:54 +0200 Subject: [PATCH 2/2] Push and pull new translations from Transifex client --- .tx/config | 5 +++++ languages/cs/default.xlf | 9 +++++++++ languages/cs/tl_nc_gateway.xlf | 8 ++++++++ languages/de/default.xlf | 10 ++++++++++ languages/de/tl_nc_gateway.xlf | 10 ++++++++++ languages/fr/default.xlf | 9 +++++++++ languages/fr/tl_nc_gateway.xlf | 8 ++++++++ languages/it/default.xlf | 9 +++++++++ languages/it/tl_nc_gateway.xlf | 8 ++++++++ languages/ja/default.xlf | 9 +++++++++ languages/ja/tl_nc_gateway.xlf | 8 ++++++++ languages/pl/default.xlf | 9 +++++++++ languages/pl/tl_nc_gateway.xlf | 8 ++++++++ languages/ru/default.xlf | 9 +++++++++ languages/ru/tl_nc_gateway.xlf | 8 ++++++++ 15 files changed, 127 insertions(+) create mode 100644 languages/cs/default.xlf create mode 100644 languages/de/default.xlf create mode 100644 languages/fr/default.xlf create mode 100644 languages/it/default.xlf create mode 100644 languages/ja/default.xlf create mode 100644 languages/pl/default.xlf create mode 100644 languages/ru/default.xlf diff --git a/.tx/config b/.tx/config index 0fb423cb..79ef69fe 100644 --- a/.tx/config +++ b/.tx/config @@ -2,6 +2,11 @@ host = https://www.transifex.com type = XLIFF +[notification_center.master-notification_center-default] +file_filter = languages//default.xlf +source_file = languages/en/default.xlf +source_lang = en + [notification_center.master-notification_center-modules] file_filter = languages//modules.xlf source_file = languages/en/modules.xlf diff --git a/languages/cs/default.xlf b/languages/cs/default.xlf new file mode 100644 index 00000000..bb6616b1 --- /dev/null +++ b/languages/cs/default.xlf @@ -0,0 +1,9 @@ + + + + + [Notification Center]: Using custom SMTP settings has been changed in Contao 4.10. Please visit <a href="https://docs.contao.org/manual/en/system/settings/#different-e-mail-configurations-and-sender-addresses">the documentation</a> to learn how to define SMTP settings. Then, please update all email gateways that need this feature and disable "Override SMTP settings". + + + + \ No newline at end of file diff --git a/languages/cs/tl_nc_gateway.xlf b/languages/cs/tl_nc_gateway.xlf index 5c58e84b..3216eaee 100644 --- a/languages/cs/tl_nc_gateway.xlf +++ b/languages/cs/tl_nc_gateway.xlf @@ -70,6 +70,14 @@ This gateway will take the Contao e-mail settings by default. If you want to override the SMTP settings for this specific gateway, activate this checkbox. Tento druh rozesílání převezme výchozí nastavení rozesílání mailů. Pokud si přejete použít jiná nastavení SMTP pro tento druh, zaškrtněte toto políčko. + + + Mailer transport + + + + Here you can override the mailer transport used to send e-mails. + File type diff --git a/languages/de/default.xlf b/languages/de/default.xlf new file mode 100644 index 00000000..2e665b15 --- /dev/null +++ b/languages/de/default.xlf @@ -0,0 +1,10 @@ + + + + + [Notification Center]: Using custom SMTP settings has been changed in Contao 4.10. Please visit <a href="https://docs.contao.org/manual/en/system/settings/#different-e-mail-configurations-and-sender-addresses">the documentation</a> to learn how to define SMTP settings. Then, please update all email gateways that need this feature and disable "Override SMTP settings". + [Notification Center]: Die Verwendung eigener SMTP-Einstellungen wurde in Contao 4.10 geändert. Bitte besuchen Sie <a href="https://docs.contao.org/manual/de/system/einstellungen/#verschiedene-e-mail-konfigurationen-und-absenderadressen">die Dokumentation</a>, um zu erfahren, wie Sie SMTP-Einstellungen definieren können. Aktualisieren Sie dann bitte alle E-Mail-Gateways, die diese Funktion benötigen, und deaktivieren Sie "SMTP-Einstellungen überschreiben". + + + + \ No newline at end of file diff --git a/languages/de/tl_nc_gateway.xlf b/languages/de/tl_nc_gateway.xlf index d5e20149..64f0aae6 100644 --- a/languages/de/tl_nc_gateway.xlf +++ b/languages/de/tl_nc_gateway.xlf @@ -70,6 +70,16 @@ This gateway will take the Contao e-mail settings by default. If you want to override the SMTP settings for this specific gateway, activate this checkbox. Aktivieren Sie diese Checkbox um die Contao SMTP-Einstellungen (Systemeinstellungen) zu überschreiben und sie anschließend zu individualisieren. + + + Mailer transport + Mailer-Transport + + + + Here you can override the mailer transport used to send e-mails. + Hier können Sie den Mailer-Transport überschreiben, der für den E-Mail-Versand verwendet wird. + File type diff --git a/languages/fr/default.xlf b/languages/fr/default.xlf new file mode 100644 index 00000000..e4cf0546 --- /dev/null +++ b/languages/fr/default.xlf @@ -0,0 +1,9 @@ + + + + + [Notification Center]: Using custom SMTP settings has been changed in Contao 4.10. Please visit <a href="https://docs.contao.org/manual/en/system/settings/#different-e-mail-configurations-and-sender-addresses">the documentation</a> to learn how to define SMTP settings. Then, please update all email gateways that need this feature and disable "Override SMTP settings". + + + + \ No newline at end of file diff --git a/languages/fr/tl_nc_gateway.xlf b/languages/fr/tl_nc_gateway.xlf index 470b315b..23f1835e 100644 --- a/languages/fr/tl_nc_gateway.xlf +++ b/languages/fr/tl_nc_gateway.xlf @@ -62,6 +62,14 @@ This gateway will take the Contao e-mail settings by default. If you want to override the SMTP settings for this specific gateway, activate this checkbox. Cette passerelle utilisera les paramètres de courrier électronique par défaut de Contao. Cocher pour surcharger les paramètres SMTP de cette passerelle. + + + Mailer transport + + + + Here you can override the mailer transport used to send e-mails. + File type diff --git a/languages/it/default.xlf b/languages/it/default.xlf new file mode 100644 index 00000000..f1f68258 --- /dev/null +++ b/languages/it/default.xlf @@ -0,0 +1,9 @@ + + + + + [Notification Center]: Using custom SMTP settings has been changed in Contao 4.10. Please visit <a href="https://docs.contao.org/manual/en/system/settings/#different-e-mail-configurations-and-sender-addresses">the documentation</a> to learn how to define SMTP settings. Then, please update all email gateways that need this feature and disable "Override SMTP settings". + + + + \ No newline at end of file diff --git a/languages/it/tl_nc_gateway.xlf b/languages/it/tl_nc_gateway.xlf index c176de4b..5ea15f9a 100644 --- a/languages/it/tl_nc_gateway.xlf +++ b/languages/it/tl_nc_gateway.xlf @@ -58,6 +58,14 @@ This gateway will take the Contao e-mail settings by default. If you want to override the SMTP settings for this specific gateway, activate this checkbox. + + + Mailer transport + + + + Here you can override the mailer transport used to send e-mails. + File type diff --git a/languages/ja/default.xlf b/languages/ja/default.xlf new file mode 100644 index 00000000..6c7f78bd --- /dev/null +++ b/languages/ja/default.xlf @@ -0,0 +1,9 @@ + + + + + [Notification Center]: Using custom SMTP settings has been changed in Contao 4.10. Please visit <a href="https://docs.contao.org/manual/en/system/settings/#different-e-mail-configurations-and-sender-addresses">the documentation</a> to learn how to define SMTP settings. Then, please update all email gateways that need this feature and disable "Override SMTP settings". + + + + \ No newline at end of file diff --git a/languages/ja/tl_nc_gateway.xlf b/languages/ja/tl_nc_gateway.xlf index b0d2e24d..f0308f58 100644 --- a/languages/ja/tl_nc_gateway.xlf +++ b/languages/ja/tl_nc_gateway.xlf @@ -70,6 +70,14 @@ This gateway will take the Contao e-mail settings by default. If you want to override the SMTP settings for this specific gateway, activate this checkbox. このゲートウェイは初期設定ではContaoの電子メールの設定を使用します。この特定のゲートウェイでSMTPの設定を変えたい場合は、このチェックボックスを選択してください。 + + + Mailer transport + + + + Here you can override the mailer transport used to send e-mails. + File type diff --git a/languages/pl/default.xlf b/languages/pl/default.xlf new file mode 100644 index 00000000..138cc0f6 --- /dev/null +++ b/languages/pl/default.xlf @@ -0,0 +1,9 @@ + + + + + [Notification Center]: Using custom SMTP settings has been changed in Contao 4.10. Please visit <a href="https://docs.contao.org/manual/en/system/settings/#different-e-mail-configurations-and-sender-addresses">the documentation</a> to learn how to define SMTP settings. Then, please update all email gateways that need this feature and disable "Override SMTP settings". + + + + \ No newline at end of file diff --git a/languages/pl/tl_nc_gateway.xlf b/languages/pl/tl_nc_gateway.xlf index c167c2cb..0b6fa664 100644 --- a/languages/pl/tl_nc_gateway.xlf +++ b/languages/pl/tl_nc_gateway.xlf @@ -62,6 +62,14 @@ This gateway will take the Contao e-mail settings by default. If you want to override the SMTP settings for this specific gateway, activate this checkbox. Bramka będzie używać domyślnej konfiguracji e-mail Contao. Jeśli chcesz nadpisać ustawienia SMTP dla tej bramki, zaznacz ten checkbox. + + + Mailer transport + + + + Here you can override the mailer transport used to send e-mails. + File type diff --git a/languages/ru/default.xlf b/languages/ru/default.xlf new file mode 100644 index 00000000..bf1abe30 --- /dev/null +++ b/languages/ru/default.xlf @@ -0,0 +1,9 @@ + + + + + [Notification Center]: Using custom SMTP settings has been changed in Contao 4.10. Please visit <a href="https://docs.contao.org/manual/en/system/settings/#different-e-mail-configurations-and-sender-addresses">the documentation</a> to learn how to define SMTP settings. Then, please update all email gateways that need this feature and disable "Override SMTP settings". + + + + \ No newline at end of file diff --git a/languages/ru/tl_nc_gateway.xlf b/languages/ru/tl_nc_gateway.xlf index 63c6e645..cbc2250b 100644 --- a/languages/ru/tl_nc_gateway.xlf +++ b/languages/ru/tl_nc_gateway.xlf @@ -68,6 +68,14 @@ This gateway will take the Contao e-mail settings by default. If you want to override the SMTP settings for this specific gateway, activate this checkbox. Этот шлюз будет использовать параметры электронной почты Contao по умолчанию. Если вы хотите переопределить параметры SMTP для конкретного шлюза, активируйте этот чекбокс. + + + Mailer transport + + + + Here you can override the mailer transport used to send e-mails. + File type