From b7dc0abc3479cf6b6327607318cd57a98f0f127e Mon Sep 17 00:00:00 2001
From: Paul van der Walt <paul@denknerd.org>
Date: Tue, 15 Sep 2015 18:20:13 +0200
Subject: [PATCH] In English we don't surround colons (:) with spaces.

---
 adminstuds.php          | 4 ++--
 create_classic_poll.php | 4 ++--
 create_date_poll.php    | 6 +++---
 studs.php               | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/adminstuds.php b/adminstuds.php
index d5f9cab..a7c8931 100644
--- a/adminstuds.php
+++ b/adminstuds.php
@@ -67,7 +67,7 @@ function sendUpdateNotification($poll, $mailService, $type) {
 
     if ($poll->receiveNewVotes) {
 
-        $subject = '[' . NOMAPPLICATION . '] ' . __('Mail', 'Notification of poll') . ' : ' . $poll->title;
+        $subject = '[' . NOMAPPLICATION . '] ' . __('Mail', 'Notification of poll') . ': ' . $poll->title;
 
         $message = '';
         switch ($type) {
@@ -433,4 +433,4 @@ $smarty->assign('admin', true);
 $smarty->assign('hidden', false);
 $smarty->assign('parameter_name_regex', NAME_REGEX);
 
-$smarty->display('studs.tpl');
\ No newline at end of file
+$smarty->display('studs.tpl');
diff --git a/create_classic_poll.php b/create_classic_poll.php
index 87c5d24..c9da495 100644
--- a/create_classic_poll.php
+++ b/create_classic_poll.php
@@ -111,8 +111,8 @@ if (empty($_SESSION['form']->title) || empty($_SESSION['form']->admin_name) || (
             $message_admin = sprintf($message_admin, Utils::getUrlSondage($admin_poll_id, true));
 
             if ($mailService->isValidEmail($_SESSION['form']->admin_mail)) {
-                $mailService->send($_SESSION['form']->admin_mail, '[' . NOMAPPLICATION . '][' . __('Mail', 'Author\'s message') . '] ' . __('Generic', 'Poll') . ' : ' . Utils::htmlEscape($_SESSION['form']->title), $message_admin);
-                $mailService->send($_SESSION['form']->admin_mail, '[' . NOMAPPLICATION . '][' . __('Mail', 'For sending to the polled users') . '] ' . __('Generic', 'Poll') . ' : ' . Utils::htmlEscape($_SESSION['form']->title), $message);
+                $mailService->send($_SESSION['form']->admin_mail, '[' . NOMAPPLICATION . '][' . __('Mail', 'Author\'s message') . '] ' . __('Generic', 'Poll') . ': ' . Utils::htmlEscape($_SESSION['form']->title), $message_admin);
+                $mailService->send($_SESSION['form']->admin_mail, '[' . NOMAPPLICATION . '][' . __('Mail', 'For sending to the polled users') . '] ' . __('Generic', 'Poll') . ': ' . Utils::htmlEscape($_SESSION['form']->title), $message);
             }
         }
 
diff --git a/create_date_poll.php b/create_date_poll.php
index 76cd629..1cd1b57 100644
--- a/create_date_poll.php
+++ b/create_date_poll.php
@@ -108,8 +108,8 @@ if (!isset($_SESSION['form']->title) || !isset($_SESSION['form']->admin_name) ||
             $message_admin = sprintf($message_admin, Utils::getUrlSondage($admin_poll_id, true));
 
             if ($mailService->isValidEmail($_SESSION['form']->admin_mail)) {
-                $mailService->send($_SESSION['form']->admin_mail, '[' . NOMAPPLICATION . '][' . __('Mail', 'Author\'s message') . '] ' . __('Generic', 'Poll') . ' : ' . Utils::htmlEscape($_SESSION['form']->title), $message_admin);
-                $mailService->send($_SESSION['form']->admin_mail, '[' . NOMAPPLICATION . '][' . __('Mail', 'For sending to the polled users') . '] ' . __('Generic', 'Poll') . ' : ' . Utils::htmlEscape($_SESSION['form']->title), $message);
+                $mailService->send($_SESSION['form']->admin_mail, '[' . NOMAPPLICATION . '][' . __('Mail', 'Author\'s message') . '] ' . __('Generic', 'Poll') . ': ' . Utils::htmlEscape($_SESSION['form']->title), $message_admin);
+                $mailService->send($_SESSION['form']->admin_mail, '[' . NOMAPPLICATION . '][' . __('Mail', 'For sending to the polled users') . '] ' . __('Generic', 'Poll') . ': ' . Utils::htmlEscape($_SESSION['form']->title), $message);
             }
         }
 
@@ -168,7 +168,7 @@ if (!isset($_SESSION['form']->title) || !isset($_SESSION['form']->admin_name) ||
             $summary .= '<li>'.strftime($date_format['txt_full'], $choice->getName());
             $first = true;
             foreach ($choice->getSlots() as $slots) {
-                $summary .= $first ? ' : ' : ', ';
+                $summary .= $first ? ': ' : ', ';
                 $summary .= $slots;
                     $first = false;
             }
diff --git a/studs.php b/studs.php
index 8f793f1..ec7d274 100644
--- a/studs.php
+++ b/studs.php
@@ -66,7 +66,7 @@ function sendUpdateNotification($poll, $mailService, $name, $type) {
 
     if ($poll->receiveNewVotes) {
 
-        $subject = '[' . NOMAPPLICATION . '] ' . __('Mail', 'Poll\'s participation') . ' : ' . $poll->title;
+        $subject = '[' . NOMAPPLICATION . '] ' . __('Mail', 'Poll\'s participation') . ': ' . $poll->title;
 
         $message = $name . ' ';
         switch ($type) {