Merge branch 'hotfix/1.3.10'

terminal42 · Jan 31, 2017 · d6038f5 · d6038f5
2 parents f79f292 + 3569690
commit d6038f5
Show file tree

Hide file tree

Showing 14 changed files with 82 additions and 60 deletions.
diff --git a/README.md b/README.md
@@ -88,3 +88,31 @@ class MyHook
     }
 }
 ```
+
+
+## Note to self
+
+Updating language files:
+
+Generating the `en` base folder:
+```
+$ ./vendor/bin/ctb to-xliff 
+```
+
+Pushing `en` to transifex:
+
+```
+$ ./vendor/bin/ctb download-transifex en
+```
+
+Downloading translations:
+
+```
+$ ./vendor/bin/ctb download-transifex --mode=translated
+```
+
+Storing the language files:
+
+```
+$ ./vendor/bin/ctb from-xliff
+```
diff --git a/composer.json b/composer.json
@@ -18,7 +18,7 @@
         "terminal42/dcawizard":"2.*"
     },
     "require-dev": {
-        "contao/manager-plugin": "~1.0"
+        "cyberspectrum/contao-toolbox": "^0.7.2"
     },
     "autoload":{
         "psr-0": {
@@ -44,7 +44,6 @@
                 "languages_cto": "languages",
                 "languages_tx": ".tx"
             }
-        },
-        "contao-manager-plugin": "NotificationCenter\\ContaoManager\\Plugin"
+        }
     }
 }
diff --git a/dca/tl_nc_gateway.php b/dca/tl_nc_gateway.php
@@ -205,36 +205,36 @@
         ),
         'email_smtpHost' => array
         (
-            'label'                   => &$GLOBALS['TL_LANG']['tl_settings']['smtpHost'],
+            'label'                   => &$GLOBALS['TL_LANG']['tl_nc_gateway']['smtpHost'],
             'inputType'               => 'text',
             'eval'                    => array('mandatory'=>true, 'nospace'=>true, 'tl_class'=>'long'),
             'sql'                     => "varchar(255) NOT NULL default ''"
         ),
         'email_smtpUser' => array
         (
-            'label'                   => &$GLOBALS['TL_LANG']['tl_settings']['smtpUser'],
+            'label'                   => &$GLOBALS['TL_LANG']['tl_nc_gateway']['smtpUser'],
             'inputType'               => 'text',
             'eval'                    => array('decodeEntities'=>true, 'tl_class'=>'w50'),
             'sql'                     => "varchar(255) NOT NULL default ''"
         ),
         'email_smtpPass' => array
         (
-            'label'                   => &$GLOBALS['TL_LANG']['tl_settings']['smtpPass'],
+            'label'                   => &$GLOBALS['TL_LANG']['tl_nc_gateway']['smtpPass'],
             'inputType'               => 'textStore',
             'eval'                    => array('decodeEntities'=>true, 'tl_class'=>'w50'),
             'sql'                     => "varchar(255) NOT NULL default ''"
         ),
         'email_smtpEnc' => array
         (
-            'label'                   => &$GLOBALS['TL_LANG']['tl_settings']['smtpEnc'],
+            'label'                   => &$GLOBALS['TL_LANG']['tl_nc_gateway']['smtpEnc'],
             'inputType'               => 'select',
             'options'                 => array(''=>'-', 'ssl'=>'SSL', 'tls'=>'TLS'),
             'eval'                    => array('tl_class'=>'w50'),
             'sql'                     => "varchar(3) NOT NULL default ''"
         ),
         'email_smtpPort' => array
         (
-            'label'                   => &$GLOBALS['TL_LANG']['tl_settings']['smtpPort'],
+            'label'                   => &$GLOBALS['TL_LANG']['tl_nc_gateway']['smtpPort'],
             'inputType'               => 'text',
             'eval'                    => array('mandatory'=>true, 'rgxp'=>'digit', 'nospace'=>true, 'tl_class'=>'w50'),
             'sql'                     => "varchar(16) NOT NULL default ''"

diff --git a/languages/de/modules.php b/languages/de/modules.php
@@ -8,14 +8,14 @@
  *
  * @license http://www.gnu.org/licenses/lgpl-3.0.html LGPL
  *
- * last-updated: 2014-04-14T09:17:13+02:00
+ * last-updated: 2017-01-31T15:36:46+00:00
  */
 
-$GLOBALS['TL_LANG']['FMD']['lostPasswordNotificationCenter']['0'] = 'Passwort vergessen (Benachrichtigungscenter)';
-$GLOBALS['TL_LANG']['FMD']['lostPasswordNotificationCenter']['1'] = 'Generiert ein Formular um ein neues Passwort anzufordern und versendet   anschließend die Benachrichtigung über das Notification Center.';
+$GLOBALS['TL_LANG']['FMD']['lostPasswordNotificationCenter']['0'] = 'Passwort vergessen (Notification Center)';
+$GLOBALS['TL_LANG']['FMD']['lostPasswordNotificationCenter']['1'] = 'Generiert ein Formular um ein neues Passwort anzufordern und versendet anschließend die Benachrichtigung über das Notification Center.';
 $GLOBALS['TL_LANG']['MOD']['nc_gateways']['0']                    = 'Gateways';
 $GLOBALS['TL_LANG']['MOD']['nc_gateways']['1']                    = 'Gateways verwalten';
 $GLOBALS['TL_LANG']['MOD']['nc_notifications']['0']               = 'Benachrichtigungen';
 $GLOBALS['TL_LANG']['MOD']['nc_notifications']['1']               = 'Benachrichtigungen verwalten.';
-$GLOBALS['TL_LANG']['MOD']['notification_center']                 = 'Benachrichtigungscenter';
+$GLOBALS['TL_LANG']['MOD']['notification_center']                 = 'Notification Center';
 
diff --git a/languages/de/tl_nc_language.php b/languages/de/tl_nc_language.php
@@ -8,13 +8,13 @@
  *
  * @license http://www.gnu.org/licenses/lgpl-3.0.html LGPL
  *
- * last-updated: 2014-04-14T09:17:13+02:00
+ * last-updated: 2017-01-31T15:36:46+00:00
  */
 
-$GLOBALS['TL_LANG']['tl_nc_language']['attachment_tokens']['0']    = 'Attachments via tokens';
-$GLOBALS['TL_LANG']['tl_nc_language']['attachment_tokens']['1']    = 'Bitte geben Sie eine <strong>Komma-separierte</strong> Liste der Empfänger in dieses Feld ein. Nutzen Sie die Autovervollständigung um die verfügbaren "Platzhalter" zu sehen. (Beginnen Sie mit ##)';
-$GLOBALS['TL_LANG']['tl_nc_language']['attachments']['0']          = 'Attachments vom Filesystem';
-$GLOBALS['TL_LANG']['tl_nc_language']['attachments']['1']          = 'Please wähle mit dem Filepicker die statischen Dateien, die du ans Mail anfügen willst.';
+$GLOBALS['TL_LANG']['tl_nc_language']['attachment_tokens']['0']    = 'Dateianhänge via Tokens';
+$GLOBALS['TL_LANG']['tl_nc_language']['attachment_tokens']['1']    = 'Bitte geben Sie eine <strong>Komma-separierte</strong> Liste von Attachment-Tokens in dieses Feld ein. Nutzen Sie die Autovervollständigung um die verfügbaren "Platzhalter" zu sehen. (Beginnen Sie mit ##)';
+$GLOBALS['TL_LANG']['tl_nc_language']['attachments']['0']          = 'Dateianhänge vom Dateisystem';
+$GLOBALS['TL_LANG']['tl_nc_language']['attachments']['1']          = 'Bitte wählen Sie mit dem Dateiwähler die statischen Dateien aus, die zur Mail hinzugefügt werden sollen.';
 $GLOBALS['TL_LANG']['tl_nc_language']['attachments_legend']        = 'Attachments';
 $GLOBALS['TL_LANG']['tl_nc_language']['content_legend']            = 'Inhalt';
 $GLOBALS['TL_LANG']['tl_nc_language']['copy']['0']                 = 'Sprache kopieren';
@@ -26,7 +26,7 @@
 $GLOBALS['TL_LANG']['tl_nc_language']['email_html']['0']           = 'HTML';
 $GLOBALS['TL_LANG']['tl_nc_language']['email_html']['1']           = 'Bitte HTML eingeben.';
 $GLOBALS['TL_LANG']['tl_nc_language']['email_mode']['0']           = 'Modus';
-$GLOBALS['TL_LANG']['tl_nc_language']['email_mode']['1']           = 'Bitte den gewünschten Modus für das Email wählen.';
+$GLOBALS['TL_LANG']['tl_nc_language']['email_mode']['1']           = 'Bitte den gewünschten Modus für diese E-Mail wählen.';
 $GLOBALS['TL_LANG']['tl_nc_language']['email_mode']['textAndHtml'] = 'HTML und Text';
 $GLOBALS['TL_LANG']['tl_nc_language']['email_mode']['textOnly']    = 'Nur Text';
 $GLOBALS['TL_LANG']['tl_nc_language']['email_recipient_bcc']['0']  = 'BCC-Empfänger';
@@ -35,16 +35,16 @@
 $GLOBALS['TL_LANG']['tl_nc_language']['email_recipient_cc']['1']   = 'Emptänger die eine Kopie des Mails erhalten sollten. Mehrere Adressen per Komma separieren.';
 $GLOBALS['TL_LANG']['tl_nc_language']['email_replyTo']['0']        = 'Antwort an (Reply-To)';
 $GLOBALS['TL_LANG']['tl_nc_language']['email_replyTo']['1']        = 'Optionale "Antwort an" E-Mail-Adresse.';
-$GLOBALS['TL_LANG']['tl_nc_language']['email_sender_address']['0'] = 'Absender-Email';
-$GLOBALS['TL_LANG']['tl_nc_language']['email_sender_address']['1'] = 'Bitte gebe die Absender-Adresse ein.';
+$GLOBALS['TL_LANG']['tl_nc_language']['email_sender_address']['0'] = 'Absender-E-Mail';
+$GLOBALS['TL_LANG']['tl_nc_language']['email_sender_address']['1'] = 'Bitte geben Sie die Absender-Adresse ein.';
 $GLOBALS['TL_LANG']['tl_nc_language']['email_sender_name']['0']    = 'Absendername';
-$GLOBALS['TL_LANG']['tl_nc_language']['email_sender_name']['1']    = 'Bitte gebe den Absender ein.';
+$GLOBALS['TL_LANG']['tl_nc_language']['email_sender_name']['1']    = 'Bitte geben Sie den Absender ein.';
 $GLOBALS['TL_LANG']['tl_nc_language']['email_subject']['0']        = 'Subject';
 $GLOBALS['TL_LANG']['tl_nc_language']['email_subject']['1']        = 'Bite den Betreff für das Email eingeben.';
 $GLOBALS['TL_LANG']['tl_nc_language']['email_text']['0']           = 'Rohtext';
 $GLOBALS['TL_LANG']['tl_nc_language']['email_text']['1']           = 'Bitte den Text eingeben.';
 $GLOBALS['TL_LANG']['tl_nc_language']['fallback']['0']             = 'Fallback-Sprache';
-$GLOBALS['TL_LANG']['tl_nc_language']['fallback']['1']             = 'Markiere die Checkbox falls dies die Fallback-Sprache ist.';
+$GLOBALS['TL_LANG']['tl_nc_language']['fallback']['1']             = 'Markieren Sie die Checkbox falls dies die Fallback-Sprache ist.';
 $GLOBALS['TL_LANG']['tl_nc_language']['file_content']['0']         = 'Datei Inhalt';
 $GLOBALS['TL_LANG']['tl_nc_language']['file_content']['1']         = 'Dateiinhalt eingeben.';
 $GLOBALS['TL_LANG']['tl_nc_language']['file_name']['0']            = 'Dateiname';

diff --git a/languages/en/tl_nc_gateway.php b/languages/en/tl_nc_gateway.php
@@ -28,6 +28,13 @@
 $GLOBALS['TL_LANG']['tl_nc_gateway']['postmark_key']                = array('Postmark API key', 'Please enter your unique Postmark API key.');
 $GLOBALS['TL_LANG']['tl_nc_gateway']['postmark_test']               = array('Enable test mode', 'Here you can enable the test mode.');
 $GLOBALS['TL_LANG']['tl_nc_gateway']['postmark_ssl']                = array('Enable SSL', 'Here you can enable the SSL connection.');
+$GLOBALS['TL_LANG']['tl_nc_gateway']['useSMTP']                     = array('Send e-mails via SMTP', 'Use an SMTP server instead of the PHP mail() function to send e-mails.');
+$GLOBALS['TL_LANG']['tl_nc_gateway']['smtpHost']                    = array('SMTP hostname', 'Please enter the host name of the SMTP server.');
+$GLOBALS['TL_LANG']['tl_nc_gateway']['smtpUser']                    = array('SMTP username', 'Here you can enter the SMTP username.');
+$GLOBALS['TL_LANG']['tl_nc_gateway']['smtpPass']                    = array('SMTP password', 'Here you can enter the SMTP password.');
+$GLOBALS['TL_LANG']['tl_nc_gateway']['smtpEnc']                     = array('SMTP encryption', 'Here you can choose an encryption method (SSL or TLS).');
+$GLOBALS['TL_LANG']['tl_nc_gateway']['smtpPort']                    = array('SMTP port number', 'Please enter the port number of the SMTP server.');
+
 
 /**
  * Reference

diff --git a/languages/fr/tl_nc_gateway.php b/languages/fr/tl_nc_gateway.php
@@ -8,7 +8,7 @@
  *
  * @license http://www.gnu.org/licenses/lgpl-3.0.html LGPL
  *
- * last-updated: 2014-03-12T13:42:08+01:00
+ * last-updated: 2016-08-25T13:45:03+00:00
  */
 
 $GLOBALS['TL_LANG']['tl_nc_gateway']['copy']['0']                = 'Copier la passerelle';
@@ -43,6 +43,12 @@
 $GLOBALS['TL_LANG']['tl_nc_gateway']['gateway_legend']           = 'Paramètre de la passerelle';
 $GLOBALS['TL_LANG']['tl_nc_gateway']['new']['0']                 = 'Nouvelle passerelle';
 $GLOBALS['TL_LANG']['tl_nc_gateway']['new']['1']                 = 'Créer une nouvelle passerelle.';
+$GLOBALS['TL_LANG']['tl_nc_gateway']['postmark_key']['0']        = 'Clé d\'API Postmark';
+$GLOBALS['TL_LANG']['tl_nc_gateway']['postmark_key']['1']        = 'Veuillez insérer votre clé unique d\'API Postmark';
+$GLOBALS['TL_LANG']['tl_nc_gateway']['postmark_ssl']['0']        = 'Autoriser le SSL';
+$GLOBALS['TL_LANG']['tl_nc_gateway']['postmark_ssl']['1']        = 'Ici vous pouvez autoriser la connection SSL';
+$GLOBALS['TL_LANG']['tl_nc_gateway']['postmark_test']['0']       = 'Autoriser le mode de test';
+$GLOBALS['TL_LANG']['tl_nc_gateway']['postmark_test']['1']       = 'Ici vous pouvez activer le mode de test';
 $GLOBALS['TL_LANG']['tl_nc_gateway']['show']['0']                = 'Détails de la passerelle';
 $GLOBALS['TL_LANG']['tl_nc_gateway']['show']['1']                = 'Afficher les détails de la passerelle ID %s.';
 $GLOBALS['TL_LANG']['tl_nc_gateway']['title']['0']               = 'Titre';
@@ -52,4 +58,5 @@
 $GLOBALS['TL_LANG']['tl_nc_gateway']['type']['1']                = 'Sélectionner le type de cette passerelle.';
 $GLOBALS['TL_LANG']['tl_nc_gateway']['type']['email']            = 'Passerelle de messagerie standard';
 $GLOBALS['TL_LANG']['tl_nc_gateway']['type']['file']             = 'Écrire dans un fichier';
+$GLOBALS['TL_LANG']['tl_nc_gateway']['type']['postmark']         = 'Postmark (postmarkapp.com)';
 
diff --git a/languages/fr/tl_nc_language.php b/languages/fr/tl_nc_language.php
@@ -8,11 +8,11 @@
  *
  * @license http://www.gnu.org/licenses/lgpl-3.0.html LGPL
  *
- * last-updated: 2014-03-12T13:50:45+01:00
+ * last-updated: 2017-01-31T15:36:46+00:00
  */
 
 $GLOBALS['TL_LANG']['tl_nc_language']['attachment_tokens']['0']    = 'Fichiers joints à partir de jetons';
-$GLOBALS['TL_LANG']['tl_nc_language']['attachment_tokens']['1']    = 'Saisir une liste <strong>séparée par des virgules </strong> de jetons de fichiers à joindre. Utiliser l\'assistant d\'aide pour voir afficher les jetons disponibles.';
+$GLOBALS['TL_LANG']['tl_nc_language']['attachment_tokens']['1']    = 'Veuillez insérer la liste <strong>séparée par des virgules</strong> des jetons joints à ce champ. Utilisez l\'autocompletion pour afficher les tokens valide';
 $GLOBALS['TL_LANG']['tl_nc_language']['attachments']['0']          = 'Fichiers joints à partir du gestionnaire de fichiers';
 $GLOBALS['TL_LANG']['tl_nc_language']['attachments']['1']          = 'Utiliser le sélecteur de fichier pour ajouter des fichiers statiques.';
 $GLOBALS['TL_LANG']['tl_nc_language']['attachments_legend']        = 'Fichiers joints';
@@ -58,7 +58,7 @@
 $GLOBALS['TL_LANG']['tl_nc_language']['new']['0']                  = 'Nouvelle langue';
 $GLOBALS['TL_LANG']['tl_nc_language']['new']['1']                  = 'Ajouter une nouvelle langue.';
 $GLOBALS['TL_LANG']['tl_nc_language']['recipients']['0']           = 'Destinataires';
-$GLOBALS['TL_LANG']['tl_nc_language']['recipients']['1']           = 'Saisir une liste <strong>séparée par des virgules</strong> de destinataires. Utiliser l\'assistant d\'aide pour voir afficher les jetons disponibles.';
+$GLOBALS['TL_LANG']['tl_nc_language']['recipients']['1']           = 'Veuillez insérer la lise <strong>séparée par des virgules</strong> des destinataires dans ce champs. Utilisez l\'auto-completion pour afficher les tokens valide';
 $GLOBALS['TL_LANG']['tl_nc_language']['show']['0']                 = 'Détails de la langue';
 $GLOBALS['TL_LANG']['tl_nc_language']['show']['1']                 = 'Afficher les détails de la langue ID %s.';
 $GLOBALS['TL_LANG']['tl_nc_language']['token_error']               = 'Les jetons suivants utilisés ne sont pas pris en charge par ce type de notification : %s.';

diff --git a/languages/fr/tl_nc_message.php b/languages/fr/tl_nc_message.php
@@ -8,12 +8,13 @@
  *
  * @license http://www.gnu.org/licenses/lgpl-3.0.html LGPL
  *
- * last-updated: 2014-02-28T08:54:11+01:00
+ * last-updated: 2016-08-25T13:45:03+00:00
  */
 
-
-$GLOBALS['TL_LANG']['tl_nc_message']['copy']['0']                   = 'Copier les message';
-$GLOBALS['TL_LANG']['tl_nc_message']['copy']['1']                   = 'Copier le message ID %s.';
+$GLOBALS['TL_LANG']['tl_nc_message']['copy']['0']                   = 'Dupliquer le message';
+$GLOBALS['TL_LANG']['tl_nc_message']['copy']['1']                   = 'Dupliquer le message d\'ID %s';
+$GLOBALS['TL_LANG']['tl_nc_message']['cut']['0']                    = 'Déplacer le message';
+$GLOBALS['TL_LANG']['tl_nc_message']['cut']['1']                    = 'Déplacer le message d\'ID %s';
 $GLOBALS['TL_LANG']['tl_nc_message']['delete']['0']                 = 'Supprimer le message';
 $GLOBALS['TL_LANG']['tl_nc_message']['delete']['1']                 = 'Supprimer le message ID %s.';
 $GLOBALS['TL_LANG']['tl_nc_message']['edit']['0']                   = 'Éditer le message';
@@ -37,6 +38,10 @@
 $GLOBALS['TL_LANG']['tl_nc_message']['languages_legend']            = 'Langues';
 $GLOBALS['TL_LANG']['tl_nc_message']['new']['0']                    = 'Nouveau message';
 $GLOBALS['TL_LANG']['tl_nc_message']['new']['1']                    = 'Créer un nouveau message.';
+$GLOBALS['TL_LANG']['tl_nc_message']['postmark_tag']['0']           = 'Balise';
+$GLOBALS['TL_LANG']['tl_nc_message']['postmark_tag']['1']           = 'Ici vous pouvez insérer la balise';
+$GLOBALS['TL_LANG']['tl_nc_message']['postmark_trackOpens']['0']    = 'Autoriser le suivi de l\'ouverture';
+$GLOBALS['TL_LANG']['tl_nc_message']['postmark_trackOpens']['1']    = 'Ici vous pouvez autoriser le suivi de l\'ouverture';
 $GLOBALS['TL_LANG']['tl_nc_message']['publish_legend']              = 'Paramètres de publication';
 $GLOBALS['TL_LANG']['tl_nc_message']['published']['0']              = 'Publier le message';
 $GLOBALS['TL_LANG']['tl_nc_message']['published']['1']              = 'Inclure ce message quand une notification est envoyée.';

diff --git a/languages/fr/tl_nc_notification.php b/languages/fr/tl_nc_notification.php
@@ -8,7 +8,7 @@
  *
  * @license http://www.gnu.org/licenses/lgpl-3.0.html LGPL
  *
- * last-updated: 2014-03-12T13:42:08+01:00
+ * last-updated: 2016-08-25T13:45:03+00:00
  */
 
 $GLOBALS['TL_LANG']['tl_nc_notification']['config_legend']                    = 'Configuration';
@@ -36,5 +36,6 @@
 $GLOBALS['TL_LANG']['tl_nc_notification']['type']['email']                    = 'Passerelle de messagerie standard';
 $GLOBALS['TL_LANG']['tl_nc_notification']['type']['file']                     = 'Écrire dans un fichier';
 $GLOBALS['TL_LANG']['tl_nc_notification']['type']['member_password']['0']     = 'Mot de passe perdu';
+$GLOBALS['TL_LANG']['tl_nc_notification']['type']['member_personaldata']['0'] = 'Données personnelles du membre';
 $GLOBALS['TL_LANG']['tl_nc_notification']['type']['member_registration']['0'] = 'Inscription des membres';
 
diff --git a/languages/fr/tokens.php b/languages/fr/tokens.php
@@ -8,10 +8,10 @@
  *
  * @license http://www.gnu.org/licenses/lgpl-3.0.html LGPL
  *
- * last-updated: 2014-03-12T13:42:08+01:00
+ * last-updated: 2016-08-25T13:45:03+00:00
  */
 
-
 $GLOBALS['TL_LANG']['NOTIFICATION_CENTER_TOKEN']['core_form']['admin_email'] = 'Adresse e-mail de l\'administrateur de la page en cours.';
 $GLOBALS['TL_LANG']['NOTIFICATION_CENTER_TOKEN']['core_form']['form_*']      = 'Tous les champs du formulaire.';
+$GLOBALS['TL_LANG']['NOTIFICATION_CENTER_TOKEN']['core_form']['raw_data']    = 'Tous les champs du formulaire et leur valeur non échappée';
 
diff --git a/languages/pl/tl_nc_language.php b/languages/pl/tl_nc_language.php
@@ -8,7 +8,7 @@
  *
  * @license http://www.gnu.org/licenses/lgpl-3.0.html LGPL
  *
- * last-updated: 2014-03-12T13:42:08+01:00
+ * last-updated: 2017-01-31T15:36:46+00:00
  */
 
 $GLOBALS['TL_LANG']['tl_nc_language']['attachment_tokens']['0']    = 'Załączniki z tokenów';

diff --git a/languages/ru/tl_nc_language.php b/languages/ru/tl_nc_language.php
@@ -8,7 +8,7 @@
  *
  * @license http://www.gnu.org/licenses/lgpl-3.0.html LGPL
  *
- * last-updated: 2014-07-17T14:48:39+02:00
+ * last-updated: 2017-01-31T15:36:46+00:00
  */
 
 $GLOBALS['TL_LANG']['tl_nc_language']['attachment_tokens']['0']    = 'Вложения через маркеры';

diff --git a/library/NotificationCenter/ContaoManager/Plugin.php b/library/NotificationCenter/ContaoManager/Plugin.php