Merge branch 'hotfix/1.5.15'

terminal42 · Aug 24, 2020 · 144ca28 · 144ca28
2 parents 4901e51 + 4bcdda2
commit 144ca28
Show file tree

Hide file tree

Showing 16 changed files with 128 additions and 1 deletion.
diff --git 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/<lang>/default.xlf
+source_file = languages/en/default.xlf
+source_lang = en
+
 [notification_center.master-notification_center-modules]
 file_filter = languages/<lang>/modules.xlf
 source_file = languages/en/modules.xlf

diff --git a/languages/cs/default.xlf b/languages/cs/default.xlf
@@ -0,0 +1,9 @@
+<?xml version="1.0" ?><xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
+  <file datatype="php" date="2018-10-22T10:57:28+02:00" original="default" source-language="en" target-language="cs">
+    <body>
+      <trans-unit id="MSC.notification_center.warn_legacy_smtp">
+        <source>[Notification Center]: Using custom SMTP settings has been changed in Contao 4.10. Please visit &lt;a href=&quot;https://docs.contao.org/manual/en/system/settings/#different-e-mail-configurations-and-sender-addresses&quot;&gt;the documentation&lt;/a&gt; to learn how to define SMTP settings. Then, please update all email gateways that need this feature and disable &quot;Override SMTP settings&quot;.</source>
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
diff --git a/languages/cs/tl_nc_gateway.xlf b/languages/cs/tl_nc_gateway.xlf
@@ -70,6 +70,14 @@
         <source>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.</source>
         <target>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.</target>
 
+      </trans-unit>
+      <trans-unit id="tl_nc_gateway.mailerTransport.0">
+        <source>Mailer transport</source>
+
+      </trans-unit>
+      <trans-unit id="tl_nc_gateway.mailerTransport.1">
+        <source>Here you can override the mailer transport used to send e-mails.</source>
+
       </trans-unit>
       <trans-unit id="tl_nc_gateway.file_type.0">
         <source>File type</source>

diff --git a/languages/de/default.xlf b/languages/de/default.xlf
@@ -0,0 +1,10 @@
+<?xml version="1.0" ?><xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
+  <file datatype="php" date="2018-10-22T10:57:28+02:00" original="default" source-language="en" target-language="de">
+    <body>
+      <trans-unit id="MSC.notification_center.warn_legacy_smtp">
+        <source>[Notification Center]: Using custom SMTP settings has been changed in Contao 4.10. Please visit &lt;a href=&quot;https://docs.contao.org/manual/en/system/settings/#different-e-mail-configurations-and-sender-addresses&quot;&gt;the documentation&lt;/a&gt; to learn how to define SMTP settings. Then, please update all email gateways that need this feature and disable &quot;Override SMTP settings&quot;.</source>
+        <target>[Notification Center]: Die Verwendung eigener SMTP-Einstellungen wurde in Contao 4.10 geändert. Bitte besuchen Sie &lt;a href=&quot;https://docs.contao.org/manual/de/system/einstellungen/#verschiedene-e-mail-konfigurationen-und-absenderadressen&quot;&gt;die Dokumentation&lt;/a&gt;, 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 &quot;SMTP-Einstellungen überschreiben&quot;.</target>
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
diff --git a/languages/de/tl_nc_gateway.xlf b/languages/de/tl_nc_gateway.xlf
@@ -70,6 +70,16 @@
         <source>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.</source>
         <target>Aktivieren Sie diese Checkbox um die Contao SMTP-Einstellungen (Systemeinstellungen) zu überschreiben und sie anschließend zu individualisieren. </target>
 
+      </trans-unit>
+      <trans-unit id="tl_nc_gateway.mailerTransport.0">
+        <source>Mailer transport</source>
+        <target>Mailer-Transport</target>
+
+      </trans-unit>
+      <trans-unit id="tl_nc_gateway.mailerTransport.1">
+        <source>Here you can override the mailer transport used to send e-mails.</source>
+        <target>Hier können Sie den Mailer-Transport überschreiben, der für den E-Mail-Versand verwendet wird.</target>
+
       </trans-unit>
       <trans-unit id="tl_nc_gateway.file_type.0">
         <source>File type</source>

diff --git a/languages/fr/default.xlf b/languages/fr/default.xlf
@@ -0,0 +1,9 @@
+<?xml version="1.0" ?><xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
+  <file datatype="php" date="2018-10-22T10:57:28+02:00" original="default" source-language="en" target-language="fr">
+    <body>
+      <trans-unit id="MSC.notification_center.warn_legacy_smtp">
+        <source>[Notification Center]: Using custom SMTP settings has been changed in Contao 4.10. Please visit &lt;a href=&quot;https://docs.contao.org/manual/en/system/settings/#different-e-mail-configurations-and-sender-addresses&quot;&gt;the documentation&lt;/a&gt; to learn how to define SMTP settings. Then, please update all email gateways that need this feature and disable &quot;Override SMTP settings&quot;.</source>
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
diff --git a/languages/fr/tl_nc_gateway.xlf b/languages/fr/tl_nc_gateway.xlf
@@ -62,6 +62,14 @@
         <source>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.</source>
         <target>Cette passerelle utilisera les paramètres de courrier électronique par défaut de Contao. Cocher pour surcharger les paramètres SMTP de cette passerelle.</target>
 
+      </trans-unit>
+      <trans-unit id="tl_nc_gateway.mailerTransport.0">
+        <source>Mailer transport</source>
+
+      </trans-unit>
+      <trans-unit id="tl_nc_gateway.mailerTransport.1">
+        <source>Here you can override the mailer transport used to send e-mails.</source>
+
       </trans-unit>
       <trans-unit id="tl_nc_gateway.file_type.0">
         <source>File type</source>

diff --git a/languages/it/default.xlf b/languages/it/default.xlf
@@ -0,0 +1,9 @@
+<?xml version="1.0" ?><xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
+  <file datatype="php" date="2018-10-22T10:57:28+02:00" original="default" source-language="en" target-language="it">
+    <body>
+      <trans-unit id="MSC.notification_center.warn_legacy_smtp">
+        <source>[Notification Center]: Using custom SMTP settings has been changed in Contao 4.10. Please visit &lt;a href=&quot;https://docs.contao.org/manual/en/system/settings/#different-e-mail-configurations-and-sender-addresses&quot;&gt;the documentation&lt;/a&gt; to learn how to define SMTP settings. Then, please update all email gateways that need this feature and disable &quot;Override SMTP settings&quot;.</source>
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
diff --git a/languages/it/tl_nc_gateway.xlf b/languages/it/tl_nc_gateway.xlf
@@ -58,6 +58,14 @@
       <trans-unit id="tl_nc_gateway.email_overrideSmtp.1">
         <source>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.</source>
 
+      </trans-unit>
+      <trans-unit id="tl_nc_gateway.mailerTransport.0">
+        <source>Mailer transport</source>
+
+      </trans-unit>
+      <trans-unit id="tl_nc_gateway.mailerTransport.1">
+        <source>Here you can override the mailer transport used to send e-mails.</source>
+
       </trans-unit>
       <trans-unit id="tl_nc_gateway.file_type.0">
         <source>File type</source>

diff --git a/languages/ja/default.xlf b/languages/ja/default.xlf
@@ -0,0 +1,9 @@
+<?xml version="1.0" ?><xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
+  <file datatype="php" date="2018-10-22T10:57:28+02:00" original="default" source-language="en" target-language="ja">
+    <body>
+      <trans-unit id="MSC.notification_center.warn_legacy_smtp">
+        <source>[Notification Center]: Using custom SMTP settings has been changed in Contao 4.10. Please visit &lt;a href=&quot;https://docs.contao.org/manual/en/system/settings/#different-e-mail-configurations-and-sender-addresses&quot;&gt;the documentation&lt;/a&gt; to learn how to define SMTP settings. Then, please update all email gateways that need this feature and disable &quot;Override SMTP settings&quot;.</source>
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
diff --git a/languages/ja/tl_nc_gateway.xlf b/languages/ja/tl_nc_gateway.xlf
@@ -70,6 +70,14 @@
         <source>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.</source>
         <target>このゲートウェイは初期設定ではContaoの電子メールの設定を使用します。この特定のゲートウェイでSMTPの設定を変えたい場合は、このチェックボックスを選択してください。</target>
 
+      </trans-unit>
+      <trans-unit id="tl_nc_gateway.mailerTransport.0">
+        <source>Mailer transport</source>
+
+      </trans-unit>
+      <trans-unit id="tl_nc_gateway.mailerTransport.1">
+        <source>Here you can override the mailer transport used to send e-mails.</source>
+
       </trans-unit>
       <trans-unit id="tl_nc_gateway.file_type.0">
         <source>File type</source>

diff --git a/languages/pl/default.xlf b/languages/pl/default.xlf
@@ -0,0 +1,9 @@
+<?xml version="1.0" ?><xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
+  <file datatype="php" date="2018-10-22T10:57:28+02:00" original="default" source-language="en" target-language="pl">
+    <body>
+      <trans-unit id="MSC.notification_center.warn_legacy_smtp">
+        <source>[Notification Center]: Using custom SMTP settings has been changed in Contao 4.10. Please visit &lt;a href=&quot;https://docs.contao.org/manual/en/system/settings/#different-e-mail-configurations-and-sender-addresses&quot;&gt;the documentation&lt;/a&gt; to learn how to define SMTP settings. Then, please update all email gateways that need this feature and disable &quot;Override SMTP settings&quot;.</source>
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
diff --git a/languages/pl/tl_nc_gateway.xlf b/languages/pl/tl_nc_gateway.xlf
@@ -62,6 +62,14 @@
         <source>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.</source>
         <target>Bramka będzie używać domyślnej konfiguracji e-mail Contao. Jeśli chcesz nadpisać ustawienia SMTP dla tej bramki, zaznacz ten checkbox.</target>
 
+      </trans-unit>
+      <trans-unit id="tl_nc_gateway.mailerTransport.0">
+        <source>Mailer transport</source>
+
+      </trans-unit>
+      <trans-unit id="tl_nc_gateway.mailerTransport.1">
+        <source>Here you can override the mailer transport used to send e-mails.</source>
+
       </trans-unit>
       <trans-unit id="tl_nc_gateway.file_type.0">
         <source>File type</source>

diff --git a/languages/ru/default.xlf b/languages/ru/default.xlf
@@ -0,0 +1,9 @@
+<?xml version="1.0" ?><xliff version="1.2" xmlns="urn:oasis:names:tc:xliff:document:1.2">
+  <file datatype="php" date="2018-10-22T10:57:28+02:00" original="default" source-language="en" target-language="ru">
+    <body>
+      <trans-unit id="MSC.notification_center.warn_legacy_smtp">
+        <source>[Notification Center]: Using custom SMTP settings has been changed in Contao 4.10. Please visit &lt;a href=&quot;https://docs.contao.org/manual/en/system/settings/#different-e-mail-configurations-and-sender-addresses&quot;&gt;the documentation&lt;/a&gt; to learn how to define SMTP settings. Then, please update all email gateways that need this feature and disable &quot;Override SMTP settings&quot;.</source>
+      </trans-unit>
+    </body>
+  </file>
+</xliff>
diff --git a/languages/ru/tl_nc_gateway.xlf b/languages/ru/tl_nc_gateway.xlf
@@ -68,6 +68,14 @@
         <source>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.</source>
         <target>Этот шлюз будет использовать параметры электронной почты Contao по умолчанию. Если вы хотите переопределить параметры SMTP для конкретного шлюза, активируйте этот чекбокс.</target>
 
+      </trans-unit>
+      <trans-unit id="tl_nc_gateway.mailerTransport.0">
+        <source>Mailer transport</source>
+
+      </trans-unit>
+      <trans-unit id="tl_nc_gateway.mailerTransport.1">
+        <source>Here you can override the mailer transport used to send e-mails.</source>
+
       </trans-unit>
       <trans-unit id="tl_nc_gateway.file_type.0">
         <source>File type</source>

diff --git 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 '';
         }