Display the author in email notifications

nickbe · Apr 8, 2015 · 4325679 · 4325679
1 parent e41495a
commit 4325679
Show file tree

Hide file tree

Showing 18 changed files with 25 additions and 1 deletion.
diff --git a/app/Locale/da_DK/translations.php b/app/Locale/da_DK/translations.php
@@ -846,4 +846,5 @@
     // 'Secret key: ' => '',
     // 'Test your device' => '',
     // 'Assign a color when the task is moved to a specific column' => '',
+    // '%s via Kanboard' => '',
 );
diff --git a/app/Locale/de_DE/translations.php b/app/Locale/de_DE/translations.php
@@ -846,4 +846,5 @@
     // 'Secret key: ' => '',
     // 'Test your device' => '',
     // 'Assign a color when the task is moved to a specific column' => '',
+    // '%s via Kanboard' => '',
 );
diff --git a/app/Locale/es_ES/translations.php b/app/Locale/es_ES/translations.php
@@ -846,4 +846,5 @@
     // 'Secret key: ' => '',
     // 'Test your device' => '',
     // 'Assign a color when the task is moved to a specific column' => '',
+    // '%s via Kanboard' => '',
 );
diff --git a/app/Locale/fi_FI/translations.php b/app/Locale/fi_FI/translations.php
@@ -846,4 +846,5 @@
     // 'Secret key: ' => '',
     // 'Test your device' => '',
     // 'Assign a color when the task is moved to a specific column' => '',
+    // '%s via Kanboard' => '',
 );
diff --git a/app/Locale/fr_FR/translations.php b/app/Locale/fr_FR/translations.php
@@ -848,4 +848,5 @@
     'Secret key: ' => 'Clé secrète : ',
     'Test your device' => 'Testez votre appareil',
     'Assign a color when the task is moved to a specific column' => 'Assigner une couleur lorsque la tâche est déplacée dans une colonne spécifique',
+    '%s via Kanboard' => '%s via Kanboard',
 );
diff --git a/app/Locale/hu_HU/translations.php b/app/Locale/hu_HU/translations.php
@@ -846,4 +846,5 @@
     // 'Secret key: ' => '',
     // 'Test your device' => '',
     // 'Assign a color when the task is moved to a specific column' => '',
+    // '%s via Kanboard' => '',
 );
diff --git a/app/Locale/it_IT/translations.php b/app/Locale/it_IT/translations.php
@@ -846,4 +846,5 @@
     // 'Secret key: ' => '',
     // 'Test your device' => '',
     // 'Assign a color when the task is moved to a specific column' => '',
+    // '%s via Kanboard' => '',
 );
diff --git a/app/Locale/ja_JP/translations.php b/app/Locale/ja_JP/translations.php
@@ -846,4 +846,5 @@
     // 'Secret key: ' => '',
     // 'Test your device' => '',
     // 'Assign a color when the task is moved to a specific column' => '',
+    // '%s via Kanboard' => '',
 );
diff --git a/app/Locale/nl_NL/translations.php b/app/Locale/nl_NL/translations.php
@@ -846,4 +846,5 @@
     // 'Secret key: ' => '',
     // 'Test your device' => '',
     // 'Assign a color when the task is moved to a specific column' => '',
+    // '%s via Kanboard' => '',
 );
diff --git a/app/Locale/pl_PL/translations.php b/app/Locale/pl_PL/translations.php
@@ -846,4 +846,5 @@
     // 'Secret key: ' => '',
     // 'Test your device' => '',
     // 'Assign a color when the task is moved to a specific column' => '',
+    // '%s via Kanboard' => '',
 );
diff --git a/app/Locale/pt_BR/translations.php b/app/Locale/pt_BR/translations.php
@@ -846,4 +846,5 @@
     'Secret key: ' => 'Chave secreta:',
     'Test your device' => 'Teste o seu dispositivo',
     'Assign a color when the task is moved to a specific column' => 'Atribuir uma cor quando a tarefa é movida em uma coluna específica',
+    // '%s via Kanboard' => '',
 );
diff --git a/app/Locale/ru_RU/translations.php b/app/Locale/ru_RU/translations.php
@@ -846,4 +846,5 @@
     // 'Secret key: ' => '',
     // 'Test your device' => '',
     // 'Assign a color when the task is moved to a specific column' => '',
+    // '%s via Kanboard' => '',
 );
diff --git a/app/Locale/sr_Latn_RS/translations.php b/app/Locale/sr_Latn_RS/translations.php
@@ -846,4 +846,5 @@
     // 'Secret key: ' => '',
     // 'Test your device' => '',
     // 'Assign a color when the task is moved to a specific column' => '',
+    // '%s via Kanboard' => '',
 );
diff --git a/app/Locale/sv_SE/translations.php b/app/Locale/sv_SE/translations.php
@@ -846,4 +846,5 @@
     // 'Secret key: ' => '',
     // 'Test your device' => '',
     // 'Assign a color when the task is moved to a specific column' => '',
+    // '%s via Kanboard' => '',
 );
diff --git a/app/Locale/th_TH/translations.php b/app/Locale/th_TH/translations.php
@@ -846,4 +846,5 @@
     // 'Secret key: ' => '',
     // 'Test your device' => '',
     // 'Assign a color when the task is moved to a specific column' => '',
+    // '%s via Kanboard' => '',
 );
diff --git a/app/Locale/tr_TR/translations.php b/app/Locale/tr_TR/translations.php
@@ -846,4 +846,5 @@
     // 'Secret key: ' => '',
     // 'Test your device' => '',
     // 'Assign a color when the task is moved to a specific column' => '',
+    // '%s via Kanboard' => '',
 );
diff --git a/app/Locale/zh_CN/translations.php b/app/Locale/zh_CN/translations.php
@@ -846,4 +846,5 @@
     'Secret key: ' => '密码：',
     'Test your device' => '测试设备',
     'Assign a color when the task is moved to a specific column' => '任务移动到指定栏目时设置颜色',
+    // '%s via Kanboard' => '',
 );
diff --git a/app/Model/Notification.php b/app/Model/Notification.php
@@ -101,11 +101,18 @@ public function getUsersList($project_id, array $exclude_users = array())
     public function sendEmails($template, array $users, array $data)
     {
         try {
+
+            $author = '';
+
+            if (Session::isOpen()) {
+                $author = e('%s via Kanboard', $this->user->getFullname($this->session['user']));
+            }
+
             $mailer = Swift_Mailer::newInstance($this->container['mailer']);
 
             $message = Swift_Message::newInstance()
                             ->setSubject($this->getMailSubject($template, $data))
-                            ->setFrom(array(MAIL_FROM => 'Kanboard'))
+                            ->setFrom(array(MAIL_FROM => $author ?: 'Kanboard'))
                             ->setBody($this->getMailContent($template, $data), 'text/html');
 
             foreach ($users as $user) {