From 4f38bf4c689ac3b3cb8b37c86e865602502caaf6 Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Mon, 11 Jan 2016 21:13:54 -0500
Subject: Move TaskValidator class

---
 app/Validator/TaskValidator.php | 246 ++++++++++++++++++++++++++++++++++++++++
 1 file changed, 246 insertions(+)
 create mode 100644 app/Validator/TaskValidator.php

(limited to 'app/Validator/TaskValidator.php')

diff --git a/app/Validator/TaskValidator.php b/app/Validator/TaskValidator.php
new file mode 100644
index 00000000..c18a9761
--- /dev/null
+++ b/app/Validator/TaskValidator.php
@@ -0,0 +1,246 @@
+<?php
+
+namespace Kanboard\Validator;
+
+use SimpleValidator\Validator;
+use SimpleValidator\Validators;
+
+/**
+ * Task Validator
+ *
+ * @package  validator
+ * @author   Frederic Guillot
+ */
+class TaskValidator extends Base
+{
+    /**
+     * Common validation rules
+     *
+     * @access private
+     * @return array
+     */
+    private function commonValidationRules()
+    {
+        return array(
+            new Validators\Integer('id', t('This value must be an integer')),
+            new Validators\Integer('project_id', t('This value must be an integer')),
+            new Validators\Integer('column_id', t('This value must be an integer')),
+            new Validators\Integer('owner_id', t('This value must be an integer')),
+            new Validators\Integer('creator_id', t('This value must be an integer')),
+            new Validators\Integer('score', t('This value must be an integer')),
+            new Validators\Integer('category_id', t('This value must be an integer')),
+            new Validators\Integer('swimlane_id', t('This value must be an integer')),
+            new Validators\Integer('recurrence_child', t('This value must be an integer')),
+            new Validators\Integer('recurrence_parent', t('This value must be an integer')),
+            new Validators\Integer('recurrence_factor', t('This value must be an integer')),
+            new Validators\Integer('recurrence_timeframe', t('This value must be an integer')),
+            new Validators\Integer('recurrence_basedate', t('This value must be an integer')),
+            new Validators\Integer('recurrence_trigger', t('This value must be an integer')),
+            new Validators\Integer('recurrence_status', t('This value must be an integer')),
+            new Validators\MaxLength('title', t('The maximum length is %d characters', 200), 200),
+            new Validators\MaxLength('reference', t('The maximum length is %d characters', 50), 50),
+            new Validators\Date('date_due', t('Invalid date'), $this->dateParser->getDateFormats()),
+            new Validators\Date('date_started', t('Invalid date'), $this->dateParser->getAllFormats()),
+            new Validators\Numeric('time_spent', t('This value must be numeric')),
+            new Validators\Numeric('time_estimated', t('This value must be numeric')),
+        );
+    }
+
+    /**
+     * Validate task creation
+     *
+     * @access public
+     * @param  array    $values           Form values
+     * @return array    $valid, $errors   [0] = Success or not, [1] = List of errors
+     */
+    public function validateCreation(array $values)
+    {
+        $rules = array(
+            new Validators\Required('project_id', t('The project is required')),
+            new Validators\Required('title', t('The title is required')),
+        );
+
+        $v = new Validator($values, array_merge($rules, $this->commonValidationRules()));
+
+        return array(
+            $v->execute(),
+            $v->getErrors()
+        );
+    }
+
+    /**
+     * Validate description creation
+     *
+     * @access public
+     * @param  array   $values           Form values
+     * @return array   $valid, $errors   [0] = Success or not, [1] = List of errors
+     */
+    public function validateDescriptionCreation(array $values)
+    {
+        $rules = array(
+            new Validators\Required('id', t('The id is required')),
+        );
+
+        $v = new Validator($values, array_merge($rules, $this->commonValidationRules()));
+
+        return array(
+            $v->execute(),
+            $v->getErrors()
+        );
+    }
+
+    /**
+     * Validate edit recurrence
+     *
+     * @access public
+     * @param  array   $values           Form values
+     * @return array   $valid, $errors   [0] = Success or not, [1] = List of errors
+     */
+    public function validateEditRecurrence(array $values)
+    {
+        $rules = array(
+            new Validators\Required('id', t('The id is required')),
+        );
+
+        $v = new Validator($values, array_merge($rules, $this->commonValidationRules()));
+
+        return array(
+            $v->execute(),
+            $v->getErrors()
+        );
+    }
+
+
+    /**
+     * Validate task modification (form)
+     *
+     * @access public
+     * @param  array   $values           Form values
+     * @return array   $valid, $errors   [0] = Success or not, [1] = List of errors
+     */
+    public function validateModification(array $values)
+    {
+        $rules = array(
+            new Validators\Required('id', t('The id is required')),
+            new Validators\Required('title', t('The title is required')),
+        );
+
+        $v = new Validator($values, array_merge($rules, $this->commonValidationRules()));
+
+        return array(
+            $v->execute(),
+            $v->getErrors()
+        );
+    }
+
+    /**
+     * Validate task modification (Api)
+     *
+     * @access public
+     * @param  array   $values           Form values
+     * @return array   $valid, $errors   [0] = Success or not, [1] = List of errors
+     */
+    public function validateApiModification(array $values)
+    {
+        $rules = array(
+            new Validators\Required('id', t('The id is required')),
+        );
+
+        $v = new Validator($values, array_merge($rules, $this->commonValidationRules()));
+
+        return array(
+            $v->execute(),
+            $v->getErrors()
+        );
+    }
+
+    /**
+     * Validate assignee change
+     *
+     * @access public
+     * @param  array   $values           Form values
+     * @return array   $valid, $errors   [0] = Success or not, [1] = List of errors
+     */
+    public function validateAssigneeModification(array $values)
+    {
+        $rules = array(
+            new Validators\Required('id', t('The id is required')),
+            new Validators\Required('project_id', t('The project is required')),
+            new Validators\Required('owner_id', t('This value is required')),
+        );
+
+        $v = new Validator($values, array_merge($rules, $this->commonValidationRules()));
+
+        return array(
+            $v->execute(),
+            $v->getErrors()
+        );
+    }
+
+    /**
+     * Validate category change
+     *
+     * @access public
+     * @param  array   $values           Form values
+     * @return array   $valid, $errors   [0] = Success or not, [1] = List of errors
+     */
+    public function validateCategoryModification(array $values)
+    {
+        $rules = array(
+            new Validators\Required('id', t('The id is required')),
+            new Validators\Required('project_id', t('The project is required')),
+            new Validators\Required('category_id', t('This value is required')),
+
+        );
+
+        $v = new Validator($values, array_merge($rules, $this->commonValidationRules()));
+
+        return array(
+            $v->execute(),
+            $v->getErrors()
+        );
+    }
+
+    /**
+     * Validate project modification
+     *
+     * @access public
+     * @param  array   $values           Form values
+     * @return array   $valid, $errors   [0] = Success or not, [1] = List of errors
+     */
+    public function validateProjectModification(array $values)
+    {
+        $rules = array(
+            new Validators\Required('id', t('The id is required')),
+            new Validators\Required('project_id', t('The project is required')),
+        );
+
+        $v = new Validator($values, array_merge($rules, $this->commonValidationRules()));
+
+        return array(
+            $v->execute(),
+            $v->getErrors()
+        );
+    }
+
+    /**
+     * Validate time tracking modification (form)
+     *
+     * @access public
+     * @param  array   $values           Form values
+     * @return array   $valid, $errors   [0] = Success or not, [1] = List of errors
+     */
+    public function validateTimeModification(array $values)
+    {
+        $rules = array(
+            new Validators\Required('id', t('The id is required')),
+        );
+
+        $v = new Validator($values, array_merge($rules, $this->commonValidationRules()));
+
+        return array(
+            $v->execute(),
+            $v->getErrors()
+        );
+    }
+}
-- 
cgit v1.2.3


From 051bf1c9dbb5733242c7657d6d507389206b33ee Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Sun, 24 Jan 2016 20:38:39 -0500
Subject: Add configurable task priority

---
 ChangeLog                                    |  1 +
 app/Controller/ProjectEdit.php               | 10 +++++++++
 app/Controller/Taskcreation.php              |  1 +
 app/Controller/Taskmodification.php          |  2 ++
 app/Helper/Task.php                          | 33 +++++++++++++++++++++++++++-
 app/Locale/bs_BA/translations.php            |  9 ++++++++
 app/Locale/cs_CZ/translations.php            |  9 ++++++++
 app/Locale/da_DK/translations.php            |  9 ++++++++
 app/Locale/de_DE/translations.php            |  9 ++++++++
 app/Locale/es_ES/translations.php            |  9 ++++++++
 app/Locale/fi_FI/translations.php            |  9 ++++++++
 app/Locale/fr_FR/translations.php            |  9 ++++++++
 app/Locale/hu_HU/translations.php            |  9 ++++++++
 app/Locale/id_ID/translations.php            |  9 ++++++++
 app/Locale/it_IT/translations.php            |  9 ++++++++
 app/Locale/ja_JP/translations.php            |  9 ++++++++
 app/Locale/my_MY/translations.php            |  9 ++++++++
 app/Locale/nb_NO/translations.php            |  9 ++++++++
 app/Locale/nl_NL/translations.php            |  9 ++++++++
 app/Locale/pl_PL/translations.php            |  9 ++++++++
 app/Locale/pt_BR/translations.php            |  9 ++++++++
 app/Locale/pt_PT/translations.php            |  9 ++++++++
 app/Locale/ru_RU/translations.php            |  9 ++++++++
 app/Locale/sr_Latn_RS/translations.php       |  9 ++++++++
 app/Locale/sv_SE/translations.php            |  9 ++++++++
 app/Locale/th_TH/translations.php            |  9 ++++++++
 app/Locale/tr_TR/translations.php            |  9 ++++++++
 app/Locale/zh_CN/translations.php            |  9 ++++++++
 app/Model/Project.php                        |  4 ++++
 app/Model/TaskFinder.php                     |  2 ++
 app/Model/TaskModification.php               |  2 +-
 app/Schema/Mysql.php                         | 10 ++++++++-
 app/Schema/Postgres.php                      | 10 ++++++++-
 app/Schema/Sqlite.php                        | 10 ++++++++-
 app/ServiceProvider/RouteProvider.php        |  1 +
 app/Template/board/task_footer.php           |  2 ++
 app/Template/board/task_private.php          |  1 +
 app/Template/board/task_public.php           |  1 +
 app/Template/project_edit/dates.php          |  1 +
 app/Template/project_edit/description.php    |  1 +
 app/Template/project_edit/general.php        |  1 +
 app/Template/project_edit/task_priority.php  | 29 ++++++++++++++++++++++++
 app/Template/task/details.php                |  3 +++
 app/Template/task_creation/form.php          | 20 +++++++++--------
 app/Template/task_modification/edit_task.php | 12 +++++-----
 app/Validator/ProjectValidator.php           |  3 +++
 app/Validator/TaskValidator.php              |  1 +
 tests/units/Helper/TaskHelperTest.php        | 32 +++++++++++++++++++++++++++
 tests/units/Model/ProjectTest.php            | 20 +++++++++++++++++
 49 files changed, 401 insertions(+), 19 deletions(-)
 create mode 100644 app/Template/project_edit/task_priority.php
 create mode 100644 tests/units/Helper/TaskHelperTest.php

(limited to 'app/Validator/TaskValidator.php')

diff --git a/ChangeLog b/ChangeLog
index 6c46bb00..ec5f36b4 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,7 @@ Version 1.0.25 (unreleased)
 New features:
 
 * Add project owner (Directly Responsible Individual)
+* Add configurable task priority
 
 Version 1.0.24
 --------------
diff --git a/app/Controller/ProjectEdit.php b/app/Controller/ProjectEdit.php
index 3b0a3da3..0dfc7de3 100644
--- a/app/Controller/ProjectEdit.php
+++ b/app/Controller/ProjectEdit.php
@@ -40,6 +40,16 @@ class ProjectEdit extends Base
         $this->renderView('project_edit/description', $values, $errors);
     }
 
+    /**
+     * Change task priority
+     *
+     * @access public
+     */
+    public function priority(array $values = array(), array $errors = array())
+    {
+        $this->renderView('project_edit/task_priority', $values, $errors);
+    }
+
     /**
      * Validate and update a project
      *
diff --git a/app/Controller/Taskcreation.php b/app/Controller/Taskcreation.php
index 4d74fac6..49ccea7f 100644
--- a/app/Controller/Taskcreation.php
+++ b/app/Controller/Taskcreation.php
@@ -32,6 +32,7 @@ class Taskcreation extends Base
         }
 
         $this->response->html($this->template->$method('task_creation/form', array(
+            'project' => $project,
             'ajax' => $this->request->isAjax(),
             'errors' => $errors,
             'values' => $values + array('project_id' => $project['id']),
diff --git a/app/Controller/Taskmodification.php b/app/Controller/Taskmodification.php
index 81cf430f..2c97970b 100644
--- a/app/Controller/Taskmodification.php
+++ b/app/Controller/Taskmodification.php
@@ -98,6 +98,7 @@ class Taskmodification extends Base
     public function edit(array $values = array(), array $errors = array())
     {
         $task = $this->getTask();
+        $project = $this->project->getById($task['project_id']);
         $ajax = $this->request->isAjax();
 
         if (empty($values)) {
@@ -107,6 +108,7 @@ class Taskmodification extends Base
         $this->dateParser->format($values, array('date_due'));
 
         $params = array(
+            'project' => $project,
             'values' => $values,
             'errors' => $errors,
             'task' => $task,
diff --git a/app/Helper/Task.php b/app/Helper/Task.php
index 1405a167..500b8a89 100644
--- a/app/Helper/Task.php
+++ b/app/Helper/Task.php
@@ -2,13 +2,15 @@
 
 namespace Kanboard\Helper;
 
+use Kanboard\Core\Base;
+
 /**
  * Task helpers
  *
  * @package helper
  * @author  Frederic Guillot
  */
-class Task extends \Kanboard\Core\Base
+class Task extends Base
 {
     public function getColors()
     {
@@ -34,4 +36,33 @@ class Task extends \Kanboard\Core\Base
     {
         return $this->taskPermission->canRemoveTask($task);
     }
+
+    public function selectPriority(array $project, array $values)
+    {
+        $html = '';
+
+        if ($project['priority_end'] > $project['priority_start']) {
+            $range = range($project['priority_start'], $project['priority_end']);
+            $options = array_combine($range, $range);
+            $values += array('priority' => $project['priority_default']);
+
+            $html .= $this->helper->form->label(t('Priority'), 'priority');
+            $html .= $this->helper->form->select('priority', $options, $values, array(), array('tabindex="7"'));
+        }
+
+        return $html;
+    }
+
+    public function formatPriority(array $project, array $task)
+    {
+        $html = '';
+
+        if ($project['priority_end'] > $project['priority_start']) {
+            $html .= '<span class="task-board-priority" title="'.t('Task priority').'">';
+            $html .= $task['priority'] >= 0 ? 'P'.$task['priority'] : '-P'.abs($task['priority']);
+            $html .= '</span>';
+        }
+
+        return $html;
+    }
 }
diff --git a/app/Locale/bs_BA/translations.php b/app/Locale/bs_BA/translations.php
index e1af1c08..90ab1296 100644
--- a/app/Locale/bs_BA/translations.php
+++ b/app/Locale/bs_BA/translations.php
@@ -1109,4 +1109,13 @@ return array(
     // 'Those dates are useful for the project Gantt chart.' => '',
     // 'Private projects do not have users and groups management.' => '',
     // 'There is no project member.' => '',
+    // 'Priority' => '',
+    // 'Task priority' => '',
+    // 'General' => '',
+    // 'Dates' => '',
+    // 'Default priority' => '',
+    // 'Lowest priority' => '',
+    // 'Highest priority' => '',
+    // 'If you put zero to the low and high priority, this feature will be disabled.' => '',
+    // 'Priority: %d' => '',
 );
diff --git a/app/Locale/cs_CZ/translations.php b/app/Locale/cs_CZ/translations.php
index b93b7c23..83d88f35 100644
--- a/app/Locale/cs_CZ/translations.php
+++ b/app/Locale/cs_CZ/translations.php
@@ -1109,4 +1109,13 @@ return array(
     // 'Those dates are useful for the project Gantt chart.' => '',
     // 'Private projects do not have users and groups management.' => '',
     // 'There is no project member.' => '',
+    // 'Priority' => '',
+    // 'Task priority' => '',
+    // 'General' => '',
+    // 'Dates' => '',
+    // 'Default priority' => '',
+    // 'Lowest priority' => '',
+    // 'Highest priority' => '',
+    // 'If you put zero to the low and high priority, this feature will be disabled.' => '',
+    // 'Priority: %d' => '',
 );
diff --git a/app/Locale/da_DK/translations.php b/app/Locale/da_DK/translations.php
index 63850d70..7a82bc1e 100644
--- a/app/Locale/da_DK/translations.php
+++ b/app/Locale/da_DK/translations.php
@@ -1109,4 +1109,13 @@ return array(
     // 'Those dates are useful for the project Gantt chart.' => '',
     // 'Private projects do not have users and groups management.' => '',
     // 'There is no project member.' => '',
+    // 'Priority' => '',
+    // 'Task priority' => '',
+    // 'General' => '',
+    // 'Dates' => '',
+    // 'Default priority' => '',
+    // 'Lowest priority' => '',
+    // 'Highest priority' => '',
+    // 'If you put zero to the low and high priority, this feature will be disabled.' => '',
+    // 'Priority: %d' => '',
 );
diff --git a/app/Locale/de_DE/translations.php b/app/Locale/de_DE/translations.php
index ef056972..1158dd67 100644
--- a/app/Locale/de_DE/translations.php
+++ b/app/Locale/de_DE/translations.php
@@ -1109,4 +1109,13 @@ return array(
     // 'Those dates are useful for the project Gantt chart.' => '',
     // 'Private projects do not have users and groups management.' => '',
     // 'There is no project member.' => '',
+    // 'Priority' => '',
+    // 'Task priority' => '',
+    // 'General' => '',
+    // 'Dates' => '',
+    // 'Default priority' => '',
+    // 'Lowest priority' => '',
+    // 'Highest priority' => '',
+    // 'If you put zero to the low and high priority, this feature will be disabled.' => '',
+    // 'Priority: %d' => '',
 );
diff --git a/app/Locale/es_ES/translations.php b/app/Locale/es_ES/translations.php
index 91709476..16c96ec5 100644
--- a/app/Locale/es_ES/translations.php
+++ b/app/Locale/es_ES/translations.php
@@ -1109,4 +1109,13 @@ return array(
     // 'Those dates are useful for the project Gantt chart.' => '',
     // 'Private projects do not have users and groups management.' => '',
     // 'There is no project member.' => '',
+    // 'Priority' => '',
+    // 'Task priority' => '',
+    // 'General' => '',
+    // 'Dates' => '',
+    // 'Default priority' => '',
+    // 'Lowest priority' => '',
+    // 'Highest priority' => '',
+    // 'If you put zero to the low and high priority, this feature will be disabled.' => '',
+    // 'Priority: %d' => '',
 );
diff --git a/app/Locale/fi_FI/translations.php b/app/Locale/fi_FI/translations.php
index c887e02d..cde825e2 100644
--- a/app/Locale/fi_FI/translations.php
+++ b/app/Locale/fi_FI/translations.php
@@ -1109,4 +1109,13 @@ return array(
     // 'Those dates are useful for the project Gantt chart.' => '',
     // 'Private projects do not have users and groups management.' => '',
     // 'There is no project member.' => '',
+    // 'Priority' => '',
+    // 'Task priority' => '',
+    // 'General' => '',
+    // 'Dates' => '',
+    // 'Default priority' => '',
+    // 'Lowest priority' => '',
+    // 'Highest priority' => '',
+    // 'If you put zero to the low and high priority, this feature will be disabled.' => '',
+    // 'Priority: %d' => '',
 );
diff --git a/app/Locale/fr_FR/translations.php b/app/Locale/fr_FR/translations.php
index f36ce104..32110e1c 100644
--- a/app/Locale/fr_FR/translations.php
+++ b/app/Locale/fr_FR/translations.php
@@ -1112,4 +1112,13 @@ return array(
     'Those dates are useful for the project Gantt chart.' => 'Ces dates sont utiles pour le diagramme de Gantt des projets.',
     'Private projects do not have users and groups management.' => 'Les projets privés n\'ont pas de gestion d\'utilisateurs et de groupes.',
     'There is no project member.' => 'Il y a aucun membre du projet.',
+    'Priority' => 'Priorité',
+    'Task priority' => 'Priorité des tâches',
+    'General' => 'Général',
+    'Dates' => 'Dates',
+    'Default priority' => 'Priorité par défaut',
+    'Lowest priority' => 'Priorité basse',
+    'Highest priority' => 'Priorité haute',
+    'If you put zero to the low and high priority, this feature will be disabled.' => 'Si vous mettez zéro pour la priorité basse et haute, cette fonctionnalité sera désactivée.',
+    'Priority: %d' => 'Priorité : %d',
 );
diff --git a/app/Locale/hu_HU/translations.php b/app/Locale/hu_HU/translations.php
index e12a7aad..25d55bb2 100644
--- a/app/Locale/hu_HU/translations.php
+++ b/app/Locale/hu_HU/translations.php
@@ -1109,4 +1109,13 @@ return array(
     // 'Those dates are useful for the project Gantt chart.' => '',
     // 'Private projects do not have users and groups management.' => '',
     // 'There is no project member.' => '',
+    // 'Priority' => '',
+    // 'Task priority' => '',
+    // 'General' => '',
+    // 'Dates' => '',
+    // 'Default priority' => '',
+    // 'Lowest priority' => '',
+    // 'Highest priority' => '',
+    // 'If you put zero to the low and high priority, this feature will be disabled.' => '',
+    // 'Priority: %d' => '',
 );
diff --git a/app/Locale/id_ID/translations.php b/app/Locale/id_ID/translations.php
index 49d61d58..e3316405 100644
--- a/app/Locale/id_ID/translations.php
+++ b/app/Locale/id_ID/translations.php
@@ -1109,4 +1109,13 @@ return array(
     // 'Those dates are useful for the project Gantt chart.' => '',
     // 'Private projects do not have users and groups management.' => '',
     // 'There is no project member.' => '',
+    // 'Priority' => '',
+    // 'Task priority' => '',
+    // 'General' => '',
+    // 'Dates' => '',
+    // 'Default priority' => '',
+    // 'Lowest priority' => '',
+    // 'Highest priority' => '',
+    // 'If you put zero to the low and high priority, this feature will be disabled.' => '',
+    // 'Priority: %d' => '',
 );
diff --git a/app/Locale/it_IT/translations.php b/app/Locale/it_IT/translations.php
index 5e2c32a9..1e32213f 100644
--- a/app/Locale/it_IT/translations.php
+++ b/app/Locale/it_IT/translations.php
@@ -1109,4 +1109,13 @@ return array(
     // 'Those dates are useful for the project Gantt chart.' => '',
     // 'Private projects do not have users and groups management.' => '',
     // 'There is no project member.' => '',
+    // 'Priority' => '',
+    // 'Task priority' => '',
+    // 'General' => '',
+    // 'Dates' => '',
+    // 'Default priority' => '',
+    // 'Lowest priority' => '',
+    // 'Highest priority' => '',
+    // 'If you put zero to the low and high priority, this feature will be disabled.' => '',
+    // 'Priority: %d' => '',
 );
diff --git a/app/Locale/ja_JP/translations.php b/app/Locale/ja_JP/translations.php
index f1884b93..b9cde718 100644
--- a/app/Locale/ja_JP/translations.php
+++ b/app/Locale/ja_JP/translations.php
@@ -1109,4 +1109,13 @@ return array(
     // 'Those dates are useful for the project Gantt chart.' => '',
     // 'Private projects do not have users and groups management.' => '',
     // 'There is no project member.' => '',
+    // 'Priority' => '',
+    // 'Task priority' => '',
+    // 'General' => '',
+    // 'Dates' => '',
+    // 'Default priority' => '',
+    // 'Lowest priority' => '',
+    // 'Highest priority' => '',
+    // 'If you put zero to the low and high priority, this feature will be disabled.' => '',
+    // 'Priority: %d' => '',
 );
diff --git a/app/Locale/my_MY/translations.php b/app/Locale/my_MY/translations.php
index 65aaa4e3..43c288c7 100644
--- a/app/Locale/my_MY/translations.php
+++ b/app/Locale/my_MY/translations.php
@@ -1109,4 +1109,13 @@ return array(
     // 'Those dates are useful for the project Gantt chart.' => '',
     // 'Private projects do not have users and groups management.' => '',
     // 'There is no project member.' => '',
+    // 'Priority' => '',
+    // 'Task priority' => '',
+    // 'General' => '',
+    // 'Dates' => '',
+    // 'Default priority' => '',
+    // 'Lowest priority' => '',
+    // 'Highest priority' => '',
+    // 'If you put zero to the low and high priority, this feature will be disabled.' => '',
+    // 'Priority: %d' => '',
 );
diff --git a/app/Locale/nb_NO/translations.php b/app/Locale/nb_NO/translations.php
index 520149d5..682f44a8 100644
--- a/app/Locale/nb_NO/translations.php
+++ b/app/Locale/nb_NO/translations.php
@@ -1109,4 +1109,13 @@ return array(
     // 'Those dates are useful for the project Gantt chart.' => '',
     // 'Private projects do not have users and groups management.' => '',
     // 'There is no project member.' => '',
+    // 'Priority' => '',
+    // 'Task priority' => '',
+    // 'General' => '',
+    // 'Dates' => '',
+    // 'Default priority' => '',
+    // 'Lowest priority' => '',
+    // 'Highest priority' => '',
+    // 'If you put zero to the low and high priority, this feature will be disabled.' => '',
+    // 'Priority: %d' => '',
 );
diff --git a/app/Locale/nl_NL/translations.php b/app/Locale/nl_NL/translations.php
index 87f5323e..4f38f256 100644
--- a/app/Locale/nl_NL/translations.php
+++ b/app/Locale/nl_NL/translations.php
@@ -1109,4 +1109,13 @@ return array(
     // 'Those dates are useful for the project Gantt chart.' => '',
     // 'Private projects do not have users and groups management.' => '',
     // 'There is no project member.' => '',
+    // 'Priority' => '',
+    // 'Task priority' => '',
+    // 'General' => '',
+    // 'Dates' => '',
+    // 'Default priority' => '',
+    // 'Lowest priority' => '',
+    // 'Highest priority' => '',
+    // 'If you put zero to the low and high priority, this feature will be disabled.' => '',
+    // 'Priority: %d' => '',
 );
diff --git a/app/Locale/pl_PL/translations.php b/app/Locale/pl_PL/translations.php
index 37dcfe3d..ee0ceb47 100644
--- a/app/Locale/pl_PL/translations.php
+++ b/app/Locale/pl_PL/translations.php
@@ -1109,4 +1109,13 @@ return array(
     // 'Those dates are useful for the project Gantt chart.' => '',
     // 'Private projects do not have users and groups management.' => '',
     // 'There is no project member.' => '',
+    // 'Priority' => '',
+    // 'Task priority' => '',
+    // 'General' => '',
+    // 'Dates' => '',
+    // 'Default priority' => '',
+    // 'Lowest priority' => '',
+    // 'Highest priority' => '',
+    // 'If you put zero to the low and high priority, this feature will be disabled.' => '',
+    // 'Priority: %d' => '',
 );
diff --git a/app/Locale/pt_BR/translations.php b/app/Locale/pt_BR/translations.php
index 6e47c514..09e87048 100644
--- a/app/Locale/pt_BR/translations.php
+++ b/app/Locale/pt_BR/translations.php
@@ -1109,4 +1109,13 @@ return array(
     // 'Those dates are useful for the project Gantt chart.' => '',
     // 'Private projects do not have users and groups management.' => '',
     // 'There is no project member.' => '',
+    // 'Priority' => '',
+    // 'Task priority' => '',
+    // 'General' => '',
+    // 'Dates' => '',
+    // 'Default priority' => '',
+    // 'Lowest priority' => '',
+    // 'Highest priority' => '',
+    // 'If you put zero to the low and high priority, this feature will be disabled.' => '',
+    // 'Priority: %d' => '',
 );
diff --git a/app/Locale/pt_PT/translations.php b/app/Locale/pt_PT/translations.php
index f57657ee..19c2ebf7 100644
--- a/app/Locale/pt_PT/translations.php
+++ b/app/Locale/pt_PT/translations.php
@@ -1109,4 +1109,13 @@ return array(
     // 'Those dates are useful for the project Gantt chart.' => '',
     // 'Private projects do not have users and groups management.' => '',
     // 'There is no project member.' => '',
+    // 'Priority' => '',
+    // 'Task priority' => '',
+    // 'General' => '',
+    // 'Dates' => '',
+    // 'Default priority' => '',
+    // 'Lowest priority' => '',
+    // 'Highest priority' => '',
+    // 'If you put zero to the low and high priority, this feature will be disabled.' => '',
+    // 'Priority: %d' => '',
 );
diff --git a/app/Locale/ru_RU/translations.php b/app/Locale/ru_RU/translations.php
index 02bf9934..d09258ed 100644
--- a/app/Locale/ru_RU/translations.php
+++ b/app/Locale/ru_RU/translations.php
@@ -1109,4 +1109,13 @@ return array(
     // 'Those dates are useful for the project Gantt chart.' => '',
     // 'Private projects do not have users and groups management.' => '',
     // 'There is no project member.' => '',
+    // 'Priority' => '',
+    // 'Task priority' => '',
+    // 'General' => '',
+    // 'Dates' => '',
+    // 'Default priority' => '',
+    // 'Lowest priority' => '',
+    // 'Highest priority' => '',
+    // 'If you put zero to the low and high priority, this feature will be disabled.' => '',
+    // 'Priority: %d' => '',
 );
diff --git a/app/Locale/sr_Latn_RS/translations.php b/app/Locale/sr_Latn_RS/translations.php
index c779cd6c..2b3553c2 100644
--- a/app/Locale/sr_Latn_RS/translations.php
+++ b/app/Locale/sr_Latn_RS/translations.php
@@ -1109,4 +1109,13 @@ return array(
     // 'Those dates are useful for the project Gantt chart.' => '',
     // 'Private projects do not have users and groups management.' => '',
     // 'There is no project member.' => '',
+    // 'Priority' => '',
+    // 'Task priority' => '',
+    // 'General' => '',
+    // 'Dates' => '',
+    // 'Default priority' => '',
+    // 'Lowest priority' => '',
+    // 'Highest priority' => '',
+    // 'If you put zero to the low and high priority, this feature will be disabled.' => '',
+    // 'Priority: %d' => '',
 );
diff --git a/app/Locale/sv_SE/translations.php b/app/Locale/sv_SE/translations.php
index ca412273..1c01e94d 100644
--- a/app/Locale/sv_SE/translations.php
+++ b/app/Locale/sv_SE/translations.php
@@ -1109,4 +1109,13 @@ return array(
     // 'Those dates are useful for the project Gantt chart.' => '',
     // 'Private projects do not have users and groups management.' => '',
     // 'There is no project member.' => '',
+    // 'Priority' => '',
+    // 'Task priority' => '',
+    // 'General' => '',
+    // 'Dates' => '',
+    // 'Default priority' => '',
+    // 'Lowest priority' => '',
+    // 'Highest priority' => '',
+    // 'If you put zero to the low and high priority, this feature will be disabled.' => '',
+    // 'Priority: %d' => '',
 );
diff --git a/app/Locale/th_TH/translations.php b/app/Locale/th_TH/translations.php
index b2b9a55b..e0de5844 100644
--- a/app/Locale/th_TH/translations.php
+++ b/app/Locale/th_TH/translations.php
@@ -1109,4 +1109,13 @@ return array(
     // 'Those dates are useful for the project Gantt chart.' => '',
     // 'Private projects do not have users and groups management.' => '',
     // 'There is no project member.' => '',
+    // 'Priority' => '',
+    // 'Task priority' => '',
+    // 'General' => '',
+    // 'Dates' => '',
+    // 'Default priority' => '',
+    // 'Lowest priority' => '',
+    // 'Highest priority' => '',
+    // 'If you put zero to the low and high priority, this feature will be disabled.' => '',
+    // 'Priority: %d' => '',
 );
diff --git a/app/Locale/tr_TR/translations.php b/app/Locale/tr_TR/translations.php
index 17163f45..c4da560d 100644
--- a/app/Locale/tr_TR/translations.php
+++ b/app/Locale/tr_TR/translations.php
@@ -1109,4 +1109,13 @@ return array(
     // 'Those dates are useful for the project Gantt chart.' => '',
     // 'Private projects do not have users and groups management.' => '',
     // 'There is no project member.' => '',
+    // 'Priority' => '',
+    // 'Task priority' => '',
+    // 'General' => '',
+    // 'Dates' => '',
+    // 'Default priority' => '',
+    // 'Lowest priority' => '',
+    // 'Highest priority' => '',
+    // 'If you put zero to the low and high priority, this feature will be disabled.' => '',
+    // 'Priority: %d' => '',
 );
diff --git a/app/Locale/zh_CN/translations.php b/app/Locale/zh_CN/translations.php
index e4b732ef..e0b90b58 100644
--- a/app/Locale/zh_CN/translations.php
+++ b/app/Locale/zh_CN/translations.php
@@ -1109,4 +1109,13 @@ return array(
     // 'Those dates are useful for the project Gantt chart.' => '',
     // 'Private projects do not have users and groups management.' => '',
     // 'There is no project member.' => '',
+    // 'Priority' => '',
+    // 'Task priority' => '',
+    // 'General' => '',
+    // 'Dates' => '',
+    // 'Default priority' => '',
+    // 'Lowest priority' => '',
+    // 'Highest priority' => '',
+    // 'If you put zero to the low and high priority, this feature will be disabled.' => '',
+    // 'Priority: %d' => '',
 );
diff --git a/app/Model/Project.php b/app/Model/Project.php
index ba0716b0..d0a8bfc8 100644
--- a/app/Model/Project.php
+++ b/app/Model/Project.php
@@ -334,6 +334,8 @@ class Project extends Base
             $values['identifier'] = strtoupper($values['identifier']);
         }
 
+        $this->convertIntegerFields($values, array('priority_default', 'priority_start', 'priority_end'));
+
         if (! $this->db->table(self::TABLE)->save($values)) {
             $this->db->cancelTransaction();
             return false;
@@ -400,6 +402,8 @@ class Project extends Base
             $values['identifier'] = strtoupper($values['identifier']);
         }
 
+        $this->convertIntegerFields($values, array('priority_default', 'priority_start', 'priority_end'));
+
         return $this->exists($values['id']) &&
                $this->db->table(self::TABLE)->eq('id', $values['id'])->save($values);
     }
diff --git a/app/Model/TaskFinder.php b/app/Model/TaskFinder.php
index 836fbe46..1c83136b 100644
--- a/app/Model/TaskFinder.php
+++ b/app/Model/TaskFinder.php
@@ -113,6 +113,7 @@ class TaskFinder extends Base
                 'tasks.is_active',
                 'tasks.score',
                 'tasks.category_id',
+                'tasks.priority',
                 'tasks.date_moved',
                 'tasks.recurrence_status',
                 'tasks.recurrence_trigger',
@@ -308,6 +309,7 @@ class TaskFinder extends Base
             tasks.is_active,
             tasks.score,
             tasks.category_id,
+            tasks.priority,
             tasks.swimlane_id,
             tasks.date_moved,
             tasks.recurrence_status,
diff --git a/app/Model/TaskModification.php b/app/Model/TaskModification.php
index a0ad292c..eee7b2e0 100644
--- a/app/Model/TaskModification.php
+++ b/app/Model/TaskModification.php
@@ -88,7 +88,7 @@ class TaskModification extends Base
         $this->dateParser->convert($values, array('date_started'), true);
         $this->removeFields($values, array('another_task', 'id'));
         $this->resetFields($values, array('date_due', 'date_started', 'score', 'category_id', 'time_estimated', 'time_spent'));
-        $this->convertIntegerFields($values, array('is_active', 'recurrence_status', 'recurrence_trigger', 'recurrence_factor', 'recurrence_timeframe', 'recurrence_basedate'));
+        $this->convertIntegerFields($values, array('priority', 'is_active', 'recurrence_status', 'recurrence_trigger', 'recurrence_factor', 'recurrence_timeframe', 'recurrence_basedate'));
 
         $values['date_modification'] = time();
     }
diff --git a/app/Schema/Mysql.php b/app/Schema/Mysql.php
index ad7f7be1..8f1db510 100644
--- a/app/Schema/Mysql.php
+++ b/app/Schema/Mysql.php
@@ -6,7 +6,15 @@ use PDO;
 use Kanboard\Core\Security\Token;
 use Kanboard\Core\Security\Role;
 
-const VERSION = 102;
+const VERSION = 103;
+
+function version_103(PDO $pdo)
+{
+    $pdo->exec("ALTER TABLE projects ADD COLUMN priority_default INT DEFAULT 0");
+    $pdo->exec("ALTER TABLE projects ADD COLUMN priority_start INT DEFAULT 0");
+    $pdo->exec("ALTER TABLE projects ADD COLUMN priority_end INT DEFAULT 3");
+    $pdo->exec("ALTER TABLE tasks ADD COLUMN priority INT DEFAULT 0");
+}
 
 function version_102(PDO $pdo)
 {
diff --git a/app/Schema/Postgres.php b/app/Schema/Postgres.php
index d23a7723..a7bf8054 100644
--- a/app/Schema/Postgres.php
+++ b/app/Schema/Postgres.php
@@ -6,7 +6,15 @@ use PDO;
 use Kanboard\Core\Security\Token;
 use Kanboard\Core\Security\Role;
 
-const VERSION = 82;
+const VERSION = 83;
+
+function version_83(PDO $pdo)
+{
+    $pdo->exec("ALTER TABLE projects ADD COLUMN priority_default INTEGER DEFAULT 0");
+    $pdo->exec("ALTER TABLE projects ADD COLUMN priority_start INTEGER DEFAULT 0");
+    $pdo->exec("ALTER TABLE projects ADD COLUMN priority_end INTEGER DEFAULT 3");
+    $pdo->exec("ALTER TABLE tasks ADD COLUMN priority INTEGER DEFAULT 0");
+}
 
 function version_82(PDO $pdo)
 {
diff --git a/app/Schema/Sqlite.php b/app/Schema/Sqlite.php
index daa70f54..08689749 100644
--- a/app/Schema/Sqlite.php
+++ b/app/Schema/Sqlite.php
@@ -6,7 +6,15 @@ use Kanboard\Core\Security\Token;
 use Kanboard\Core\Security\Role;
 use PDO;
 
-const VERSION = 94;
+const VERSION = 95;
+
+function version_95(PDO $pdo)
+{
+    $pdo->exec("ALTER TABLE projects ADD COLUMN priority_default INTEGER DEFAULT 0");
+    $pdo->exec("ALTER TABLE projects ADD COLUMN priority_start INTEGER DEFAULT 0");
+    $pdo->exec("ALTER TABLE projects ADD COLUMN priority_end INTEGER DEFAULT 3");
+    $pdo->exec("ALTER TABLE tasks ADD COLUMN priority INTEGER DEFAULT 0");
+}
 
 function version_94(PDO $pdo)
 {
diff --git a/app/ServiceProvider/RouteProvider.php b/app/ServiceProvider/RouteProvider.php
index 5a5c8652..057a1b3c 100644
--- a/app/ServiceProvider/RouteProvider.php
+++ b/app/ServiceProvider/RouteProvider.php
@@ -64,6 +64,7 @@ class RouteProvider implements ServiceProviderInterface
             $container['route']->addRoute('project/:project_id/edit', 'ProjectEdit', 'edit');
             $container['route']->addRoute('project/:project_id/edit/dates', 'ProjectEdit', 'dates');
             $container['route']->addRoute('project/:project_id/edit/description', 'ProjectEdit', 'description');
+            $container['route']->addRoute('project/:project_id/edit/priority', 'ProjectEdit', 'priority');
 
             // ProjectUser routes
             $container['route']->addRoute('projects/managers/:user_id', 'projectuser', 'managers');
diff --git a/app/Template/board/task_footer.php b/app/Template/board/task_footer.php
index 4a16364c..26f3b1d4 100644
--- a/app/Template/board/task_footer.php
+++ b/app/Template/board/task_footer.php
@@ -69,4 +69,6 @@
             <i class="fa fa-flag flag-milestone"></i>
         </span>
     <?php endif ?>
+
+    <?= $this->task->formatPriority($project, $task) ?>
 </div>
diff --git a/app/Template/board/task_private.php b/app/Template/board/task_private.php
index 8d76453c..4880af00 100644
--- a/app/Template/board/task_private.php
+++ b/app/Template/board/task_private.php
@@ -78,6 +78,7 @@
             <?= $this->render('board/task_footer', array(
                     'task' => $task,
                     'not_editable' => $not_editable,
+                    'project' => $project,
             )) ?>
         </div>
     <?php endif ?>
diff --git a/app/Template/board/task_public.php b/app/Template/board/task_public.php
index bacdcef4..d02722bb 100644
--- a/app/Template/board/task_public.php
+++ b/app/Template/board/task_public.php
@@ -25,5 +25,6 @@
     <?= $this->render('board/task_footer', array(
         'task' => $task,
         'not_editable' => $not_editable,
+        'project' => $project,
     )) ?>
 </div>
\ No newline at end of file
diff --git a/app/Template/project_edit/dates.php b/app/Template/project_edit/dates.php
index d3f4bad8..cb585c6a 100644
--- a/app/Template/project_edit/dates.php
+++ b/app/Template/project_edit/dates.php
@@ -4,6 +4,7 @@
         <li ><?= $this->url->link(t('General'), 'ProjectEdit', 'edit', array('project_id' => $project['id'])) ?></li>
         <li class="active"><?= $this->url->link(t('Dates'), 'ProjectEdit', 'dates', array('project_id' => $project['id'])) ?></li>
         <li><?= $this->url->link(t('Description'), 'ProjectEdit', 'description', array('project_id' => $project['id'])) ?></li>
+        <li><?= $this->url->link(t('Task priority'), 'ProjectEdit', 'priority', array('project_id' => $project['id'])) ?></li>
     </ul>
 </div>
 <form method="post" action="<?= $this->url->href('ProjectEdit', 'update', array('project_id' => $project['id'], 'redirect' => 'dates')) ?>" autocomplete="off">
diff --git a/app/Template/project_edit/description.php b/app/Template/project_edit/description.php
index 3af484d5..dce8ab10 100644
--- a/app/Template/project_edit/description.php
+++ b/app/Template/project_edit/description.php
@@ -4,6 +4,7 @@
         <li><?= $this->url->link(t('General'), 'ProjectEdit', 'edit', array('project_id' => $project['id'])) ?></li>
         <li><?= $this->url->link(t('Dates'), 'ProjectEdit', 'dates', array('project_id' => $project['id'])) ?></li>
         <li class="active"><?= $this->url->link(t('Description'), 'ProjectEdit', 'description', array('project_id' => $project['id'])) ?></li>
+        <li><?= $this->url->link(t('Task priority'), 'ProjectEdit', 'priority', array('project_id' => $project['id'])) ?></li>
     </ul>
 </div>
 <form method="post" action="<?= $this->url->href('ProjectEdit', 'update', array('project_id' => $project['id'], 'redirect' => 'description')) ?>" autocomplete="off">
diff --git a/app/Template/project_edit/general.php b/app/Template/project_edit/general.php
index 1da913da..5caefa2d 100644
--- a/app/Template/project_edit/general.php
+++ b/app/Template/project_edit/general.php
@@ -4,6 +4,7 @@
         <li class="active"><?= $this->url->link(t('General'), 'ProjectEdit', 'edit', array('project_id' => $project['id'])) ?></li>
         <li><?= $this->url->link(t('Dates'), 'ProjectEdit', 'dates', array('project_id' => $project['id'])) ?></li>
         <li><?= $this->url->link(t('Description'), 'ProjectEdit', 'description', array('project_id' => $project['id'])) ?></li>
+        <li><?= $this->url->link(t('Task priority'), 'ProjectEdit', 'priority', array('project_id' => $project['id'])) ?></li>
     </ul>
 </div>
 <form method="post" action="<?= $this->url->href('ProjectEdit', 'update', array('project_id' => $project['id'], 'redirect' => 'edit')) ?>" autocomplete="off">
diff --git a/app/Template/project_edit/task_priority.php b/app/Template/project_edit/task_priority.php
new file mode 100644
index 00000000..e54215b2
--- /dev/null
+++ b/app/Template/project_edit/task_priority.php
@@ -0,0 +1,29 @@
+<div class="page-header">
+    <h2><?= t('Edit project') ?></h2>
+    <ul>
+        <li ><?= $this->url->link(t('General'), 'ProjectEdit', 'edit', array('project_id' => $project['id'])) ?></li>
+        <li><?= $this->url->link(t('Dates'), 'ProjectEdit', 'dates', array('project_id' => $project['id'])) ?></li>
+        <li><?= $this->url->link(t('Description'), 'ProjectEdit', 'description', array('project_id' => $project['id'])) ?></li>
+        <li class="active"><?= $this->url->link(t('Task priority'), 'ProjectEdit', 'priority', array('project_id' => $project['id'])) ?></li>
+    </ul>
+</div>
+<form method="post" action="<?= $this->url->href('ProjectEdit', 'update', array('project_id' => $project['id'], 'redirect' => 'priority')) ?>" autocomplete="off">
+    <?= $this->form->csrf() ?>
+    <?= $this->form->hidden('id', $values) ?>
+    <?= $this->form->hidden('name', $values) ?>
+
+    <?= $this->form->label(t('Default priority'), 'priority_default') ?>
+    <?= $this->form->number('priority_default', $values, $errors) ?>
+
+    <?= $this->form->label(t('Lowest priority'), 'priority_start') ?>
+    <?= $this->form->number('priority_start', $values, $errors) ?>
+
+    <?= $this->form->label(t('Highest priority'), 'priority_end') ?>
+    <?= $this->form->number('priority_end', $values, $errors) ?>
+
+    <div class="form-actions">
+        <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
+    </div>
+</form>
+
+<p class="alert alert-info"><?= t('If you put zero to the low and high priority, this feature will be disabled.') ?></p>
diff --git a/app/Template/task/details.php b/app/Template/task/details.php
index 74799b15..d885ca9c 100644
--- a/app/Template/task/details.php
+++ b/app/Template/task/details.php
@@ -4,6 +4,9 @@
         <span class="task-score"><?= $this->e($task['score']) ?></span>
     <?php endif ?>
     <ul>
+        <li>
+            <strong><?= t('Priority: %d', $task['priority']) ?></strong>
+        </li>
         <?php if ($task['reference']): ?>
         <li>
             <strong><?= t('Reference: %s', $task['reference']) ?></strong>
diff --git a/app/Template/task_creation/form.php b/app/Template/task_creation/form.php
index c9f367a0..eaf9024d 100644
--- a/app/Template/task_creation/form.php
+++ b/app/Template/task_creation/form.php
@@ -16,7 +16,7 @@
 
     <div class="form-column">
         <?= $this->form->label(t('Title'), 'title') ?>
-        <?= $this->form->text('title', $values, $errors, array('autofocus', 'required', 'maxlength="200"', 'tabindex="1"'), 'form-input-large') ?><br/>
+        <?= $this->form->text('title', $values, $errors, array('autofocus', 'required', 'maxlength="200"', 'tabindex="1"'), 'form-input-large') ?>
 
         <?= $this->form->label(t('Description'), 'description') ?>
 
@@ -57,32 +57,34 @@
         <?= $this->form->hidden('project_id', $values) ?>
 
         <?= $this->form->label(t('Assignee'), 'owner_id') ?>
-        <?= $this->form->select('owner_id', $users_list, $values, $errors, array('tabindex="3"')) ?><br/>
+        <?= $this->form->select('owner_id', $users_list, $values, $errors, array('tabindex="3"')) ?>
 
         <?= $this->form->label(t('Category'), 'category_id') ?>
-        <?= $this->form->select('category_id', $categories_list, $values, $errors, array('tabindex="4"')) ?><br/>
+        <?= $this->form->select('category_id', $categories_list, $values, $errors, array('tabindex="4"')) ?>
 
         <?php if (! (count($swimlanes_list) === 1 && key($swimlanes_list) === 0)): ?>
         <?= $this->form->label(t('Swimlane'), 'swimlane_id') ?>
-        <?= $this->form->select('swimlane_id', $swimlanes_list, $values, $errors, array('tabindex="5"')) ?><br/>
+        <?= $this->form->select('swimlane_id', $swimlanes_list, $values, $errors, array('tabindex="5"')) ?>
         <?php endif ?>
 
         <?= $this->form->label(t('Column'), 'column_id') ?>
-        <?= $this->form->select('column_id', $columns_list, $values, $errors, array('tabindex="6"')) ?><br/>
+        <?= $this->form->select('column_id', $columns_list, $values, $errors, array('tabindex="6"')) ?>
+
+        <?= $this->task->selectPriority($project, $values) ?>
 
         <?= $this->form->label(t('Complexity'), 'score') ?>
-        <?= $this->form->number('score', $values, $errors, array('tabindex="8"')) ?><br/>
+        <?= $this->form->number('score', $values, $errors, array('tabindex="9"')) ?>
 
         <?= $this->form->label(t('Original estimate'), 'time_estimated') ?>
-        <?= $this->form->numeric('time_estimated', $values, $errors, array('tabindex="9"')) ?> <?= t('hours') ?><br/>
+        <?= $this->form->numeric('time_estimated', $values, $errors, array('tabindex="10"')) ?> <?= t('hours') ?>
 
         <?= $this->form->label(t('Due Date'), 'date_due') ?>
-        <?= $this->form->text('date_due', $values, $errors, array('placeholder="'.$this->text->in($date_format, $date_formats).'"', 'tabindex="10"'), 'form-date') ?><br/>
+        <?= $this->form->text('date_due', $values, $errors, array('placeholder="'.$this->text->in($date_format, $date_formats).'"', 'tabindex="11"'), 'form-date') ?>
         <div class="form-help"><?= t('Others formats accepted: %s and %s', date('Y-m-d'), date('Y_m_d')) ?></div>
     </div>
 
     <div class="form-actions">
-        <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue" tabindex="11"/>
+        <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue" tabindex="12"/>
         <?= t('or') ?> <?= $this->url->link(t('cancel'), 'board', 'show', array('project_id' => $values['project_id']), false, 'close-popover') ?>
     </div>
 </form>
\ No newline at end of file
diff --git a/app/Template/task_modification/edit_task.php b/app/Template/task_modification/edit_task.php
index 6fdb77b5..2701dd8f 100644
--- a/app/Template/task_modification/edit_task.php
+++ b/app/Template/task_modification/edit_task.php
@@ -8,7 +8,7 @@
     <div class="form-column">
 
         <?= $this->form->label(t('Title'), 'title') ?>
-        <?= $this->form->text('title', $values, $errors, array('autofocus', 'required', 'maxlength="200"', 'tabindex="1"')) ?><br/>
+        <?= $this->form->text('title', $values, $errors, array('autofocus', 'required', 'maxlength="200"', 'tabindex="1"')) ?>
 
         <?= $this->form->label(t('Description'), 'description') ?>
         <div class="form-tabs">
@@ -45,16 +45,18 @@
         <?= $this->form->hidden('project_id', $values) ?>
 
         <?= $this->form->label(t('Assignee'), 'owner_id') ?>
-        <?= $this->form->select('owner_id', $users_list, $values, $errors, array('tabindex="3"')) ?><br/>
+        <?= $this->form->select('owner_id', $users_list, $values, $errors, array('tabindex="3"')) ?>
 
         <?= $this->form->label(t('Category'), 'category_id') ?>
-        <?= $this->form->select('category_id', $categories_list, $values, $errors, array('tabindex="4"')) ?><br/>
+        <?= $this->form->select('category_id', $categories_list, $values, $errors, array('tabindex="4"')) ?>
 
         <?= $this->form->label(t('Complexity'), 'score') ?>
-        <?= $this->form->number('score', $values, $errors, array('tabindex="6"')) ?><br/>
+        <?= $this->form->number('score', $values, $errors, array('tabindex="6"')) ?>
+
+        <?= $this->task->selectPriority($project, $values) ?>
 
         <?= $this->form->label(t('Due Date'), 'date_due') ?>
-        <?= $this->form->text('date_due', $values, $errors, array('placeholder="'.$this->text->in($date_format, $date_formats).'"', 'tabindex="7"'), 'form-date') ?><br/>
+        <?= $this->form->text('date_due', $values, $errors, array('placeholder="'.$this->text->in($date_format, $date_formats).'"', 'tabindex="8"'), 'form-date') ?>
         <div class="form-help"><?= t('Others formats accepted: %s and %s', date('Y-m-d'), date('Y_m_d')) ?></div>
     </div>
 
diff --git a/app/Validator/ProjectValidator.php b/app/Validator/ProjectValidator.php
index 53cb7a37..1c6c90f8 100644
--- a/app/Validator/ProjectValidator.php
+++ b/app/Validator/ProjectValidator.php
@@ -24,6 +24,9 @@ class ProjectValidator extends Base
     {
         return array(
             new Validators\Integer('id', t('This value must be an integer')),
+            new Validators\Integer('priority_default', t('This value must be an integer')),
+            new Validators\Integer('priority_start', t('This value must be an integer')),
+            new Validators\Integer('priority_end', t('This value must be an integer')),
             new Validators\Integer('is_active', t('This value must be an integer')),
             new Validators\Required('name', t('The project name is required')),
             new Validators\MaxLength('name', t('The maximum length is %d characters', 50), 50),
diff --git a/app/Validator/TaskValidator.php b/app/Validator/TaskValidator.php
index c18a9761..7b73aeba 100644
--- a/app/Validator/TaskValidator.php
+++ b/app/Validator/TaskValidator.php
@@ -37,6 +37,7 @@ class TaskValidator extends Base
             new Validators\Integer('recurrence_basedate', t('This value must be an integer')),
             new Validators\Integer('recurrence_trigger', t('This value must be an integer')),
             new Validators\Integer('recurrence_status', t('This value must be an integer')),
+            new Validators\Integer('priority', t('This value must be an integer')),
             new Validators\MaxLength('title', t('The maximum length is %d characters', 200), 200),
             new Validators\MaxLength('reference', t('The maximum length is %d characters', 50), 50),
             new Validators\Date('date_due', t('Invalid date'), $this->dateParser->getDateFormats()),
diff --git a/tests/units/Helper/TaskHelperTest.php b/tests/units/Helper/TaskHelperTest.php
new file mode 100644
index 00000000..726188e4
--- /dev/null
+++ b/tests/units/Helper/TaskHelperTest.php
@@ -0,0 +1,32 @@
+<?php
+
+require_once __DIR__.'/../Base.php';
+
+use Kanboard\Helper\Task;
+
+class TaskHelperTest extends Base
+{
+    public function testSelectPriority()
+    {
+        $helper = new Task($this->container);
+        $this->assertNotEmpty($helper->selectPriority(array('priority_end' => '3', 'priority_start' => '1', 'priority_default' => '2'), array()));
+        $this->assertEmpty($helper->selectPriority(array('priority_end' => '3', 'priority_start' => '3', 'priority_default' => '2'), array()));
+    }
+
+    public function testFormatPriority()
+    {
+        $helper = new Task($this->container);
+
+        $this->assertEquals(
+            '<span class="task-board-priority" title="Task priority">P2</span>',
+            $helper->formatPriority(array('priority_end' => '3', 'priority_start' => '1', 'priority_default' => '2'), array('priority' => 2))
+        );
+
+        $this->assertEquals(
+            '<span class="task-board-priority" title="Task priority">-P6</span>',
+            $helper->formatPriority(array('priority_end' => '3', 'priority_start' => '1', 'priority_default' => '2'), array('priority' => -6))
+        );
+
+        $this->assertEmpty($helper->formatPriority(array('priority_end' => '3', 'priority_start' => '3', 'priority_default' => '2'), array()));
+    }
+}
diff --git a/tests/units/Model/ProjectTest.php b/tests/units/Model/ProjectTest.php
index afd047b0..cadb42a6 100644
--- a/tests/units/Model/ProjectTest.php
+++ b/tests/units/Model/ProjectTest.php
@@ -305,4 +305,24 @@ class ProjectTest extends Base
         $this->assertEquals('', $project['owner_username']);
         $this->assertEquals(0, $project['owner_id']);
     }
+
+    public function testPriority()
+    {
+        $projectModel = new Project($this->container);
+        $this->assertEquals(1, $projectModel->create(array('name' => 'My project 2')));
+
+        $project = $projectModel->getById(1);
+        $this->assertNotEmpty($project);
+        $this->assertEquals(0, $project['priority_default']);
+        $this->assertEquals(0, $project['priority_start']);
+        $this->assertEquals(3, $project['priority_end']);
+
+        $this->assertTrue($projectModel->update(array('id' => 1, 'priority_start' => 2, 'priority_end' => 5, 'priority_default' => 4)));
+
+        $project = $projectModel->getById(1);
+        $this->assertNotEmpty($project);
+        $this->assertEquals(4, $project['priority_default']);
+        $this->assertEquals(2, $project['priority_start']);
+        $this->assertEquals(5, $project['priority_end']);
+    }
 }
-- 
cgit v1.2.3


From 58cef289674717027b6b470044504a661f3bd9ad Mon Sep 17 00:00:00 2001
From: Frederic Guillot <fred@kanboard.net>
Date: Sat, 6 Feb 2016 18:08:41 -0500
Subject: The date time format can be chosen in application settings

---
 ChangeLog                                   |   1 +
 app/Controller/Analytic.php                 |   4 +-
 app/Controller/Config.php                   |   4 +-
 app/Controller/Export.php                   |   2 +-
 app/Controller/Task.php                     |   4 +-
 app/Controller/Taskmodification.php         |   6 +-
 app/Core/DateParser.php                     | 215 ++++++++++++++++------------
 app/Core/Translator.php                     |  28 ----
 app/Helper/Dt.php                           |  46 +++++-
 app/Helper/Task.php                         |   5 +-
 app/Locale/bs_BA/translations.php           |  19 +--
 app/Locale/cs_CZ/translations.php           |  19 +--
 app/Locale/da_DK/translations.php           |  19 +--
 app/Locale/de_DE/translations.php           |  19 +--
 app/Locale/el_GR/translations.php           |  19 +--
 app/Locale/es_ES/translations.php           |  19 +--
 app/Locale/fi_FI/translations.php           |  19 +--
 app/Locale/fr_FR/translations.php           |  19 +--
 app/Locale/hu_HU/translations.php           |  19 +--
 app/Locale/id_ID/translations.php           |  19 +--
 app/Locale/it_IT/translations.php           |  19 +--
 app/Locale/ja_JP/translations.php           |  19 +--
 app/Locale/my_MY/translations.php           |  19 +--
 app/Locale/nb_NO/translations.php           |  19 +--
 app/Locale/nl_NL/translations.php           |  19 +--
 app/Locale/pl_PL/translations.php           |  19 +--
 app/Locale/pt_BR/translations.php           |  19 +--
 app/Locale/pt_PT/translations.php           |  19 +--
 app/Locale/ru_RU/translations.php           |  19 +--
 app/Locale/sr_Latn_RS/translations.php      |  19 +--
 app/Locale/sv_SE/translations.php           |  19 +--
 app/Locale/th_TH/translations.php           |  19 +--
 app/Locale/tr_TR/translations.php           |  19 +--
 app/Locale/zh_CN/translations.php           |  19 +--
 app/Model/File.php                          |   2 +-
 app/Model/TaskCreation.php                  |   5 +-
 app/Model/TaskExport.php                    |   2 +-
 app/Model/TaskModification.php              |   5 +-
 app/Template/app/notifications.php          |   2 +-
 app/Template/app/tasks.php                  |   2 +-
 app/Template/board/task_footer.php          |   2 +-
 app/Template/board/tooltip_comments.php     |   2 +-
 app/Template/comment/show.php               |   2 +-
 app/Template/config/application.php         |   6 +
 app/Template/event/events.php               |   2 +-
 app/Template/file/show.php                  |   4 +-
 app/Template/listing/show.php               |   2 +-
 app/Template/notification/task_create.php   |   4 +-
 app/Template/notification/task_overdue.php  |   2 +-
 app/Template/project/index.php              |   4 +-
 app/Template/project/show.php               |   6 +-
 app/Template/project_user/tasks.php         |   4 +-
 app/Template/search/results.php             |   2 +-
 app/Template/task/changes.php               |   4 +-
 app/Template/task/details.php               |  12 +-
 app/Template/task/time_tracking_details.php |   4 +-
 app/Template/task/transitions.php           |   2 +-
 app/Template/task_external_link/show.php    |   2 +-
 app/Template/user/last.php                  |   2 +-
 app/Template/user/password_reset.php        |   4 +-
 app/Template/user/sessions.php              |   4 +-
 app/Template/user/timesheet.php             |   4 +-
 app/Validator/TaskValidator.php             |   4 +-
 app/functions.php                           |  10 --
 doc/translations.markdown                   |  13 +-
 tests/units/Core/DateParserTest.php         | 182 +++++++++++++++++------
 tests/units/Helper/DatetimeHelperTest.php   |  52 +++++--
 tests/units/Model/TaskCreationTest.php      |   4 +-
 tests/units/Model/TaskDuplicationTest.php   |   6 +-
 69 files changed, 557 insertions(+), 583 deletions(-)

(limited to 'app/Validator/TaskValidator.php')

diff --git a/ChangeLog b/ChangeLog
index ef58e0ac..6b9d17fd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -23,6 +23,7 @@ New features:
 
 Improvements:
 
+* The date time format can be chosen in application settings
 * Export only open tasks in iCal feed
 * Remove time form on task summary page and move that to task edit form
 * Replace box shadow by a larger border width when a task is recently modified
diff --git a/app/Controller/Analytic.php b/app/Controller/Analytic.php
index e7ab9ebc..6ce062c4 100644
--- a/app/Controller/Analytic.php
+++ b/app/Controller/Analytic.php
@@ -31,7 +31,7 @@ class Analytic extends Base
             'average' => $this->averageLeadCycleTimeAnalytic->build($project['id']),
             'metrics' => $this->projectDailyStats->getRawMetrics($project['id'], $from, $to),
             'date_format' => $this->config->get('application_date_format'),
-            'date_formats' => $this->dateParser->getAvailableFormats(),
+            'date_formats' => $this->dateParser->getAvailableFormats($this->dateParser->getDateFormats()),
             'title' => t('Lead and Cycle time for "%s"', $project['name']),
         )));
     }
@@ -154,7 +154,7 @@ class Analytic extends Base
             'metrics' => $display_graph ? $this->projectDailyColumnStats->getAggregatedMetrics($project['id'], $from, $to, $column) : array(),
             'project' => $project,
             'date_format' => $this->config->get('application_date_format'),
-            'date_formats' => $this->dateParser->getAvailableFormats(),
+            'date_formats' => $this->dateParser->getAvailableFormats($this->dateParser->getDateFormats()),
             'title' => t($title, $project['name']),
         )));
     }
diff --git a/app/Controller/Config.php b/app/Controller/Config.php
index 53f7cdb6..80522bbe 100644
--- a/app/Controller/Config.php
+++ b/app/Controller/Config.php
@@ -85,7 +85,9 @@ class Config extends Base
         $this->response->html($this->helper->layout->config('config/application', array(
             'languages' => $this->config->getLanguages(),
             'timezones' => $this->config->getTimezones(),
-            'date_formats' => $this->dateParser->getAvailableFormats(),
+            'date_formats' => $this->dateParser->getAvailableFormats($this->dateParser->getDateFormats()),
+            'datetime_formats' => $this->dateParser->getAvailableFormats($this->dateParser->getDateTimeFormats()),
+            'time_formats' => $this->dateParser->getAvailableFormats($this->dateParser->getTimeFormats()),
             'title' => t('Settings').' &gt; '.t('Application settings'),
         )));
     }
diff --git a/app/Controller/Export.php b/app/Controller/Export.php
index 977a4107..726edd42 100644
--- a/app/Controller/Export.php
+++ b/app/Controller/Export.php
@@ -37,7 +37,7 @@ class Export extends Base
             ),
             'errors' => array(),
             'date_format' => $this->config->get('application_date_format'),
-            'date_formats' => $this->dateParser->getAvailableFormats(),
+            'date_formats' => $this->dateParser->getAvailableFormats($this->dateParser->getDateFormats()),
             'project' => $project,
             'title' => $page_title,
         ), 'export/sidebar'));
diff --git a/app/Controller/Task.php b/app/Controller/Task.php
index 40ff8448..4db8f86e 100644
--- a/app/Controller/Task.php
+++ b/app/Controller/Task.php
@@ -62,7 +62,7 @@ class Task extends Base
             'time_spent' => $task['time_spent'] ?: '',
         );
 
-        $this->dateParser->format($values, array('date_started'), 'Y-m-d H:i');
+        $values = $this->dateParser->format($values, array('date_started'), $this->config->get('application_datetime_format', 'm/d/Y H:i'));
 
         $this->response->html($this->helper->layout->task('task/show', array(
             'project' => $this->project->getById($task['project_id']),
@@ -77,8 +77,6 @@ class Task extends Base
             'columns_list' => $this->board->getColumnsList($task['project_id']),
             'colors_list' => $this->color->getList(),
             'users_list' => $this->projectUserRole->getAssignableUsersList($task['project_id'], true, false, false),
-            'date_format' => $this->config->get('application_date_format'),
-            'date_formats' => $this->dateParser->getAvailableFormats(),
             'title' => $task['project_name'].' &gt; '.$task['title'],
             'recurrence_trigger_list' => $this->task->getRecurrenceTriggerList(),
             'recurrence_timeframe_list' => $this->task->getRecurrenceTimeframeList(),
diff --git a/app/Controller/Taskmodification.php b/app/Controller/Taskmodification.php
index 54b4b23a..a321322d 100644
--- a/app/Controller/Taskmodification.php
+++ b/app/Controller/Taskmodification.php
@@ -82,8 +82,8 @@ class Taskmodification extends Base
             $values = $this->hook->merge('controller:task:form:default', $values, array('default_values' => $values));
         }
 
-        $this->dateParser->format($values, array('date_due'));
-        $this->dateParser->format($values, array('date_started'), 'Y-m-d H:i');
+        $values = $this->dateParser->format($values, array('date_due'), $this->config->get('application_date_format', 'm/d/Y'));
+        $values = $this->dateParser->format($values, array('date_started'), $this->config->get('application_datetime_format', 'm/d/Y H:i'));
 
         $this->response->html($this->helper->layout->task('task_modification/edit_task', array(
             'project' => $project,
@@ -93,8 +93,6 @@ class Taskmodification extends Base
             'users_list' => $this->projectUserRole->getAssignableUsersList($task['project_id']),
             'colors_list' => $this->color->getList(),
             'categories_list' => $this->category->getList($task['project_id']),
-            'date_format' => $this->config->get('application_date_format'),
-            'date_formats' => $this->dateParser->getAvailableFormats(),
         )));
     }
 
diff --git a/app/Core/DateParser.php b/app/Core/DateParser.php
index 6577af0f..20e79ff9 100644
--- a/app/Core/DateParser.php
+++ b/app/Core/DateParser.php
@@ -13,67 +13,91 @@ use DateTime;
 class DateParser extends Base
 {
     /**
-     * Return true if the date is within the date range
+     * List of time formats
      *
      * @access public
-     * @param  DateTime  $date
-     * @param  DateTime  $start
-     * @param  DateTime  $end
-     * @return boolean
+     * @return string[]
      */
-    public function withinDateRange(DateTime $date, DateTime $start, DateTime $end)
+    public function getTimeFormats()
     {
-        return $date >= $start && $date <= $end;
+        return array(
+            'H:i',
+            'g:i a',
+        );
     }
 
     /**
-     * Get the total number of hours between 2 datetime objects
-     * Minutes are rounded to the nearest quarter
+     * List of date formats
      *
      * @access public
-     * @param  DateTime $d1
-     * @param  DateTime $d2
-     * @return float
+     * @param  boolean  $iso
+     * @return string[]
      */
-    public function getHours(DateTime $d1, DateTime $d2)
+    public function getDateFormats($iso = false)
     {
-        $seconds = $this->getRoundedSeconds(abs($d1->getTimestamp() - $d2->getTimestamp()));
-        return round($seconds / 3600, 2);
+        $iso_formats = array(
+            'Y-m-d',
+            'Y_m_d',
+        );
+
+        $user_formats = array(
+            'm/d/Y',
+            'd/m/Y',
+            'Y/m/d',
+            'd.m.Y',
+        );
+
+        return $iso ? array_merge($iso_formats, $user_formats) : $user_formats;
     }
 
     /**
-     * Round the timestamp to the nearest quarter
+     * List of datetime formats
      *
      * @access public
-     * @param  integer    $seconds   Timestamp
-     * @return integer
+     * @param  boolean  $iso
+     * @return string[]
      */
-    public function getRoundedSeconds($seconds)
+    public function getDateTimeFormats($iso = false)
     {
-        return (int) round($seconds / (15 * 60)) * (15 * 60);
+        $formats = array();
+
+        foreach ($this->getDateFormats($iso) as $date) {
+            foreach ($this->getTimeFormats() as $time) {
+                $formats[] = $date.' '.$time;
+            }
+        }
+
+        return $formats;
     }
 
     /**
-     * Return a timestamp if the given date format is correct otherwise return 0
+     * List of all date formats
      *
      * @access public
-     * @param  string   $value  Date to parse
-     * @param  string   $format Date format
-     * @return integer
+     * @param  boolean  $iso
+     * @return string[]
      */
-    public function getValidDate($value, $format)
+    public function getAllDateFormats($iso = false)
     {
-        $date = DateTime::createFromFormat($format, $value);
+        return array_merge($this->getDateFormats($iso), $this->getDateTimeFormats($iso));
+    }
 
-        if ($date !== false) {
-            $errors = DateTime::getLastErrors();
-            if ($errors['error_count'] === 0 && $errors['warning_count'] === 0) {
-                $timestamp = $date->getTimestamp();
-                return $timestamp > 0 ? $timestamp : 0;
-            }
+    /**
+     * Get available formats (visible in settings)
+     *
+     * @access public
+     * @param  array  $formats
+     * @return array
+     */
+    public function getAvailableFormats(array $formats)
+    {
+        $values = array();
+
+        foreach ($formats as $format) {
+            $values[$format] = date($format);
         }
 
-        return 0;
+        return $values;
     }
 
     /**
@@ -85,7 +109,11 @@ class DateParser extends Base
      */
     public function getTimestamp($value)
     {
-        foreach ($this->getAllFormats() as $format) {
+        if (ctype_digit($value)) {
+            return (int) $value;
+        }
+
+        foreach ($this->getAllDateFormats(true) as $format) {
             $timestamp = $this->getValidDate($value, $format);
 
             if ($timestamp !== 0) {
@@ -97,104 +125,103 @@ class DateParser extends Base
     }
 
     /**
-     * Get ISO8601 date from user input
+     * Return a timestamp if the given date format is correct otherwise return 0
      *
-     * @access public
-     * @param  string   $value   Date to parse
-     * @return string
+     * @access private
+     * @param  string   $value  Date to parse
+     * @param  string   $format Date format
+     * @return integer
      */
-    public function getIsoDate($value)
+    private function getValidDate($value, $format)
     {
-        return date('Y-m-d', ctype_digit($value) ? $value : $this->getTimestamp($value));
+        $date = DateTime::createFromFormat($format, $value);
+
+        if ($date !== false) {
+            $errors = DateTime::getLastErrors();
+            if ($errors['error_count'] === 0 && $errors['warning_count'] === 0) {
+                $timestamp = $date->getTimestamp();
+                return $timestamp > 0 ? $timestamp : 0;
+            }
+        }
+
+        return 0;
     }
 
     /**
-     * Get all combinations of date/time formats
+     * Return true if the date is within the date range
      *
      * @access public
-     * @return string[]
+     * @param  DateTime  $date
+     * @param  DateTime  $start
+     * @param  DateTime  $end
+     * @return boolean
      */
-    public function getAllFormats()
+    public function withinDateRange(DateTime $date, DateTime $start, DateTime $end)
     {
-        $formats = array();
-
-        foreach ($this->getDateFormats() as $date) {
-            foreach ($this->getTimeFormats() as $time) {
-                $formats[] = $date.' '.$time;
-            }
-        }
-
-        return array_merge($formats, $this->getDateFormats());
+        return $date >= $start && $date <= $end;
     }
 
     /**
-     * Return the list of supported date formats (for the parser)
+     * Get the total number of hours between 2 datetime objects
+     * Minutes are rounded to the nearest quarter
      *
      * @access public
-     * @return string[]
+     * @param  DateTime $d1
+     * @param  DateTime $d2
+     * @return float
      */
-    public function getDateFormats()
+    public function getHours(DateTime $d1, DateTime $d2)
     {
-        return array(
-            $this->config->get('application_date_format', 'm/d/Y'),
-            'Y-m-d',
-            'Y_m_d',
-        );
+        $seconds = $this->getRoundedSeconds(abs($d1->getTimestamp() - $d2->getTimestamp()));
+        return round($seconds / 3600, 2);
     }
 
     /**
-     * Return the list of supported time formats (for the parser)
+     * Round the timestamp to the nearest quarter
      *
      * @access public
-     * @return string[]
+     * @param  integer    $seconds   Timestamp
+     * @return integer
      */
-    public function getTimeFormats()
+    public function getRoundedSeconds($seconds)
     {
-        return array(
-            'H:i',
-            'g:i A',
-            'g:iA',
-        );
+        return (int) round($seconds / (15 * 60)) * (15 * 60);
     }
 
     /**
-     * Return the list of available date formats (for the config page)
+     * Get ISO-8601 date from user input
      *
      * @access public
-     * @return array
+     * @param  string   $value   Date to parse
+     * @return string
      */
-    public function getAvailableFormats()
+    public function getIsoDate($value)
     {
-        return array(
-            'm/d/Y' => date('m/d/Y'),
-            'd/m/Y' => date('d/m/Y'),
-            'Y/m/d' => date('Y/m/d'),
-            'd.m.Y' => date('d.m.Y'),
-        );
+        return date('Y-m-d', $this->getTimestamp($value));
     }
 
     /**
-     * Remove the time from a timestamp
+     * Get a timetstamp from an ISO date format
      *
      * @access public
-     * @param  integer    $timestamp    Timestamp
+     * @param  string   $value
      * @return integer
      */
-    public function removeTimeFromTimestamp($timestamp)
+    public function getTimestampFromIsoFormat($value)
     {
-        return mktime(0, 0, 0, date('m', $timestamp), date('d', $timestamp), date('Y', $timestamp));
+        return $this->removeTimeFromTimestamp(ctype_digit($value) ? $value : strtotime($value));
     }
 
     /**
-     * Get a timetstamp from an ISO date format
+     * Remove the time from a timestamp
      *
      * @access public
-     * @param  string   $date
+     * @param  integer $timestamp
      * @return integer
      */
-    public function getTimestampFromIsoFormat($date)
+    public function removeTimeFromTimestamp($timestamp)
     {
-        return $this->removeTimeFromTimestamp(ctype_digit($date) ? $date : strtotime($date));
+        return mktime(0, 0, 0, date('m', $timestamp), date('d', $timestamp), date('Y', $timestamp));
     }
 
     /**
@@ -204,13 +231,10 @@ class DateParser extends Base
      * @param  array    $values   Database values
      * @param  string[] $fields   Date fields
      * @param  string   $format   Date format
+     * @return array
      */
-    public function format(array &$values, array $fields, $format = '')
+    public function format(array $values, array $fields, $format)
     {
-        if ($format === '') {
-            $format = $this->config->get('application_date_format');
-        }
-
         foreach ($fields as $field) {
             if (! empty($values[$field])) {
                 $values[$field] = date($format, $values[$field]);
@@ -218,23 +242,28 @@ class DateParser extends Base
                 $values[$field] = '';
             }
         }
+
+        return $values;
     }
 
     /**
-     * Convert date (form input data)
+     * Convert date to timestamp
      *
      * @access public
      * @param  array    $values     Database values
      * @param  string[] $fields     Date fields
      * @param  boolean  $keep_time  Keep time or not
+     * @return array
      */
-    public function convert(array &$values, array $fields, $keep_time = false)
+    public function convert(array $values, array $fields, $keep_time = false)
     {
         foreach ($fields as $field) {
-            if (! empty($values[$field]) && ! is_numeric($values[$field])) {
+            if (! empty($values[$field])) {
                 $timestamp = $this->getTimestamp($values[$field]);
                 $values[$field] = $keep_time ? $timestamp : $this->removeTimeFromTimestamp($timestamp);
             }
         }
+
+        return $values;
     }
 }
diff --git a/app/Core/Translator.php b/app/Core/Translator.php
index 96a481f6..113c0dc6 100644
--- a/app/Core/Translator.php
+++ b/app/Core/Translator.php
@@ -146,32 +146,6 @@ class Translator
         return $str;
     }
 
-    /**
-     * Get a formatted datetime
-     *
-     * $translator->datetime('%Y-%m-%d', time());
-     *
-     * @access public
-     * @param  string   $format      Format defined by the strftime function
-     * @param  integer  $timestamp   Unix timestamp
-     * @return string
-     */
-    public function datetime($format, $timestamp)
-    {
-        if (! $timestamp) {
-            return '';
-        }
-
-        $format = $this->get($format, $format);
-
-        if (strtoupper(substr(PHP_OS, 0, 3)) === 'WIN') {
-            $format = str_replace('%e', '%d', $format);
-            $format = str_replace('%k', '%H', $format);
-        }
-
-        return strftime($format, (int) $timestamp);
-    }
-
     /**
      * Get an identifier from the translations or return the default
      *
@@ -199,8 +173,6 @@ class Translator
      */
     public static function load($language, $path = self::PATH)
     {
-        setlocale(LC_TIME, $language.'.UTF-8', $language);
-
         $filename = $path.DIRECTORY_SEPARATOR.$language.DIRECTORY_SEPARATOR.'translations.php';
 
         if (file_exists($filename)) {
diff --git a/app/Helper/Dt.php b/app/Helper/Dt.php
index 78002b1b..eb3f93b3 100644
--- a/app/Helper/Dt.php
+++ b/app/Helper/Dt.php
@@ -12,6 +12,50 @@ use DateTime;
  */
 class Dt extends \Kanboard\Core\Base
 {
+    /**
+     * Get formatted time
+     *
+     * @access public
+     * @param  integer $value
+     * @return string
+     */
+    public function time($value)
+    {
+        return date($this->config->get('application_time_format', 'H:i'), $value);
+    }
+
+    /**
+     * Get formatted date
+     *
+     * @access public
+     * @param  integer $value
+     * @return string
+     */
+    public function date($value)
+    {
+        if (empty($value)) {
+            return '';
+        }
+
+        if (! ctype_digit($value)) {
+            $value = strtotime($value);
+        }
+
+        return date($this->config->get('application_date_format', 'm/d/Y'), $value);
+    }
+
+    /**
+     * Get formatted  datetime
+     *
+     * @access public
+     * @param  integer $value
+     * @return string
+     */
+    public function datetime($value)
+    {
+        return date($this->config->get('application_datetime_format', 'm/d/Y H:i'), $value);
+    }
+
     /**
      * Get duration in seconds into human format
      *
@@ -107,6 +151,6 @@ class Dt extends \Kanboard\Core\Base
      */
     public function getWeekDay($day)
     {
-        return dt('%A', strtotime('next Monday +'.($day - 1).' days'));
+        return date('l', strtotime('next Monday +'.($day - 1).' days'));
     }
 }
diff --git a/app/Helper/Task.php b/app/Helper/Task.php
index 0ef3da2c..e85d6e30 100644
--- a/app/Helper/Task.php
+++ b/app/Helper/Task.php
@@ -142,7 +142,7 @@ class Task extends Base
 
     public function selectStartDate(array $values, array $errors = array(), array $attributes = array())
     {
-        $placeholder = $this->helper->text->in($this->config->get('application_date_format'), $this->dateParser->getAvailableFormats());
+        $placeholder = date($this->config->get('application_date_format', 'm/d/Y H:i'));
         $attributes = array_merge(array('tabindex="11"', 'placeholder="'.$placeholder.'"'), $attributes);
 
         $html = $this->helper->form->label(t('Start Date'), 'date_started');
@@ -153,12 +153,11 @@ class Task extends Base
 
     public function selectDueDate(array $values, array $errors = array(), array $attributes = array())
     {
-        $placeholder = $this->helper->text->in($this->config->get('application_date_format'), $this->dateParser->getAvailableFormats());
+        $placeholder = date($this->config->get('application_date_format', 'm/d/Y'));
         $attributes = array_merge(array('tabindex="12"', 'placeholder="'.$placeholder.'"'), $attributes);
 
         $html = $this->helper->form->label(t('Due Date'), 'date_due');
         $html .= $this->helper->form->text('date_due', $values, $errors, $attributes, 'form-date');
-        $html .= '<div class="form-help">'.t('Others formats accepted: %s and %s', date('Y-m-d'), date('Y_m_d')).'</div>';
 
         return $html;
     }
diff --git a/app/Locale/bs_BA/translations.php b/app/Locale/bs_BA/translations.php
index b8b6a10f..e331d4a1 100644
--- a/app/Locale/bs_BA/translations.php
+++ b/app/Locale/bs_BA/translations.php
@@ -102,7 +102,6 @@ return array(
     'Open a task' => 'Otvori zadatak',
     'Do you really want to open this task: "%s"?' => 'Da li zaista želiš da otvoriš zadatak: "%s"?',
     'Back to the board' => 'Nazad na tablu',
-    'Created on %B %e, %Y at %k:%M %p' => 'Kreiran %e %B %Y o %k:%M',
     'There is nobody assigned' => 'Niko nije dodijeljen!',
     'Column on the board:' => 'Kolona na tabli:',
     'Close this task' => 'Zatvori ovaj zadatak',
@@ -156,7 +155,6 @@ return array(
     'Work in progress' => 'U izradi',
     'Done' => 'Gotovo',
     'Application version:' => 'Verzija aplikacije:',
-    '%B %e, %Y at %k:%M %p' => '%e %B %Y o %k:%M',
     'Id' => 'Id',
     '%d closed tasks' => '%d zatvorenih zadataka',
     'No task for this project' => 'Nema dodijeljenih zadataka ovom projektu',
@@ -180,8 +178,6 @@ return array(
     'Edit this task' => 'Uredi ovaj zadatak',
     'Due Date' => 'Treba biti gotovo do dana',
     'Invalid date' => 'Pogrešan datum',
-    'Must be done before %B %e, %Y' => 'Mora biti gotovo prije %e %B %Y',
-    '%B %e, %Y' => '%e %B %Y',
     'Automatic actions' => 'Automatske akcije',
     'Your automatic action have been created successfully.' => 'Uspješno kreirana automatska akcija',
     'Unable to create your automatic action.' => 'Nemoguće kreiranje automatske akcije',
@@ -317,7 +313,6 @@ return array(
     'Unable to upload the file.' => 'Nije moguće snimiti fajl.',
     'Display another project' => 'Prikaži drugi projekat',
     'Created by %s' => 'Kreirao %s',
-    'Last modified on %B %e, %Y at %k:%M %p' => 'Posljednja izmjena %e %B %Y o %k:%M',
     'Tasks Export' => 'Izvoz zadataka',
     'Tasks exportation for "%s"' => 'Izvoz zadataka za "%s"',
     'Start Date' => 'Početni datum',
@@ -589,7 +584,6 @@ return array(
     'This task' => 'Ovaj zadatak',
     '<1h' => '<1h',
     '%dh' => '%dh',
-    '%b %e' => '%b %e',
     'Expand tasks' => 'Proširi zadatke',
     'Collapse tasks' => 'Skupi zadatke',
     'Expand/collapse tasks' => 'Proširi/skupi zadatke',
@@ -758,10 +752,6 @@ return array(
     'Only for tasks assigned to me' => 'Samo za zadatke na kojima sam izvršilac',
     'Only for tasks created by me' => 'Samo za zadatke koje sam ja napravio',
     'Only for tasks created by me and assigned to me' => 'Samo za zadatke koje sam ja napravio i na kojima sam izvršilac',
-    '%A' => '%A',
-    '%b %e, %Y, %k:%M %p' => '%b %e, %Y, %k:%M %p',
-    'New due date: %B %e, %Y' => 'Novi datum završetka: %B %e, %Y',
-    'Start date changed: %B %e, %Y' => 'Početni datum promijenjen: %B %e, %Y',
     '%%Y-%%m-%%d' => '%%Y-%%m-%%d',
     'Total for all columns' => 'Ukupno za sve kolone',
     'You need at least 2 days of data to show the chart.' => 'Da bi se prikazao ovaj grafik potrebni su podaci iz najmanje posljednja dva dana.',
@@ -786,7 +776,6 @@ return array(
     'Not assigned' => 'Bez izvršioca',
     'View advanced search syntax' => 'Vidi naprednu sintaksu pretrage',
     'Overview' => 'Opšti pregled',
-    '%b %e %Y' => '%b %e %Y',
     'Board/Calendar/List view' => 'Pregle Table/Kalendara/Liste',
     'Switch to the board view' => 'Promijeni da vidim tablu',
     'Switch to the calendar view' => 'Promijeni da vidim kalendar',
@@ -876,8 +865,6 @@ return array(
     'End date:' => 'Datum završetka:',
     'There is no start date or end date for this project.' => 'Nema početnog ili krajnjeg datuma za ovaj projekat.',
     'Projects Gantt chart' => 'Gantogram projekata',
-    'Start date: %s' => 'Početni datum: %s',
-    'End date: %s' => 'Datum završetka: %s',
     'Link type' => 'Tip veze',
     'Change task color when using a specific task link' => 'Promijeni boju zadatka kada se koristi određena veza na zadatku',
     'Task link creation or modification' => 'Veza na zadatku je napravljena ili izmijenjena',
@@ -1125,4 +1112,10 @@ return array(
     // 'Moved:' => '',
     // 'Task #%d' => '',
     // 'Sub-tasks' => '',
+    // 'Date and time format' => '',
+    // 'Time format' => '',
+    // 'Start date: ' => '',
+    // 'End date: ' => '',
+    // 'New due date: ' => '',
+    // 'Start date changed: ' => '',
 );
diff --git a/app/Locale/cs_CZ/translations.php b/app/Locale/cs_CZ/translations.php
index cb99e404..a495f01e 100644
--- a/app/Locale/cs_CZ/translations.php
+++ b/app/Locale/cs_CZ/translations.php
@@ -102,7 +102,6 @@ return array(
     'Open a task' => 'Otevřít úkol',
     'Do you really want to open this task: "%s"?' => 'Opravdu chcete znovuotevřít tento úkol: "%s"?',
     'Back to the board' => 'Zpět na nástěnku',
-    'Created on %B %e, %Y at %k:%M %p' => 'Vytvořeno dne %d.%m.%Y v čase %H:%M',
     'There is nobody assigned' => 'Není přiřazeno žádnému uživateli',
     'Column on the board:' => 'Sloupec:',
     'Close this task' => 'Uzavřít úkol',
@@ -156,7 +155,6 @@ return array(
     'Work in progress' => 'V řešení',
     'Done' => 'Dokončeno',
     'Application version:' => 'Verze:',
-    '%B %e, %Y at %k:%M %p' => '%d.%m.%Y v %H:%M',
     'Id' => 'ID',
     '%d closed tasks' => '%d dokončených úkolů',
     'No task for this project' => 'Tento projekt nemá žádné úkoly',
@@ -180,8 +178,6 @@ return array(
     'Edit this task' => 'Editace úkolu',
     'Due Date' => 'Datum splnění',
     'Invalid date' => 'Neplatné datum',
-    'Must be done before %B %e, %Y' => 'Musí být dokončeno do %d.%m.%Y ',
-    '%B %e, %Y' => '%d.%m.%Y',
     'Automatic actions' => 'Automaticky vykonávané akce',
     'Your automatic action have been created successfully.' => 'Vaše akce byla úspěšně vytvořena.',
     'Unable to create your automatic action.' => 'Vaší akci nebylo možné vytvořit.',
@@ -317,7 +313,6 @@ return array(
     'Unable to upload the file.' => 'Soubor nelze nahrát.',
     'Display another project' => 'Zobrazit jiný projekt',
     'Created by %s' => 'Vytvořeno uživatelem %s',
-    'Last modified on %B %e, %Y at %k:%M %p' => 'Poslední úprava dne %d.%m.%Y v čase %H:%M',
     'Tasks Export' => 'Export úkolů',
     'Tasks exportation for "%s"' => 'Export úkolů pro  "%s"',
     'Start Date' => 'Počáteční datum',
@@ -589,7 +584,6 @@ return array(
     'This task' => 'Tento úkol',
     '<1h' => '<1h',
     '%dh' => '%dh',
-    // '%b %e' => '',
     'Expand tasks' => 'Rozpbalit úkoly',
     'Collapse tasks' => 'Sbalit úkoly',
     'Expand/collapse tasks' => 'Rozbalit / sbalit úkoly',
@@ -758,10 +752,6 @@ return array(
     'Only for tasks assigned to me' => 'pouze pro moje úkoly',
     'Only for tasks created by me' => 'pouze pro mnou vytvořené úkoly',
     'Only for tasks created by me and assigned to me' => 'pouze pro mnou vytvořené a mě přiřazené úkoly',
-    // '%A' => '',
-    // '%b %e, %Y, %k:%M %p' => '',
-    'New due date: %B %e, %Y' => 'Neues Ablaufdatum: %B %e, %Y',
-    'Start date changed: %B %e, %Y' => 'Neues Beginndatum: %B %e, %Y',
     // '%%Y-%%m-%%d' => '',
     'Total for all columns' => 'S',
     'You need at least 2 days of data to show the chart.' => 'Potřebujete nejméně data ze dvou dnů pro zobrazení grafu',
@@ -786,7 +776,6 @@ return array(
     'Not assigned' => 'Nepřiřazené',
     'View advanced search syntax' => 'Zobrazit syntaxi rozšířeného vyhledávání',
     'Overview' => 'Přehled',
-    '%b %e %Y' => '%b %e %Y',
     'Board/Calendar/List view' => 'Nástěnka/Kalendář/Zobrazení seznamu',
     'Switch to the board view' => 'Přepnout na nástěnku',
     'Switch to the calendar view' => 'Přepnout na kalendář',
@@ -876,8 +865,6 @@ return array(
     // 'End date:' => '',
     // 'There is no start date or end date for this project.' => '',
     // 'Projects Gantt chart' => '',
-    // 'Start date: %s' => '',
-    // 'End date: %s' => '',
     // 'Link type' => '',
     // 'Change task color when using a specific task link' => '',
     // 'Task link creation or modification' => '',
@@ -1125,4 +1112,10 @@ return array(
     // 'Moved:' => '',
     // 'Task #%d' => '',
     // 'Sub-tasks' => '',
+    // 'Date and time format' => '',
+    // 'Time format' => '',
+    // 'Start date: ' => '',
+    // 'End date: ' => '',
+    // 'New due date: ' => '',
+    // 'Start date changed: ' => '',
 );
diff --git a/app/Locale/da_DK/translations.php b/app/Locale/da_DK/translations.php
index b61fcd4a..537b6349 100644
--- a/app/Locale/da_DK/translations.php
+++ b/app/Locale/da_DK/translations.php
@@ -102,7 +102,6 @@ return array(
     'Open a task' => 'Åben en opgave',
     'Do you really want to open this task: "%s"?' => 'Vil du virkelig åbne denne opgave: "%s"?',
     'Back to the board' => 'Tilbage til boardet',
-    'Created on %B %e, %Y at %k:%M %p' => 'Oprettet %d.%m.%Y - %H:%M',
     'There is nobody assigned' => 'Der er ingen tilføjet',
     'Column on the board:' => 'Kolonne:',
     'Close this task' => 'Luk denne opgave',
@@ -156,7 +155,6 @@ return array(
     'Work in progress' => 'Igangværende',
     'Done' => 'Færdig',
     'Application version:' => 'Version:',
-    '%B %e, %Y at %k:%M %p' => '%d.%m.%Y - %H:%M',
     'Id' => 'ID',
     '%d closed tasks' => '%d lukket opgavet',
     'No task for this project' => 'Ingen opgaver i dette projekt',
@@ -180,8 +178,6 @@ return array(
     'Edit this task' => 'Rediger denne opgave',
     'Due Date' => 'Forfaldsdato',
     'Invalid date' => 'Ugyldig dato',
-    'Must be done before %B %e, %Y' => 'Skal være fuldført inden %d.%m.%Y',
-    '%B %e, %Y' => '%d.%m.%Y',
     'Automatic actions' => 'Automatiske handlinger',
     'Your automatic action have been created successfully.' => 'Din automatiske handling er oprettet.',
     'Unable to create your automatic action.' => 'Din automatiske handling kunne ikke oprettes.',
@@ -317,7 +313,6 @@ return array(
     'Unable to upload the file.' => 'Filen kunne ikke uploades.',
     'Display another project' => 'Vis et andet projekt...',
     'Created by %s' => 'Oprettet af %s',
-    'Last modified on %B %e, %Y at %k:%M %p' => 'Sidst redigeret %d.%m.%Y - %H:%M',
     'Tasks Export' => 'Opgave eksport',
     'Tasks exportation for "%s"' => 'Opgave eksport for "%s"',
     'Start Date' => 'Start-dato',
@@ -589,7 +584,6 @@ return array(
     // 'This task' => '',
     // '<1h' => '',
     // '%dh' => '',
-    // '%b %e' => '',
     // 'Expand tasks' => '',
     // 'Collapse tasks' => '',
     // 'Expand/collapse tasks' => '',
@@ -758,10 +752,6 @@ return array(
     // 'Only for tasks assigned to me' => '',
     // 'Only for tasks created by me' => '',
     // 'Only for tasks created by me and assigned to me' => '',
-    // '%A' => '',
-    // '%b %e, %Y, %k:%M %p' => '',
-    // 'New due date: %B %e, %Y' => '',
-    // 'Start date changed: %B %e, %Y' => '',
     // '%%Y-%%m-%%d' => '',
     // 'Total for all columns' => '',
     // 'You need at least 2 days of data to show the chart.' => '',
@@ -786,7 +776,6 @@ return array(
     // 'Not assigned' => '',
     // 'View advanced search syntax' => '',
     // 'Overview' => '',
-    // '%b %e %Y' => '',
     // 'Board/Calendar/List view' => '',
     // 'Switch to the board view' => '',
     // 'Switch to the calendar view' => '',
@@ -876,8 +865,6 @@ return array(
     // 'End date:' => '',
     // 'There is no start date or end date for this project.' => '',
     // 'Projects Gantt chart' => '',
-    // 'Start date: %s' => '',
-    // 'End date: %s' => '',
     // 'Link type' => '',
     // 'Change task color when using a specific task link' => '',
     // 'Task link creation or modification' => '',
@@ -1125,4 +1112,10 @@ return array(
     // 'Moved:' => '',
     // 'Task #%d' => '',
     // 'Sub-tasks' => '',
+    // 'Date and time format' => '',
+    // 'Time format' => '',
+    // 'Start date: ' => '',
+    // 'End date: ' => '',
+    // 'New due date: ' => '',
+    // 'Start date changed: ' => '',
 );
diff --git a/app/Locale/de_DE/translations.php b/app/Locale/de_DE/translations.php
index a15b96d7..ba6a1fd4 100644
--- a/app/Locale/de_DE/translations.php
+++ b/app/Locale/de_DE/translations.php
@@ -102,7 +102,6 @@ return array(
     'Open a task' => 'Öffne eine Aufgabe',
     'Do you really want to open this task: "%s"?' => 'Soll diese Aufgabe wirklich wieder geöffnet werden: "%s"?',
     'Back to the board' => 'Zurück zur Pinnwand',
-    'Created on %B %e, %Y at %k:%M %p' => 'Erstellt am %d.%m.%Y um %H:%M',
     'There is nobody assigned' => 'Die Aufgabe wurde niemandem zugewiesen',
     'Column on the board:' => 'Spalte:',
     'Close this task' => 'Aufgabe schließen',
@@ -156,7 +155,6 @@ return array(
     'Work in progress' => 'In Arbeit',
     'Done' => 'Erledigt',
     'Application version:' => 'Version:',
-    '%B %e, %Y at %k:%M %p' => '%d.%m.%Y um %H:%M',
     'Id' => 'ID',
     '%d closed tasks' => '%d abgeschlossene Aufgaben',
     'No task for this project' => 'Keine Aufgaben in diesem Projekt',
@@ -180,8 +178,6 @@ return array(
     'Edit this task' => 'Aufgabe bearbeiten',
     'Due Date' => 'Fällig am',
     'Invalid date' => 'Ungültiges Datum',
-    'Must be done before %B %e, %Y' => 'Muss vor dem %d.%m.%Y erledigt werden',
-    '%B %e, %Y' => '%d.%m.%Y',
     'Automatic actions' => 'Automatische Aktionen',
     'Your automatic action have been created successfully.' => 'Die automatische Aktion wurde erfolgreich erstellt.',
     'Unable to create your automatic action.' => 'Erstellen der automatischen Aktion nicht möglich.',
@@ -317,7 +313,6 @@ return array(
     'Unable to upload the file.' => 'Hochladen der Datei nicht möglich.',
     'Display another project' => 'Zu Projekt wechseln',
     'Created by %s' => 'Erstellt durch %s',
-    'Last modified on %B %e, %Y at %k:%M %p' => 'Letzte Änderung am %d.%m.%Y um %H:%M',
     'Tasks Export' => 'Aufgaben exportieren',
     'Tasks exportation for "%s"' => 'Aufgaben exportieren für "%s"',
     'Start Date' => 'Anfangsdatum',
@@ -589,7 +584,6 @@ return array(
     'This task' => 'Diese Aufgabe',
     '<1h' => '<1Std',
     '%dh' => '%dStd',
-    // '%b %e' => '',
     'Expand tasks' => 'Aufgaben aufklappen',
     'Collapse tasks' => 'Aufgaben zusammenklappen',
     'Expand/collapse tasks' => 'Aufgaben auf/zuklappen',
@@ -758,10 +752,6 @@ return array(
     'Only for tasks assigned to me' => 'nur mir zugeordnete Aufgane',
     'Only for tasks created by me' => 'nur von mir erstellte Aufgaben',
     'Only for tasks created by me and assigned to me' => 'nur mir zugeordnete und von mir erstellte Aufgaben',
-    '%A' => '%A',
-    '%b %e, %Y, %k:%M %p' => '%b %e, %Y, %k:%M %p',
-    'New due date: %B %e, %Y' => 'Neues Ablaufdatum: %B %e, %Y',
-    'Start date changed: %B %e, %Y' => 'Neues Beginndatum: %B %e, %Y',
     '%%Y-%%m-%%d' => '%%d.%%m.%%Y',
     'Total for all columns' => 'Gesamt für alle Spalten',
     'You need at least 2 days of data to show the chart.' => 'Es werden mindestens 2 Tage zur Darstellung benötigt',
@@ -786,7 +776,6 @@ return array(
     'Not assigned' => 'Nicht zugewiesen',
     'View advanced search syntax' => 'Zur erweiterten Suchsyntax',
     'Overview' => 'Überblick',
-    '%b %e %Y' => '%b %e %Y',
     'Board/Calendar/List view' => 'Board-/Kalender-/Listen-Ansicht',
     'Switch to the board view' => 'Zur Board-Ansicht',
     'Switch to the calendar view' => 'Zur Kalender-Ansicht',
@@ -876,8 +865,6 @@ return array(
     'End date:' => 'Endedatum:',
     'There is no start date or end date for this project.' => 'Es gibt kein Startdatum oder Endedatum für dieses Projekt',
     'Projects Gantt chart' => 'Projekt Gantt Diagramm',
-    'Start date: %s' => 'Beginndatum: %s',
-    'End date: %s' => 'Enddatum: %s',
     'Link type' => 'Verbindungstyp',
     'Change task color when using a specific task link' => 'Aufgabefarbe ändern bei bestimmter Aufgabenverbindung',
     'Task link creation or modification' => 'Aufgabenverbindung erstellen oder bearbeiten',
@@ -1125,4 +1112,10 @@ return array(
     // 'Moved:' => '',
     // 'Task #%d' => '',
     // 'Sub-tasks' => '',
+    // 'Date and time format' => '',
+    // 'Time format' => '',
+    // 'Start date: ' => '',
+    // 'End date: ' => '',
+    // 'New due date: ' => '',
+    // 'Start date changed: ' => '',
 );
diff --git a/app/Locale/el_GR/translations.php b/app/Locale/el_GR/translations.php
index 9fb1e0bf..01b31819 100644
--- a/app/Locale/el_GR/translations.php
+++ b/app/Locale/el_GR/translations.php
@@ -102,7 +102,6 @@ return array(
     'Open a task' => 'Άνοιγμα εργασίας',
     'Do you really want to open this task: "%s"?' => 'Άνοιγμα της εργασίας : « %s » ?',
     'Back to the board' => 'Επιστροφή στον κεντρικό πίνακα έργου',
-    'Created on %B %e, %Y at %k:%M %p' => 'Δημιουργήθηκε στις %d/%m/%Y και ώρα %H:%M',
     'There is nobody assigned' => 'Δεν έχει ανατεθεί σε κανένα',
     'Column on the board:' => 'Στήλη στον κεντρικό πίνακα : ',
     'Close this task' => 'Κλείσιμο εργασίας',
@@ -156,7 +155,6 @@ return array(
     'Work in progress' => 'Σε πρόοδο',
     'Done' => 'Ολοκληρωμένα',
     'Application version:' => 'Version εφαρμογής :',
-    '%B %e, %Y at %k:%M %p' => '%d/%m/%Y και ώρα %H:%M',
     'Id' => 'Αναγνωριστικό.',
     '%d closed tasks' => '%d κλειστές εργασίες',
     'No task for this project' => 'Αριθμός εργασιών για το έργο',
@@ -180,8 +178,6 @@ return array(
     'Edit this task' => 'Διόρθωση εργασίας',
     'Due Date' => 'Μέχρι την ημερομηνία',
     'Invalid date' => 'Μη ορθή ημερομηνία',
-    'Must be done before %B %e, %Y' => 'Πρέπει να ολοκληρωθεί πριν τις %d/%m/%Y',
-    '%B %e, %Y' => '%d %B %Y',
     'Automatic actions' => 'Αυτόματες ενέργειες',
     'Your automatic action have been created successfully.' => 'Η αυτόματη ενέργεια δημιουργήθηκε με επιτυχία.',
     'Unable to create your automatic action.' => 'Impossible de créer votre action automatisée.',
@@ -317,7 +313,6 @@ return array(
     'Unable to upload the file.' => 'Δεν είναι δυνατή η μεταφόρτωση του αρχείου.',
     'Display another project' => 'Εμφάνιση άλλου έργου',
     'Created by %s' => 'Δημιουργήθηκε από %s',
-    'Last modified on %B %e, %Y at %k:%M %p' => 'Τελευταία ενημέρωση: %d/%m/%Y à %H:%M',
     'Tasks Export' => 'Εξαγωγή εργασιών',
     'Tasks exportation for "%s"' => 'Εξαγωγή εργασιών για το έργο « %s »',
     'Start Date' => 'Ημερομηνία έναρξης',
@@ -589,7 +584,6 @@ return array(
     'This task' => 'Αυτή η εργασία',
     '<1h' => '<1ωρ',
     '%dh' => '%dωρ',
-    '%b %e' => '%e %b',
     'Expand tasks' => 'Ανάπτυξη εργασιών',
     'Collapse tasks' => 'Σύμπτυξη εργασιών',
     'Expand/collapse tasks' => 'Ανάπτυξη/σύμπτυξη εργασιών',
@@ -758,10 +752,6 @@ return array(
     'Only for tasks assigned to me' => 'Μόνο σε εργασίες που μου έχουν ανατεθεί',
     'Only for tasks created by me' => 'Μόνο σε εργασίες που έχουν δημιουργηθεί από εμένα',
     'Only for tasks created by me and assigned to me' => 'Μόνο σε εργασίες που έχουν δημιουργηθεί από εμένα και μου έχουν ανατεθεί',
-    '%A' => '%A',
-    '%b %e, %Y, %k:%M %p' => '%d/%m/%Y %H:%M',
-    'New due date: %B %e, %Y' => 'Νέα ημέρα καθηκόντων : %d/%m/%Y',
-    'Start date changed: %B %e, %Y' => 'Ημέρα εκκίνησης άλλαξε : %d/%m/%Y',
     '%%Y-%%m-%%d' => '%%d/%%m/%%Y',
     'Total for all columns' => 'Σύνολο για όλες τις στήλες',
     'You need at least 2 days of data to show the chart.' => 'Έχετε τουλάχιστον 2 ημέρες δεδομένων για να εμφανιστούν στο διάγραμμα.',
@@ -786,7 +776,6 @@ return array(
     'Not assigned' => 'Δεν έχουν εκχωρηθεί',
     'View advanced search syntax' => 'Δείτε τη σύνταξη "αναζήτησης για προχωρημένους"',
     'Overview' => 'Επισκόπηση',
-    '%b %e %Y' => '%b %e %Y',
     'Board/Calendar/List view' => 'Πίνακας / Ημερολόγιο / Προβολή λίστας',
     'Switch to the board view' => 'Εναλλαγή στην προβολή του πίνακα',
     'Switch to the calendar view' => 'Εναλλαγή στην προβολή ημερολογίου',
@@ -876,8 +865,6 @@ return array(
     'End date:' => 'Ημερομηνία λήξης :',
     'There is no start date or end date for this project.' => 'Δεν υπάρχει ημερομηνία έναρξης ή λήξης για το έργο αυτό.',
     'Projects Gantt chart' => 'Διάγραμμα Gantt έργων',
-    'Start date: %s' => 'Ημερομηνία αρχής : %s',
-    'End date: %s' => 'Ημερομηνία τέλους : %s',
     'Link type' => 'Τύπος συνδέσμου',
     'Change task color when using a specific task link' => 'Αλλαγή χρώματος εργασίας χρησιμοποιώντας συγκεκριμένο σύνδεσμο εργασίας',
     'Task link creation or modification' => 'Σύνδεσμος δημιουργίας ή τροποποίησης εργασίας',
@@ -1125,4 +1112,10 @@ return array(
     // 'Moved:' => '',
     // 'Task #%d' => '',
     // 'Sub-tasks' => '',
+    // 'Date and time format' => '',
+    // 'Time format' => '',
+    // 'Start date: ' => '',
+    // 'End date: ' => '',
+    // 'New due date: ' => '',
+    // 'Start date changed: ' => '',
 );
diff --git a/app/Locale/es_ES/translations.php b/app/Locale/es_ES/translations.php
index e2bdd0da..9c7c6e41 100644
--- a/app/Locale/es_ES/translations.php
+++ b/app/Locale/es_ES/translations.php
@@ -102,7 +102,6 @@ return array(
     'Open a task' => 'Abrir una tarea',
     'Do you really want to open this task: "%s"?' => '¿Realmente desea abrir esta tarea: « %s » ?',
     'Back to the board' => 'Volver al tablero',
-    'Created on %B %e, %Y at %k:%M %p' => 'Creado el %e de %B de %Y a las %k:%M %p',
     'There is nobody assigned' => 'No hay nadie asignado a esta tarea',
     'Column on the board:' => 'Columna en el tablero: ',
     'Close this task' => 'Cerrar esta tarea',
@@ -156,7 +155,6 @@ return array(
     'Work in progress' => 'En curso',
     'Done' => 'Hecho',
     'Application version:' => 'Versión de la aplicación:',
-    '%B %e, %Y at %k:%M %p' => '%e de %B de %Y a las %k:%M %p',
     'Id' => 'Identificador',
     '%d closed tasks' => '%d tareas completadas',
     'No task for this project' => 'Ninguna tarea para este proyecto',
@@ -180,8 +178,6 @@ return array(
     'Edit this task' => 'Editar esta tarea',
     'Due Date' => 'Fecha límite',
     'Invalid date' => 'Fecha no válida',
-    'Must be done before %B %e, %Y' => 'Debe de estar hecho antes del %e de %B de %Y',
-    '%B %e, %Y' => '%e de %B de %Y',
     'Automatic actions' => 'Acciones automatizadas',
     'Your automatic action have been created successfully.' => 'La acción automatizada ha sido creada correctamente.',
     'Unable to create your automatic action.' => 'No se puede crear esta acción automatizada.',
@@ -317,7 +313,6 @@ return array(
     'Unable to upload the file.' => 'No pude cargar el fichero.',
     'Display another project' => 'Mostrar otro proyecto',
     'Created by %s' => 'Creado por %s',
-    'Last modified on %B %e, %Y at %k:%M %p' => 'Última modificación %e de %B de %Y a las %k:%M %p',
     'Tasks Export' => 'Exportar tareas',
     'Tasks exportation for "%s"' => 'Exportación de tareas para "%s"',
     'Start Date' => 'Fecha de inicio',
@@ -589,7 +584,6 @@ return array(
     'This task' => 'Esta tarea',
     '<1h' => '<1h',
     '%dh' => '%dh',
-    '%b %e' => '%e de %b',
     'Expand tasks' => 'Espande tareas',
     'Collapse tasks' => 'Colapsa tareas',
     'Expand/collapse tasks' => 'Expande/colapasa tareas',
@@ -758,10 +752,6 @@ return array(
     'Only for tasks assigned to me' => 'Sólo para las tareas que me han sido asignadas',
     'Only for tasks created by me' => 'Sólo para las taread creadas por mí',
     'Only for tasks created by me and assigned to me' => 'Sólo para las tareas credas por mí y que me han sido asignadas',
-    '%A' => '%A',
-    '%b %e, %Y, %k:%M %p' => '%e de %B de %Y a las %k:%M %p',
-    'New due date: %B %e, %Y' => 'Nueva fecha de entrega: %B %e, %Y',
-    'Start date changed: %B %e, %Y' => 'Cambiadad fecha de inicio: %B %e, %Y',
     '%%Y-%%m-%%d' => '%%d/%%M/%%Y',
     'Total for all columns' => 'Total para todas las columnas',
     'You need at least 2 days of data to show the chart.' => 'Necesitas al menos 2 días de datos para mostrar el gráfico.',
@@ -786,7 +776,6 @@ return array(
     'Not assigned' => 'No asignada',
     'View advanced search syntax' => 'Ver sintáxis avanzada de búsqueda',
     'Overview' => 'Resumen',
-    '%b %e %Y' => '%e de %B de %Y',
     'Board/Calendar/List view' => 'Vista de Tablero/Calendario/Lista',
     'Switch to the board view' => 'Cambiar a vista de tablero',
     'Switch to the calendar view' => 'Cambiar a vista de calendario',
@@ -876,8 +865,6 @@ return array(
     'End date:' => 'Fecha final',
     'There is no start date or end date for this project.' => 'No existe fecha de inicio o de fin para este proyecto.',
     'Projects Gantt chart' => 'Diagramas de Gantt de los proyectos',
-    'Start date: %s' => 'Fecha inicial: %s',
-    'End date: %s' => 'Fecha final: %s',
     'Link type' => 'Tipo de enlace',
     'Change task color when using a specific task link' => 'Cambiar colo de la tarea al usar un enlace específico a tarea',
     'Task link creation or modification' => 'Creación o modificación de enlace a tarea',
@@ -1125,4 +1112,10 @@ return array(
     // 'Moved:' => '',
     // 'Task #%d' => '',
     // 'Sub-tasks' => '',
+    // 'Date and time format' => '',
+    // 'Time format' => '',
+    // 'Start date: ' => '',
+    // 'End date: ' => '',
+    // 'New due date: ' => '',
+    // 'Start date changed: ' => '',
 );
diff --git a/app/Locale/fi_FI/translations.php b/app/Locale/fi_FI/translations.php
index f8b846bb..d50765b6 100644
--- a/app/Locale/fi_FI/translations.php
+++ b/app/Locale/fi_FI/translations.php
@@ -102,7 +102,6 @@ return array(
     'Open a task' => 'Avaa tehtävä',
     'Do you really want to open this task: "%s"?' => 'Haluatko varmasti avata tehtävän: "%s"?',
     'Back to the board' => 'Takaisin tauluun',
-    'Created on %B %e, %Y at %k:%M %p' => 'Luotu %d.%m.%Y kello %H:%M',
     'There is nobody assigned' => 'Ei suorittajaa',
     'Column on the board:' => 'Sarake taululla: ',
     'Close this task' => 'Sulje tämä tehtävä',
@@ -156,7 +155,6 @@ return array(
     'Work in progress' => 'Työnalla',
     'Done' => 'Tehty',
     'Application version:' => 'Ohjelman versio:',
-    '%B %e, %Y at %k:%M %p' => '%d.%m.%Y kello %H:%M',
     'Id' => 'Id',
     '%d closed tasks' => '%d suljettua tehtävää',
     'No task for this project' => 'Ei tehtävää tälle projektille',
@@ -180,8 +178,6 @@ return array(
     'Edit this task' => 'Muokkaa tehtävää',
     'Due Date' => 'Deadline',
     'Invalid date' => 'Virheellinen päiväys',
-    'Must be done before %B %e, %Y' => 'Täytyy suorittaa ennen %d.%m.%Y',
-    '%B %e, %Y' => '%d.%m.%Y',
     'Automatic actions' => 'Automaattiset toiminnot',
     'Your automatic action have been created successfully.' => 'Toiminto suoritettiin onnistuneesti.',
     'Unable to create your automatic action.' => 'Automaattisen toiminnon luominen epäonnistui.',
@@ -317,7 +313,6 @@ return array(
     'Unable to upload the file.' => 'Tiedoston lataus epäonnistui.',
     'Display another project' => 'Näytä toinen projekti',
     'Created by %s' => 'Luonut: %s',
-    'Last modified on %B %e, %Y at %k:%M %p' => 'Viimeksi muokattu %B %e, %Y kello %H:%M',
     'Tasks Export' => 'Tehtävien vienti',
     'Tasks exportation for "%s"' => 'Tehtävien vienti projektilta "%s"',
     'Start Date' => 'Aloituspäivä',
@@ -589,7 +584,6 @@ return array(
     // 'This task' => '',
     // '<1h' => '',
     // '%dh' => '',
-    // '%b %e' => '',
     // 'Expand tasks' => '',
     // 'Collapse tasks' => '',
     // 'Expand/collapse tasks' => '',
@@ -758,10 +752,6 @@ return array(
     // 'Only for tasks assigned to me' => '',
     // 'Only for tasks created by me' => '',
     // 'Only for tasks created by me and assigned to me' => '',
-    // '%A' => '',
-    // '%b %e, %Y, %k:%M %p' => '',
-    // 'New due date: %B %e, %Y' => '',
-    // 'Start date changed: %B %e, %Y' => '',
     // '%%Y-%%m-%%d' => '',
     // 'Total for all columns' => '',
     // 'You need at least 2 days of data to show the chart.' => '',
@@ -786,7 +776,6 @@ return array(
     // 'Not assigned' => '',
     // 'View advanced search syntax' => '',
     // 'Overview' => '',
-    // '%b %e %Y' => '',
     // 'Board/Calendar/List view' => '',
     // 'Switch to the board view' => '',
     // 'Switch to the calendar view' => '',
@@ -876,8 +865,6 @@ return array(
     // 'End date:' => '',
     // 'There is no start date or end date for this project.' => '',
     // 'Projects Gantt chart' => '',
-    // 'Start date: %s' => '',
-    // 'End date: %s' => '',
     // 'Link type' => '',
     // 'Change task color when using a specific task link' => '',
     // 'Task link creation or modification' => '',
@@ -1125,4 +1112,10 @@ return array(
     // 'Moved:' => '',
     // 'Task #%d' => '',
     // 'Sub-tasks' => '',
+    // 'Date and time format' => '',
+    // 'Time format' => '',
+    // 'Start date: ' => '',
+    // 'End date: ' => '',
+    // 'New due date: ' => '',
+    // 'Start date changed: ' => '',
 );
diff --git a/app/Locale/fr_FR/translations.php b/app/Locale/fr_FR/translations.php
index 1beef993..90d6dc3d 100644
--- a/app/Locale/fr_FR/translations.php
+++ b/app/Locale/fr_FR/translations.php
@@ -102,7 +102,6 @@ return array(
     'Open a task' => 'Ouvrir une tâche',
     'Do you really want to open this task: "%s"?' => 'Voulez-vous vraiment ouvrir cette tâche : « %s » ?',
     'Back to the board' => 'Retour au tableau',
-    'Created on %B %e, %Y at %k:%M %p' => 'Créé le %d/%m/%Y à %H:%M',
     'There is nobody assigned' => 'Il n\'y a personne d\'assigné à cette tâche',
     'Column on the board:' => 'Colonne sur le tableau : ',
     'Close this task' => 'Fermer cette tâche',
@@ -156,7 +155,6 @@ return array(
     'Work in progress' => 'En cours',
     'Done' => 'Terminé',
     'Application version:' => 'Version de l\'application :',
-    '%B %e, %Y at %k:%M %p' => '%d/%m/%Y à %H:%M',
     'Id' => 'Id.',
     '%d closed tasks' => '%d tâches terminées',
     'No task for this project' => 'Aucune tâche pour ce projet',
@@ -180,8 +178,6 @@ return array(
     'Edit this task' => 'Modifier cette tâche',
     'Due Date' => 'Date d\'échéance',
     'Invalid date' => 'Date invalide',
-    'Must be done before %B %e, %Y' => 'Doit être fait avant le %d/%m/%Y',
-    '%B %e, %Y' => '%d %B %Y',
     'Automatic actions' => 'Actions automatisées',
     'Your automatic action have been created successfully.' => 'Votre action automatisée a été ajoutée avec succès.',
     'Unable to create your automatic action.' => 'Impossible de créer votre action automatisée.',
@@ -317,7 +313,6 @@ return array(
     'Unable to upload the file.' => 'Impossible de transférer le fichier.',
     'Display another project' => 'Afficher un autre projet',
     'Created by %s' => 'Créé par %s',
-    'Last modified on %B %e, %Y at %k:%M %p' => 'Modifié le %d/%m/%Y à %H:%M',
     'Tasks Export' => 'Exportation des tâches',
     'Tasks exportation for "%s"' => 'Exportation des tâches pour « %s »',
     'Start Date' => 'Date de début',
@@ -591,7 +586,6 @@ return array(
     'This task' => 'Cette tâche',
     '<1h' => '<1h',
     '%dh' => '%dh',
-    '%b %e' => '%e %b',
     'Expand tasks' => 'Déplier les tâches',
     'Collapse tasks' => 'Replier les tâches',
     'Expand/collapse tasks' => 'Plier/déplier les tâches',
@@ -760,10 +754,6 @@ return array(
     'Only for tasks assigned to me' => 'Seulement les tâches qui me sont assignées',
     'Only for tasks created by me' => 'Seulement les tâches que j\'ai créées',
     'Only for tasks created by me and assigned to me' => 'Seulement les tâches créées par moi-même et celles qui me sont assignées',
-    '%A' => '%A',
-    '%b %e, %Y, %k:%M %p' => '%d/%m/%Y %H:%M',
-    'New due date: %B %e, %Y' => 'Nouvelle date d\'échéance : %d/%m/%Y',
-    'Start date changed: %B %e, %Y' => 'Date de début modifiée : %d/%m/%Y',
     '%%Y-%%m-%%d' => '%%d/%%m/%%Y',
     'Total for all columns' => 'Total pour toutes les colonnes',
     'You need at least 2 days of data to show the chart.' => 'Vous avez besoin d\'au minimum 2 jours de données pour afficher le graphique.',
@@ -788,7 +778,6 @@ return array(
     'Not assigned' => 'Non assignées',
     'View advanced search syntax' => 'Voir la syntaxe pour la recherche avancée',
     'Overview' => 'Vue d\'ensemble',
-    '%b %e %Y' => '%b %e %Y',
     'Board/Calendar/List view' => 'Vue Tableau/Calendrier/Liste',
     'Switch to the board view' => 'Basculer vers le tableau',
     'Switch to the calendar view' => 'Basculer vers le calendrier',
@@ -878,8 +867,6 @@ return array(
     'End date:' => 'Date de fin :',
     'There is no start date or end date for this project.' => 'Il n\'y a pas de date de début ou de date de fin pour ce projet.',
     'Projects Gantt chart' => 'Diagramme de Gantt des projets',
-    'Start date: %s' => 'Date de début : %s',
-    'End date: %s' => 'Date de fin : %s',
     'Link type' => 'Type de lien',
     'Change task color when using a specific task link' => 'Changer la couleur de la tâche lorsqu\'un lien spécifique est utilisé',
     'Task link creation or modification' => 'Création ou modification d\'un lien sur une tâche',
@@ -1128,4 +1115,10 @@ return array(
     'Moved:' => 'Déplacé le : ',
     'Task #%d' => 'Tâche n°%d',
     'Sub-tasks' => 'Sous-tâches',
+    'Date and time format' => 'Format de la date et de l\'heure',
+    'Time format' => 'Format de l\'heure',
+    'Start date: ' => 'Date de début : ',
+    'End date: ' => 'Date de fin : ',
+    'New due date: ' => 'Nouvelle date d\'échéance : ',
+    'Start date changed: ' => 'Date de début modifiée : ',
 );
diff --git a/app/Locale/hu_HU/translations.php b/app/Locale/hu_HU/translations.php
index f9113270..447dafc9 100644
--- a/app/Locale/hu_HU/translations.php
+++ b/app/Locale/hu_HU/translations.php
@@ -102,7 +102,6 @@ return array(
     'Open a task' => 'Feladat felnyitás',
     'Do you really want to open this task: "%s"?' => 'Tényleg meg akarja nyitni ezt a feladatot: "%s"?',
     'Back to the board' => 'Vissza a táblához',
-    'Created on %B %e, %Y at %k:%M %p' => 'Létrehozva: %Y. %m. %d. %H:%M',
     'There is nobody assigned' => 'Nincs felelős',
     'Column on the board:' => 'Tábla oszlopa: ',
     'Close this task' => 'Feladat lezárása',
@@ -156,7 +155,6 @@ return array(
     'Work in progress' => 'Folyamatban',
     'Done' => 'Kész',
     'Application version:' => 'Alkalmazás verzió:',
-    '%B %e, %Y at %k:%M %p' => '%Y. %m. %d. %H:%M',
     'Id' => 'ID',
     '%d closed tasks' => '%d lezárt feladat',
     'No task for this project' => 'Nincs feladat ebben a projektben',
@@ -180,8 +178,6 @@ return array(
     'Edit this task' => 'Feladat módosítása',
     'Due Date' => 'Határidő',
     'Invalid date' => 'Érvénytelen dátum',
-    'Must be done before %B %e, %Y' => 'Kész kell lennie %Y. %m. %d. előtt',
-    '%B %e, %Y' => '%Y. %m. %d.',
     'Automatic actions' => 'Automatikus intézkedések',
     'Your automatic action have been created successfully.' => 'Az automatikus intézkedés sikeresen elkészült.',
     'Unable to create your automatic action.' => 'Automatikus intézkedés létrehozása nem lehetséges.',
@@ -317,7 +313,6 @@ return array(
     'Unable to upload the file.' => 'Fájl feltöltése nem lehetséges.',
     'Display another project' => 'Másik projekt megjelenítése',
     'Created by %s' => 'Készítette: %s',
-    'Last modified on %B %e, %Y at %k:%M %p' => 'Utolsó módosítás: %Y. %m. %d. %H:%M',
     'Tasks Export' => 'Feladatok exportálása',
     'Tasks exportation for "%s"' => 'Feladatok exportálása: "%s"',
     'Start Date' => 'Kezdés dátuma',
@@ -589,7 +584,6 @@ return array(
     'This task' => 'Ez a feladat',
     '<1h' => '<1ó',
     '%dh' => '%dó',
-    '%b %e' => '%b %e',
     'Expand tasks' => 'Feladatok lenyitása',
     'Collapse tasks' => 'Feladatok összecsukása',
     'Expand/collapse tasks' => 'Feladatok lenyitása/összecsukása',
@@ -758,10 +752,6 @@ return array(
     // 'Only for tasks assigned to me' => '',
     // 'Only for tasks created by me' => '',
     // 'Only for tasks created by me and assigned to me' => '',
-    // '%A' => '',
-    // '%b %e, %Y, %k:%M %p' => '',
-    // 'New due date: %B %e, %Y' => '',
-    // 'Start date changed: %B %e, %Y' => '',
     // '%%Y-%%m-%%d' => '',
     // 'Total for all columns' => '',
     // 'You need at least 2 days of data to show the chart.' => '',
@@ -786,7 +776,6 @@ return array(
     // 'Not assigned' => '',
     // 'View advanced search syntax' => '',
     // 'Overview' => '',
-    // '%b %e %Y' => '',
     // 'Board/Calendar/List view' => '',
     // 'Switch to the board view' => '',
     // 'Switch to the calendar view' => '',
@@ -876,8 +865,6 @@ return array(
     // 'End date:' => '',
     // 'There is no start date or end date for this project.' => '',
     // 'Projects Gantt chart' => '',
-    // 'Start date: %s' => '',
-    // 'End date: %s' => '',
     // 'Link type' => '',
     // 'Change task color when using a specific task link' => '',
     // 'Task link creation or modification' => '',
@@ -1125,4 +1112,10 @@ return array(
     // 'Moved:' => '',
     // 'Task #%d' => '',
     // 'Sub-tasks' => '',
+    // 'Date and time format' => '',
+    // 'Time format' => '',
+    // 'Start date: ' => '',
+    // 'End date: ' => '',
+    // 'New due date: ' => '',
+    // 'Start date changed: ' => '',
 );
diff --git a/app/Locale/id_ID/translations.php b/app/Locale/id_ID/translations.php
index 0bbdd686..8c6db849 100644
--- a/app/Locale/id_ID/translations.php
+++ b/app/Locale/id_ID/translations.php
@@ -102,7 +102,6 @@ return array(
     'Open a task' => 'Buka tugas',
     'Do you really want to open this task: "%s"?' => 'Apakah anda yakin akan membuka tugas ini : « %s » ?',
     'Back to the board' => 'Kembali ke papan',
-    'Created on %B %e, %Y at %k:%M %p' => 'Dibuat pada tanggal %d/%m/%Y à %H:%M',
     'There is nobody assigned' => 'Tidak ada orang yand ditugaskan',
     'Column on the board:' => 'Kolom di dalam papan : ',
     'Close this task' => 'Tutup tugas ini',
@@ -156,7 +155,6 @@ return array(
     'Work in progress' => 'Sedang dalam pengerjaan',
     'Done' => 'Selesai',
     'Application version:' => 'Versi aplikasi :',
-    '%B %e, %Y at %k:%M %p' => '%d/%m/%Y à %H:%M',
     'Id' => 'Id.',
     '%d closed tasks' => '%d tugas yang ditutup',
     'No task for this project' => 'Tidak ada tugas dalam proyek ini',
@@ -180,8 +178,6 @@ return array(
     'Edit this task' => 'Modifikasi tugas ini',
     'Due Date' => 'Batas Tanggal Terakhir',
     'Invalid date' => 'Tanggal tidak valid',
-    'Must be done before %B %e, %Y' => 'Harus diselesaikan sebelum tanggal %d/%m/%Y',
-    '%B %e, %Y' => '%d %B %Y',
     'Automatic actions' => 'Tindakan otomatis',
     'Your automatic action have been created successfully.' => 'Tindakan otomatis anda berhasil dibuat.',
     'Unable to create your automatic action.' => 'Tidak dapat membuat tindakan otomatis anda.',
@@ -317,7 +313,6 @@ return array(
     'Unable to upload the file.' => 'Tidak dapat mengunggah berkas.',
     'Display another project' => 'Lihat proyek lain',
     'Created by %s' => 'Dibuat oleh %s',
-    'Last modified on %B %e, %Y at %k:%M %p' => 'Modifikasi terakhir pada tanggal %d/%m/%Y à %H:%M',
     'Tasks Export' => 'Ekspor Tugas',
     'Tasks exportation for "%s"' => 'Tugas di ekspor untuk « %s »',
     'Start Date' => 'Tanggal Mulai',
@@ -589,7 +584,6 @@ return array(
     'This task' => 'Tugas ini',
     '<1h' => '<1h',
     '%dh' => '%dh',
-    '%b %e' => '%e %b',
     'Expand tasks' => 'Perluas tugas',
     'Collapse tasks' => 'Lipat tugas',
     'Expand/collapse tasks' => 'Perluas/lipat tugas',
@@ -758,10 +752,6 @@ return array(
     'Only for tasks assigned to me' => 'Hanya untuk tugas yang ditugaskan ke saya',
     'Only for tasks created by me' => 'Hanya untuk tugas yang dibuat oleh saya',
     'Only for tasks created by me and assigned to me' => 'Hanya untuk tugas yang dibuat oleh saya dan ditugaskan ke saya',
-    '%A' => '%A',
-    '%b %e, %Y, %k:%M %p' => '%d/%m/%Y %H:%M',
-    'New due date: %B %e, %Y' => 'Tanggal jatuh tempo baru : %d/%m/%Y',
-    'Start date changed: %B %e, %Y' => 'Tanggal mulai berubah : %d/%m/%Y',
     '%%Y-%%m-%%d' => '%%d/%%m/%%Y',
     'Total for all columns' => 'Total untuk semua kolom',
     'You need at least 2 days of data to show the chart.' => 'Anda memerlukan setidaknya 2 hari dari data yang menunjukkan grafik.',
@@ -786,7 +776,6 @@ return array(
     'Not assigned' => 'Tidak ditugaskan',
     'View advanced search syntax' => 'Lihat sintaks pencarian lanjutan',
     'Overview' => 'Ikhtisar',
-    '%b %e %Y' => '%b %e %Y',
     'Board/Calendar/List view' => 'Tampilan Papan/Kalender/Daftar',
     'Switch to the board view' => 'Beralih ke tampilan papan',
     'Switch to the calendar view' => 'Beralih ke tampilan kalender',
@@ -876,8 +865,6 @@ return array(
     'End date:' => 'Waktu berakhir :',
     'There is no start date or end date for this project.' => 'Tidak ada waktu mulai atau waktu berakhir untuk proyek ini',
     'Projects Gantt chart' => 'Proyek grafik Gantt',
-    'Start date: %s' => 'Waktu mulai : %s',
-    'End date: %s' => 'Waktu berakhir : %s',
     'Link type' => 'Tipe tautan',
     'Change task color when using a specific task link' => 'Rubah warna tugas ketika menggunakan tautan tugas yang spesifik',
     'Task link creation or modification' => 'Tautan pembuatan atau modifikasi tugas ',
@@ -1125,4 +1112,10 @@ return array(
     // 'Moved:' => '',
     // 'Task #%d' => '',
     // 'Sub-tasks' => '',
+    // 'Date and time format' => '',
+    // 'Time format' => '',
+    // 'Start date: ' => '',
+    // 'End date: ' => '',
+    // 'New due date: ' => '',
+    // 'Start date changed: ' => '',
 );
diff --git a/app/Locale/it_IT/translations.php b/app/Locale/it_IT/translations.php
index 3957319e..661e6c86 100644
--- a/app/Locale/it_IT/translations.php
+++ b/app/Locale/it_IT/translations.php
@@ -102,7 +102,6 @@ return array(
     'Open a task' => 'Apri un task',
     'Do you really want to open this task: "%s"?' => 'Veramente desideri aprire questo task: "%s" ?',
     'Back to the board' => 'Torna alla bacheca',
-    'Created on %B %e, %Y at %k:%M %p' => 'Creato il %B %e, %Y alle %k:%M %p',
     'There is nobody assigned' => 'Nessuno è assegnato a questo task',
     'Column on the board:' => 'Colonna sulla bacheca: ',
     'Close this task' => 'Chiudi questo task',
@@ -156,7 +155,6 @@ return array(
     'Work in progress' => 'In corso',
     'Done' => 'Fatto',
     'Application version:' => 'Versione dell\'applicazione:',
-    // '%B %e, %Y at %k:%M %p' => '',
     // 'Id' => '',
     '%d closed tasks' => '%d task chiusi',
     'No task for this project' => 'Nessun task per questo progetto',
@@ -180,8 +178,6 @@ return array(
     'Edit this task' => 'Modifica questo task',
     'Due Date' => 'Data di scadenza',
     'Invalid date' => 'Data non valida',
-    'Must be done before %B %e, %Y' => 'Deve essere completato prima del %B %e, %Y',
-    // '%B %e, %Y' => '',
     'Automatic actions' => 'Azioni automatiche',
     'Your automatic action have been created successfully.' => 'l\'azione automatica è stata creata correttamente.',
     'Unable to create your automatic action.' => 'Impossibile creare quest\'azione automatica.',
@@ -317,7 +313,6 @@ return array(
     'Unable to upload the file.' => 'Impossibile caricare il file.',
     'Display another project' => 'Mostra un altro progetto',
     'Created by %s' => 'Creato da %s',
-    'Last modified on %B %e, %Y at %k:%M %p' => 'Ultima modifica il %d/%m/%Y alle %H:%M',
     'Tasks Export' => 'Export dei task',
     'Tasks exportation for "%s"' => 'Export dei task per "%s"',
     'Start Date' => 'Data d\'inizio',
@@ -589,7 +584,6 @@ return array(
     'This task' => 'Questo task',
     // '<1h' => '',
     // '%dh' => '',
-    // '%b %e' => '',
     'Expand tasks' => 'Espandi i task',
     'Collapse tasks' => 'Minimizza i task',
     'Expand/collapse tasks' => 'Espandi/minimizza i task',
@@ -758,10 +752,6 @@ return array(
     'Only for tasks assigned to me' => 'Solo per i task assegnati a me',
     'Only for tasks created by me' => 'Solo per i task creati da me',
     'Only for tasks created by me and assigned to me' => 'Solo per i task creati da me e assegnati a me',
-    // '%A' => '',
-    // '%b %e, %Y, %k:%M %p' => '',
-    'New due date: %B %e, %Y' => 'Nuova data di scadenza: %B %e, %Y',
-    'Start date changed: %B %e, %Y' => 'Data di inizio cambiata: %B %e, %Y',
     // '%%Y-%%m-%%d' => '',
     'Total for all columns' => 'Totale per tutte le colonne',
     'You need at least 2 days of data to show the chart.' => 'Hai bisogno di almeno 2 giorni di dati per mostrare il grafico.',
@@ -786,7 +776,6 @@ return array(
     'Not assigned' => 'Non assegnato',
     'View advanced search syntax' => 'Visualizza la sintassi di ricerca avanzata',
     'Overview' => 'Panoramica',
-    // '%b %e %Y' => '',
     // 'Board/Calendar/List view' => '',
     'Switch to the board view' => 'Passa alla vista "bacheca"',
     'Switch to the calendar view' => 'Passa alla vista "calendario"',
@@ -876,8 +865,6 @@ return array(
     'End date:' => 'Data di fine:',
     'There is no start date or end date for this project.' => 'Non è prevista una data di inzio o fine per questo progetto.',
     'Projects Gantt chart' => 'Grafico Gantt dei progetti',
-    'Start date: %s' => 'Data di inizio: %s',
-    'End date: %s' => 'Data di fine: %s',
     'Link type' => 'Tipo di link',
     'Change task color when using a specific task link' => 'Cambia colore del task quando si un utilizza una determinata relazione di task',
     'Task link creation or modification' => 'Creazione o modifica di relazione di task',
@@ -1125,4 +1112,10 @@ return array(
     // 'Moved:' => '',
     // 'Task #%d' => '',
     // 'Sub-tasks' => '',
+    // 'Date and time format' => '',
+    // 'Time format' => '',
+    // 'Start date: ' => '',
+    // 'End date: ' => '',
+    // 'New due date: ' => '',
+    // 'Start date changed: ' => '',
 );
diff --git a/app/Locale/ja_JP/translations.php b/app/Locale/ja_JP/translations.php
index 4ecf039b..3609836b 100644
--- a/app/Locale/ja_JP/translations.php
+++ b/app/Locale/ja_JP/translations.php
@@ -102,7 +102,6 @@ return array(
     'Open a task' => 'タスクをオープンする',
     'Do you really want to open this task: "%s"?' => 'タスク「%s」をオープンしますか？',
     'Back to the board' => 'ボードに戻る',
-    'Created on %B %e, %Y at %k:%M %p' => '%Y/%m/%d %H:%M に作成',
     'There is nobody assigned' => '担当者がいません',
     'Column on the board:' => 'カラム: ',
     'Close this task' => 'タスクをクローズする',
@@ -156,7 +155,6 @@ return array(
     'Work in progress' => 'Work in progress',
     'Done' => 'Done',
     'Application version:' => 'アプリケーションのバージョン:',
-    '%B %e, %Y at %k:%M %p' => '%Y/%m/%d %H:%M',
     'Id' => 'ID',
     '%d closed tasks' => '%d 個のクローズしたタスク',
     'No task for this project' => 'このプロジェクトにタスクがありません',
@@ -180,8 +178,6 @@ return array(
     'Edit this task' => 'タスクを変更する',
     'Due Date' => '期限',
     'Invalid date' => '日付が無効です',
-    'Must be done before %B %e, %Y' => '%Y/%m/%d までに完了',
-    '%B %e, %Y' => '%Y %B %e',
     'Automatic actions' => '自動アクションを管理する',
     'Your automatic action have been created successfully.' => '自動アクションを作成しました。',
     'Unable to create your automatic action.' => '自動アクションの作成に失敗しました。',
@@ -317,7 +313,6 @@ return array(
     'Unable to upload the file.' => 'ファイルのアップロードに失敗しました。',
     'Display another project' => '別のプロジェクトを表示',
     'Created by %s' => '%s が作成',
-    'Last modified on %B %e, %Y at %k:%M %p' => ' %Y/%m/%d %H:%M に変更',
     'Tasks Export' => 'タスクの出力',
     'Tasks exportation for "%s"' => '「%s」のタスク出力',
     'Start Date' => '開始日',
@@ -589,7 +584,6 @@ return array(
     'This task' => 'このタスクは',
     '<1h' => '<１時間',
     '%dh' => '%d 時間',
-    '%b %e' => '%b/%e',
     'Expand tasks' => 'タスクを展開する',
     'Collapse tasks' => 'タスクを閉じる',
     'Expand/collapse tasks' => 'タスクの展開／閉じる',
@@ -758,10 +752,6 @@ return array(
     // 'Only for tasks assigned to me' => '',
     // 'Only for tasks created by me' => '',
     // 'Only for tasks created by me and assigned to me' => '',
-    // '%A' => '',
-    // '%b %e, %Y, %k:%M %p' => '',
-    // 'New due date: %B %e, %Y' => '',
-    // 'Start date changed: %B %e, %Y' => '',
     // '%%Y-%%m-%%d' => '',
     // 'Total for all columns' => '',
     // 'You need at least 2 days of data to show the chart.' => '',
@@ -786,7 +776,6 @@ return array(
     // 'Not assigned' => '',
     // 'View advanced search syntax' => '',
     // 'Overview' => '',
-    // '%b %e %Y' => '',
     // 'Board/Calendar/List view' => '',
     // 'Switch to the board view' => '',
     // 'Switch to the calendar view' => '',
@@ -876,8 +865,6 @@ return array(
     // 'End date:' => '',
     // 'There is no start date or end date for this project.' => '',
     // 'Projects Gantt chart' => '',
-    // 'Start date: %s' => '',
-    // 'End date: %s' => '',
     // 'Link type' => '',
     // 'Change task color when using a specific task link' => '',
     // 'Task link creation or modification' => '',
@@ -1125,4 +1112,10 @@ return array(
     // 'Moved:' => '',
     // 'Task #%d' => '',
     // 'Sub-tasks' => '',
+    // 'Date and time format' => '',
+    // 'Time format' => '',
+    // 'Start date: ' => '',
+    // 'End date: ' => '',
+    // 'New due date: ' => '',
+    // 'Start date changed: ' => '',
 );
diff --git a/app/Locale/my_MY/translations.php b/app/Locale/my_MY/translations.php
index 36b15495..5b1da7cd 100644
--- a/app/Locale/my_MY/translations.php
+++ b/app/Locale/my_MY/translations.php
@@ -102,7 +102,6 @@ return array(
     'Open a task' => 'Buka tugas',
     'Do you really want to open this task: "%s"?' => 'Anda yakin untuk buka tugas ini : « %s » ?',
     'Back to the board' => 'Kembali ke papan',
-    'Created on %B %e, %Y at %k:%M %p' => 'Dicipta pada tanggal %d/%m/%Y à %H:%M',
     'There is nobody assigned' => 'Tidak ada orang yand ditugaskan',
     'Column on the board:' => 'Kolom di dalam papan : ',
     'Close this task' => 'Tutup tugas ini',
@@ -156,7 +155,6 @@ return array(
     'Work in progress' => 'Sedang dalam pengerjaan',
     'Done' => 'Selesai',
     'Application version:' => 'Versi aplikasi :',
-    '%B %e, %Y at %k:%M %p' => '%d/%m/%Y à %H:%M',
     'Id' => 'Id.',
     '%d closed tasks' => '%d tugas yang ditutup',
     'No task for this project' => 'Tidak ada tugas dalam projek ini',
@@ -180,8 +178,6 @@ return array(
     'Edit this task' => 'Modifikasi tugas ini',
     'Due Date' => 'Batas Tanggal Terakhir',
     'Invalid date' => 'Tanggal tidak valid',
-    'Must be done before %B %e, %Y' => 'Harus diselesaikan sebelum tanggal %d/%m/%Y',
-    '%B %e, %Y' => '%d %B %Y',
     'Automatic actions' => 'Tindakan otomatis',
     'Your automatic action have been created successfully.' => 'Tindakan otomatis anda berhasil dibuat.',
     'Unable to create your automatic action.' => 'Tidak dapat membuat tindakan otomatis anda.',
@@ -317,7 +313,6 @@ return array(
     'Unable to upload the file.' => 'Tidak dapat mengunggah berkas.',
     'Display another project' => 'Lihat projek lain',
     'Created by %s' => 'Dibuat oleh %s',
-    'Last modified on %B %e, %Y at %k:%M %p' => 'Modifikasi terakhir pada tanggal %d/%m/%Y à %H:%M',
     'Tasks Export' => 'Ekspor Tugas',
     'Tasks exportation for "%s"' => 'Tugas di ekspor untuk « %s »',
     'Start Date' => 'Tanggal Mulai',
@@ -589,7 +584,6 @@ return array(
     'This task' => 'Tugas ini',
     '<1h' => '<1h',
     '%dh' => '%dh',
-    '%b %e' => '%e %b',
     'Expand tasks' => 'Perluas tugas',
     'Collapse tasks' => 'Lipat tugas',
     'Expand/collapse tasks' => 'Perluas/lipat tugas',
@@ -758,10 +752,6 @@ return array(
     'Only for tasks assigned to me' => 'Hanya untuk tugas yang ditugaskan ke saya',
     'Only for tasks created by me' => 'Hanya untuk tugas yang dibuat oleh saya',
     'Only for tasks created by me and assigned to me' => 'Hanya untuk tugas yang dibuat oleh saya dan ditugaskan ke saya',
-    '%A' => '%A',
-    '%b %e, %Y, %k:%M %p' => '%d/%m/%Y %H:%M',
-    'New due date: %B %e, %Y' => 'Tanggal jatuh tempo baru : %d/%m/%Y',
-    'Start date changed: %B %e, %Y' => 'Tanggal mulai berubah : %d/%m/%Y',
     '%%Y-%%m-%%d' => '%%d/%%m/%%Y',
     'Total for all columns' => 'Total untuk semua kolom',
     'You need at least 2 days of data to show the chart.' => 'Anda memerlukan setidaknya 2 hari dari data yang menunjukkan grafik.',
@@ -786,7 +776,6 @@ return array(
     'Not assigned' => 'Tidak ditugaskan',
     'View advanced search syntax' => 'Lihat sintaks pencarian lanjutan',
     'Overview' => 'Ikhtisar',
-    '%b %e %Y' => '%b %e %Y',
     'Board/Calendar/List view' => 'Tampilan Papan/Kalender/Daftar',
     'Switch to the board view' => 'Beralih ke tampilan papan',
     'Switch to the calendar view' => 'Beralih ke tampilan kalender',
@@ -876,8 +865,6 @@ return array(
     'End date:' => 'Waktu berakhir :',
     'There is no start date or end date for this project.' => 'Tidak ada waktu mula atau waktu berakhir pada projek ini',
     'Projects Gantt chart' => 'projekkan carta Gantt',
-    'Start date: %s' => 'Waktu mulai: %s',
-    'End date: %s' => 'Waktu berakhir: %s',
     'Link type' => 'Jenis pautan',
     'Change task color when using a specific task link' => 'Rubah warna tugas ketika menggunakan Pautan tugas yang spesifik',
     'Task link creation or modification' => 'Pautan tugas pada penciptaan atau penyuntingan',
@@ -1125,4 +1112,10 @@ return array(
     // 'Moved:' => '',
     // 'Task #%d' => '',
     // 'Sub-tasks' => '',
+    // 'Date and time format' => '',
+    // 'Time format' => '',
+    // 'Start date: ' => '',
+    // 'End date: ' => '',
+    // 'New due date: ' => '',
+    // 'Start date changed: ' => '',
 );
diff --git a/app/Locale/nb_NO/translations.php b/app/Locale/nb_NO/translations.php
index 6048107d..335c699b 100644
--- a/app/Locale/nb_NO/translations.php
+++ b/app/Locale/nb_NO/translations.php
@@ -102,7 +102,6 @@ return array(
     'Open a task' => 'Åpne en oppgave',
     'Do you really want to open this task: "%s"?' => 'Vil du åpne denne oppgaven: "%s"?',
     'Back to the board' => 'Tilbake til prosjektsiden',
-    'Created on %B %e, %Y at %k:%M %p' => 'Opprettet %d.%m.%Y - %H:%M',
     'There is nobody assigned' => 'Mangler tildeling',
     'Column on the board:' => 'Kolonne:',
     'Close this task' => 'Lukk oppgaven',
@@ -156,7 +155,6 @@ return array(
     'Work in progress' => 'Under arbeid',
     'Done' => 'Utført',
     'Application version:' => 'Versjon:',
-    '%B %e, %Y at %k:%M %p' => '%d.%m.%Y - %H:%M',
     'Id' => 'ID',
     '%d closed tasks' => '%d lukkede oppgaver',
     'No task for this project' => 'Ingen oppgaver i dette prosjektet',
@@ -180,8 +178,6 @@ return array(
     'Edit this task' => 'Rediger oppgaven',
     'Due Date' => 'Forfallsdato',
     'Invalid date' => 'Ugyldig dato',
-    'Must be done before %B %e, %Y' => 'Skal være utført innen  %d.%m.%Y',
-    '%B %e, %Y' => '%d.%m.%Y',
     'Automatic actions' => 'Automatiske handlinger',
     'Your automatic action have been created successfully.' => 'Din automatiske handling er opprettet.',
     'Unable to create your automatic action.' => 'Din automatiske handling kunne ikke opprettes.',
@@ -317,7 +313,6 @@ return array(
     'Unable to upload the file.' => 'Filen kunne ikke lastes opp.',
     'Display another project' => 'Vis annet prosjekt...',
     'Created by %s' => 'Opprettet av %s',
-    'Last modified on %B %e, %Y at %k:%M %p' => 'Sist endret %d.%m.%Y - %H:%M',
     'Tasks Export' => 'Oppgave eksport',
     'Tasks exportation for "%s"' => 'Oppgaveeksportering for "%s"',
     'Start Date' => 'Start-dato',
@@ -589,7 +584,6 @@ return array(
     'This task' => 'Denne oppgaven',
     // '<1h' => '',
     // '%dh' => '',
-    // '%b %e' => '',
     'Expand tasks' => 'Utvid oppgavevisning',
     'Collapse tasks' => 'Komprimer oppgavevisning',
     'Expand/collapse tasks' => 'Utvide/komprimere oppgavevisning',
@@ -758,10 +752,6 @@ return array(
     'Only for tasks assigned to me' => 'Kun oppgaver som er tildelt meg',
     'Only for tasks created by me' => 'Kun oppgaver som er opprettet av meg',
     'Only for tasks created by me and assigned to me' => 'Kun oppgaver som er opprettet av meg og tildelt meg',
-    // '%A' => '',
-    // '%b %e, %Y, %k:%M %p' => '',
-    // 'New due date: %B %e, %Y' => '',
-    // 'Start date changed: %B %e, %Y' => '',
     // '%%Y-%%m-%%d' => '',
     'Total for all columns' => 'Totalt for alle kolonner',
     // 'You need at least 2 days of data to show the chart.' => '',
@@ -786,7 +776,6 @@ return array(
     'Not assigned' => 'Ikke tildelt',
     'View advanced search syntax' => 'Vis hjelp for avansert søk ',
     'Overview' => 'Oversikt',
-    // '%b %e %Y' => '',
     'Board/Calendar/List view' => 'Oversikt/kalender/listevisning',
     'Switch to the board view' => 'Oversiktsvisning',
     'Switch to the calendar view' => 'Kalendevisning',
@@ -876,8 +865,6 @@ return array(
     'End date:' => 'Sluttdato:',
     // 'There is no start date or end date for this project.' => '',
     'Projects Gantt chart' => 'Gantt skjema for prosjekter',
-    'Start date: %s' => 'Startdato: %s',
-    'End date: %s' => 'Sluttdato: %s',
     'Link type' => 'Relasjonstype',
     // 'Change task color when using a specific task link' => '',
     // 'Task link creation or modification' => '',
@@ -1125,4 +1112,10 @@ return array(
     // 'Moved:' => '',
     // 'Task #%d' => '',
     // 'Sub-tasks' => '',
+    // 'Date and time format' => '',
+    // 'Time format' => '',
+    // 'Start date: ' => '',
+    // 'End date: ' => '',
+    // 'New due date: ' => '',
+    // 'Start date changed: ' => '',
 );
diff --git a/app/Locale/nl_NL/translations.php b/app/Locale/nl_NL/translations.php
index 57fcae4e..0d9d9608 100644
--- a/app/Locale/nl_NL/translations.php
+++ b/app/Locale/nl_NL/translations.php
@@ -102,7 +102,6 @@ return array(
     'Open a task' => 'Een taak openen',
     'Do you really want to open this task: "%s"?' => 'Weet u zeker dat u deze taak wil openen : « %s » ?',
     'Back to the board' => 'Terug naar het bord',
-    'Created on %B %e, %Y at %k:%M %p' => 'Aangemaakt op %d/%m/%Y à %H:%M',
     'There is nobody assigned' => 'Er is niemand toegewezen',
     'Column on the board:' => 'Kolom op het bord : ',
     'Close this task' => 'Deze taak sluiten',
@@ -156,7 +155,6 @@ return array(
     'Work in progress' => 'In behandeling',
     'Done' => 'Afgewerkt',
     'Application version:' => 'Applicatie versie :',
-    '%B %e, %Y at %k:%M %p' => '%d/%m/%Y op %H:%M',
     'Id' => 'Id',
     '%d closed tasks' => '%d gesloten taken',
     'No task for this project' => 'Geen taken voor dit project',
@@ -180,8 +178,6 @@ return array(
     'Edit this task' => 'Deze taak aanpassen',
     'Due Date' => 'Vervaldag',
     'Invalid date' => 'Ongeldige datum',
-    'Must be done before %B %e, %Y' => 'Moet voltooid zijn voor %d/%m/%Y',
-    '%B %e, %Y' => '%d %B %Y',
     'Automatic actions' => 'Geautomatiseerd acties',
     'Your automatic action have been created successfully.' => 'Geautomatiseerde actie succesvol aangemaakt.',
     'Unable to create your automatic action.' => 'Geautomatiseerde actie aanmaken niet gelukt.',
@@ -317,7 +313,6 @@ return array(
     'Unable to upload the file.' => 'Uploaden van bestand niet gelukt.',
     'Display another project' => 'Een ander project weergeven',
     'Created by %s' => 'Aangemaakt door %s',
-    'Last modified on %B %e, %Y at %k:%M %p' => 'Laatst gewijzigd op %d/%m/%Y à %H:%M',
     'Tasks Export' => 'Taken exporteren',
     'Tasks exportation for "%s"' => 'Taken exporteren voor « %s »',
     'Start Date' => 'Startdatum',
@@ -589,7 +584,6 @@ return array(
     'This task' => 'Deze taal',
     '<1h' => '<1h',
     '%dh' => '%dh',
-    '%b %e' => '%e %b',
     'Expand tasks' => 'Taken uitklappen',
     'Collapse tasks' => 'Taken inklappen',
     'Expand/collapse tasks' => 'Taken in/uiklappen',
@@ -758,10 +752,6 @@ return array(
     // 'Only for tasks assigned to me' => '',
     // 'Only for tasks created by me' => '',
     // 'Only for tasks created by me and assigned to me' => '',
-    // '%A' => '',
-    // '%b %e, %Y, %k:%M %p' => '',
-    // 'New due date: %B %e, %Y' => '',
-    // 'Start date changed: %B %e, %Y' => '',
     // '%%Y-%%m-%%d' => '',
     // 'Total for all columns' => '',
     // 'You need at least 2 days of data to show the chart.' => '',
@@ -786,7 +776,6 @@ return array(
     // 'Not assigned' => '',
     // 'View advanced search syntax' => '',
     // 'Overview' => '',
-    // '%b %e %Y' => '',
     // 'Board/Calendar/List view' => '',
     // 'Switch to the board view' => '',
     // 'Switch to the calendar view' => '',
@@ -876,8 +865,6 @@ return array(
     // 'End date:' => '',
     // 'There is no start date or end date for this project.' => '',
     // 'Projects Gantt chart' => '',
-    // 'Start date: %s' => '',
-    // 'End date: %s' => '',
     // 'Link type' => '',
     // 'Change task color when using a specific task link' => '',
     // 'Task link creation or modification' => '',
@@ -1125,4 +1112,10 @@ return array(
     // 'Moved:' => '',
     // 'Task #%d' => '',
     // 'Sub-tasks' => '',
+    // 'Date and time format' => '',
+    // 'Time format' => '',
+    // 'Start date: ' => '',
+    // 'End date: ' => '',
+    // 'New due date: ' => '',
+    // 'Start date changed: ' => '',
 );
diff --git a/app/Locale/pl_PL/translations.php b/app/Locale/pl_PL/translations.php
index 6d0a0b93..28ed2b3a 100644
--- a/app/Locale/pl_PL/translations.php
+++ b/app/Locale/pl_PL/translations.php
@@ -102,7 +102,6 @@ return array(
     'Open a task' => 'Otwórz zadanie',
     'Do you really want to open this task: "%s"?' => 'Na pewno chcesz otworzyć zadanie: "%s"?',
     'Back to the board' => 'Powrót do tablicy',
-    'Created on %B %e, %Y at %k:%M %p' => 'Utworzono dnia %e %B %Y o %k:%M',
     'There is nobody assigned' => 'Nikt nie jest przypisany',
     'Column on the board:' => 'Kolumna na tablicy:',
     'Close this task' => 'Zamknij zadanie',
@@ -156,7 +155,6 @@ return array(
     'Work in progress' => 'W trakcie',
     'Done' => 'Zakończone',
     'Application version:' => 'Wersja aplikacji:',
-    '%B %e, %Y at %k:%M %p' => '%e %B %Y o %k:%M',
     'Id' => 'Id',
     '%d closed tasks' => '%d zamkniętych zadań',
     'No task for this project' => 'Brak zadań dla tego projektu',
@@ -180,8 +178,6 @@ return array(
     'Edit this task' => 'Edytuj zadanie',
     'Due Date' => 'Termin',
     'Invalid date' => 'Błędna data',
-    'Must be done before %B %e, %Y' => 'Termin do %e %B %Y',
-    '%B %e, %Y' => '%e %B %Y',
     'Automatic actions' => 'Akcje automatyczne',
     'Your automatic action have been created successfully.' => 'Twoja akcja została dodana',
     'Unable to create your automatic action.' => 'Nie udało się utworzyć akcji',
@@ -317,7 +313,6 @@ return array(
     'Unable to upload the file.' => 'Nie można wczytać pliku.',
     'Display another project' => 'Wyświetl inny projekt',
     'Created by %s' => 'Utworzone przez %s',
-    'Last modified on %B %e, %Y at %k:%M %p' => 'Ostatnio zmienione %e %B %Y o %k:%M',
     'Tasks Export' => 'Eksport zadań',
     'Tasks exportation for "%s"' => 'Eksport zadań dla "%s"',
     'Start Date' => 'Data początkowa',
@@ -589,7 +584,6 @@ return array(
     'This task' => 'To zadanie',
     // '<1h' => '',
     // '%dh' => '',
-    '%b %e' => '%e %b',
     'Expand tasks' => 'Rozwiń zadania',
     'Collapse tasks' => 'Zwiń zadania',
     'Expand/collapse tasks' => 'Zwiń/Rozwiń zadania',
@@ -758,10 +752,6 @@ return array(
     'Only for tasks assigned to me' => 'Tylko zadań przypisanych do mnie',
     'Only for tasks created by me' => 'Tylko zadań utworzonych przeze mnie',
     'Only for tasks created by me and assigned to me' => 'Tylko zadań przypisanych lub utworzonych przeze mnie',
-    // '%A' => '',
-    // '%b %e, %Y, %k:%M %p' => '',
-    'New due date: %B %e, %Y' => 'Nowy termin: %B %e, %Y',
-    'Start date changed: %B %e, %Y' => 'Zmiana daty rozpoczęcia: %B %e, %Y',
     // '%%Y-%%m-%%d' => '',
     // 'Total for all columns' => '',
     // 'You need at least 2 days of data to show the chart.' => '',
@@ -786,7 +776,6 @@ return array(
     'Not assigned' => 'Nieprzypisane zadania',
     'View advanced search syntax' => 'Pomoc dotycząca budowania filtrów',
     'Overview' => 'Przegląd',
-    // '%b %e %Y' => '',
     'Board/Calendar/List view' => 'Widok: Tablica/Kalendarz/Lista',
     'Switch to the board view' => 'Przełącz na tablicę',
     'Switch to the calendar view' => 'Przełącz na kalendarz',
@@ -876,8 +865,6 @@ return array(
     'End date:' => 'Data zakończenia:',
     'There is no start date or end date for this project.' => 'Nie zdefiniowano czasu trwania projektu',
     'Projects Gantt chart' => 'Wykres Gantta dla projektów',
-    'Start date: %s' => 'Data rozpoczęcia: %s',
-    'End date: %s' => 'Data zakończenia: %s',
     'Link type' => 'Typ adresu URL',
     'Change task color when using a specific task link' => 'Zmień kolor zadania używając specjalnego adresu URL',
     'Task link creation or modification' => 'Adres URL do utworzenia zadania lub modyfikacji',
@@ -1125,4 +1112,10 @@ return array(
     // 'Moved:' => '',
     // 'Task #%d' => '',
     // 'Sub-tasks' => '',
+    // 'Date and time format' => '',
+    // 'Time format' => '',
+    // 'Start date: ' => '',
+    // 'End date: ' => '',
+    // 'New due date: ' => '',
+    // 'Start date changed: ' => '',
 );
diff --git a/app/Locale/pt_BR/translations.php b/app/Locale/pt_BR/translations.php
index eef52d48..d29f9f88 100644
--- a/app/Locale/pt_BR/translations.php
+++ b/app/Locale/pt_BR/translations.php
@@ -102,7 +102,6 @@ return array(
     'Open a task' => 'Abrir uma tarefa',
     'Do you really want to open this task: "%s"?' => 'Você realmente deseja abrir esta tarefa: "%s"?',
     'Back to the board' => 'Voltar ao board',
-    'Created on %B %e, %Y at %k:%M %p' => 'Criado em %d %B %Y às %H:%M',
     'There is nobody assigned' => 'Não há ninguém designado',
     'Column on the board:' => 'Coluna no board:',
     'Close this task' => 'Finalizar esta tarefa',
@@ -156,7 +155,6 @@ return array(
     'Work in progress' => 'Em andamento',
     'Done' => 'Finalizado',
     'Application version:' => 'Versão da aplicação:',
-    '%B %e, %Y at %k:%M %p' => '%d %B %Y às %H:%M',
     'Id' => 'Id',
     '%d closed tasks' => '%d tarefas finalizadas',
     'No task for this project' => 'Não há tarefa para este projeto',
@@ -180,8 +178,6 @@ return array(
     'Edit this task' => 'Editar esta tarefa',
     'Due Date' => 'Data de vencimento',
     'Invalid date' => 'Data inválida',
-    'Must be done before %B %e, %Y' => 'Deve ser finalizado antes de %d %B %Y',
-    '%B %e, %Y' => '%d %B %Y',
     'Automatic actions' => 'Ações automáticas',
     'Your automatic action have been created successfully.' => 'Sua ação automética foi criada com sucesso.',
     'Unable to create your automatic action.' => 'Não é possível criar sua ação automática.',
@@ -317,7 +313,6 @@ return array(
     'Unable to upload the file.' => 'Não foi possível carregar o arquivo.',
     'Display another project' => 'Exibir outro projeto',
     'Created by %s' => 'Criado por %s',
-    'Last modified on %B %e, %Y at %k:%M %p' => 'Última modificação em %B %e, %Y às %k: %M %p',
     'Tasks Export' => 'Exportar Tarefas',
     'Tasks exportation for "%s"' => 'As tarefas foram exportadas para "%s"',
     'Start Date' => 'Data inicial',
@@ -589,7 +584,6 @@ return array(
     'This task' => 'Esta tarefa',
     '<1h' => '<1h',
     '%dh' => '%dh',
-    '%b %e' => '%e %b',
     'Expand tasks' => 'Expandir tarefas',
     'Collapse tasks' => 'Contrair tarefas',
     'Expand/collapse tasks' => 'Expandir/Contrair tarefas',
@@ -758,10 +752,6 @@ return array(
     'Only for tasks assigned to me' => 'Somente as tarefas atribuídas a mim',
     'Only for tasks created by me' => 'Apenas as tarefas que eu criei',
     'Only for tasks created by me and assigned to me' => 'Apenas as tarefas que eu criei e aquelas atribuídas a mim',
-    '%A' => '%A',
-    '%b %e, %Y, %k:%M %p' => '%d/%m/%Y %H:%M',
-    'New due date: %B %e, %Y' => 'Nova data limite: %d/%m/%Y',
-    'Start date changed: %B %e, %Y' => 'Data de início alterada: %d/%m/%Y',
     '%%Y-%%m-%%d' => '%%d/%%m/%%Y',
     'Total for all columns' => 'Total para todas as colunas',
     'You need at least 2 days of data to show the chart.' => 'Você precisa de pelo menos 2 dias de dados para visualizar o gráfico.',
@@ -786,7 +776,6 @@ return array(
     'Not assigned' => 'Não designada',
     'View advanced search syntax' => 'Ver a sintaxe para pesquisa avançada',
     'Overview' => 'Visão global',
-    '%b %e %Y' => '%b %e %Y',
     'Board/Calendar/List view' => 'Vista Painel/Calendário/Lista',
     'Switch to the board view' => 'Mudar para o modo Painel',
     'Switch to the calendar view' => 'Mudar par o modo Calendário',
@@ -876,8 +865,6 @@ return array(
     'End date:' => 'Data de término:',
     'There is no start date or end date for this project.' => 'Não há data de início ou data de término para este projeto.',
     'Projects Gantt chart' => 'Gráfico de Gantt dos projetos',
-    'Start date: %s' => 'Data de início: %s',
-    'End date: %s' => 'Data de término: %s',
     'Link type' => 'Tipo de link',
     'Change task color when using a specific task link' => 'Mudar a cor da tarefa quando um link específico é utilizado',
     'Task link creation or modification' => 'Criação ou modificação de um link em uma tarefa',
@@ -1125,4 +1112,10 @@ return array(
     // 'Moved:' => '',
     // 'Task #%d' => '',
     // 'Sub-tasks' => '',
+    // 'Date and time format' => '',
+    // 'Time format' => '',
+    // 'Start date: ' => '',
+    // 'End date: ' => '',
+    // 'New due date: ' => '',
+    // 'Start date changed: ' => '',
 );
diff --git a/app/Locale/pt_PT/translations.php b/app/Locale/pt_PT/translations.php
index e952df35..3ffaba0e 100644
--- a/app/Locale/pt_PT/translations.php
+++ b/app/Locale/pt_PT/translations.php
@@ -102,7 +102,6 @@ return array(
     'Open a task' => 'Abrir uma tarefa',
     'Do you really want to open this task: "%s"?' => 'Tem a certeza que quer abrir esta tarefa: "%s"?',
     'Back to the board' => 'Voltar ao quadro',
-    'Created on %B %e, %Y at %k:%M %p' => 'Criado em %d %B %Y às %H:%M',
     'There is nobody assigned' => 'Não há ninguém assignado',
     'Column on the board:' => 'Coluna no quadro:',
     'Close this task' => 'Finalizar esta tarefa',
@@ -156,7 +155,6 @@ return array(
     'Work in progress' => 'Em andamento',
     'Done' => 'Finalizado',
     'Application version:' => 'Versão da aplicação:',
-    '%B %e, %Y at %k:%M %p' => '%d %B %Y às %H:%M',
     'Id' => 'Id',
     '%d closed tasks' => '%d tarefas finalizadas',
     'No task for this project' => 'Não há tarefa para este projecto',
@@ -180,8 +178,6 @@ return array(
     'Edit this task' => 'Editar esta tarefa',
     'Due Date' => 'Data de vencimento',
     'Invalid date' => 'Data inválida',
-    'Must be done before %B %e, %Y' => 'Deve ser finalizado antes de %d %B %Y',
-    '%B %e, %Y' => '%d %B %Y',
     'Automatic actions' => 'Acções automáticas',
     'Your automatic action have been created successfully.' => 'A sua acção automática foi criada com sucesso.',
     'Unable to create your automatic action.' => 'Não é possível criar a sua acção automática.',
@@ -317,7 +313,6 @@ return array(
     'Unable to upload the file.' => 'Não foi possível carregar o arquivo.',
     'Display another project' => 'Mostrar outro projecto',
     'Created by %s' => 'Criado por %s',
-    'Last modified on %B %e, %Y at %k:%M %p' => 'Última modificação em %B %e, %Y às %k: %M %p',
     'Tasks Export' => 'Exportar Tarefas',
     'Tasks exportation for "%s"' => 'As tarefas foram exportadas para "%s"',
     'Start Date' => 'Data inicial',
@@ -589,7 +584,6 @@ return array(
     'This task' => 'Esta tarefa',
     '<1h' => '<1h',
     '%dh' => '%dh',
-    '%b %e' => '%e %b',
     'Expand tasks' => 'Expandir tarefas',
     'Collapse tasks' => 'Contrair tarefas',
     'Expand/collapse tasks' => 'Expandir/Contrair tarefas',
@@ -758,10 +752,6 @@ return array(
     'Only for tasks assigned to me' => 'Somente as tarefas atribuídas a mim',
     'Only for tasks created by me' => 'Apenas as tarefas que eu criei',
     'Only for tasks created by me and assigned to me' => 'Apenas as tarefas que eu criei e aquelas atribuídas a mim',
-    '%A' => '%A',
-    '%b %e, %Y, %k:%M %p' => '%d/%m/%Y %H:%M',
-    'New due date: %B %e, %Y' => 'Nova data de vencimento: %d/%m/%Y',
-    'Start date changed: %B %e, %Y' => 'Data de início alterada: %d/%m/%Y',
     '%%Y-%%m-%%d' => '%%d/%%m/%%Y',
     'Total for all columns' => 'Total para todas as colunas',
     'You need at least 2 days of data to show the chart.' => 'Precisa de pelo menos 2 dias de dados para visualizar o gráfico.',
@@ -786,7 +776,6 @@ return array(
     'Not assigned' => 'Não assignada',
     'View advanced search syntax' => 'Ver sintaxe avançada de pesquisa',
     'Overview' => 'Visão global',
-    '%b %e %Y' => '%b %e %Y',
     'Board/Calendar/List view' => 'Vista Painel/Calendário/Lista',
     'Switch to the board view' => 'Mudar para o modo Painel',
     'Switch to the calendar view' => 'Mudar para o modo Calendário',
@@ -876,8 +865,6 @@ return array(
     'End date:' => 'Data de fim:',
     'There is no start date or end date for this project.' => 'Não existe data de inicio ou fim para este projecto.',
     'Projects Gantt chart' => 'Gráfico de Gantt dos projectos',
-    'Start date: %s' => 'Data de inicio: %s',
-    'End date: %s' => 'Data de fim: %s',
     'Link type' => 'Tipo de ligação',
     'Change task color when using a specific task link' => 'Alterar cor da tarefa quando se usar um tipo especifico de ligação de tarefa',
     'Task link creation or modification' => 'Criação ou modificação de ligação de tarefa',
@@ -1125,4 +1112,10 @@ return array(
     // 'Moved:' => '',
     // 'Task #%d' => '',
     // 'Sub-tasks' => '',
+    // 'Date and time format' => '',
+    // 'Time format' => '',
+    // 'Start date: ' => '',
+    // 'End date: ' => '',
+    // 'New due date: ' => '',
+    // 'Start date changed: ' => '',
 );
diff --git a/app/Locale/ru_RU/translations.php b/app/Locale/ru_RU/translations.php
index 1708dcba..f971acc1 100755
--- a/app/Locale/ru_RU/translations.php
+++ b/app/Locale/ru_RU/translations.php
@@ -102,7 +102,6 @@ return array(
     'Open a task' => 'Открыть задачу',
     'Do you really want to open this task: "%s"?' => 'Вы уверены что хотите открыть задачу: "%s" ?',
     'Back to the board' => 'Вернуться на доску',
-    'Created on %B %e, %Y at %k:%M %p' => 'Создано %B /%e /%Y в %k:%M %p',
     'There is nobody assigned' => 'Никто не назначен',
     'Column on the board:' => 'Колонка на доске: ',
     'Close this task' => 'Закрыть задачу',
@@ -156,7 +155,6 @@ return array(
     'Work in progress' => 'В процессе',
     'Done' => 'Выполнено',
     'Application version:' => 'Версия приложения:',
-    '%B %e, %Y at %k:%M %p' => '%d/%m/%Y в %H:%M',
     'Id' => 'ID',
     '%d closed tasks' => '%d завершенных задач',
     'No task for this project' => 'Нет задач для этого проекта',
@@ -180,8 +178,6 @@ return array(
     'Edit this task' => 'Изменить задачу',
     'Due Date' => 'Сделать до',
     'Invalid date' => 'Неверная дата',
-    'Must be done before %B %e, %Y' => 'Должно быть сделано до %B %e %Y',
-    '%B %e, %Y' => '%B, %e, %Y',
     'Automatic actions' => 'Автоматические действия',
     'Your automatic action have been created successfully.' => 'Автоматизированное действие успешно настроено.',
     'Unable to create your automatic action.' => 'Не удалось создать автоматизированное действие.',
@@ -317,7 +313,6 @@ return array(
     'Unable to upload the file.' => 'Не удалось загрузить файл.',
     'Display another project' => 'Показать другой проект',
     'Created by %s' => 'Создано %s',
-    'Last modified on %B %e, %Y at %k:%M %p' => 'Последнее изменение %d/%m/%Y в %H:%M',
     'Tasks Export' => 'Экспорт задач',
     'Tasks exportation for "%s"' => 'Задача экспортирована для « %s »',
     'Start Date' => 'Дата начала',
@@ -589,7 +584,6 @@ return array(
     'This task' => 'Эта задача',
     '<1h' => '<1ч',
     '%dh' => '%dh',
-    '%b %e' => '%b %e',
     'Expand tasks' => 'Развернуть задачи',
     'Collapse tasks' => 'Свернуть задачи',
     'Expand/collapse tasks' => 'Развернуть/свернуть задачи',
@@ -758,10 +752,6 @@ return array(
     'Only for tasks assigned to me' => 'Только для задач, назначенных на меня',
     'Only for tasks created by me' => 'Только для задач, созданных мной',
     'Only for tasks created by me and assigned to me' => 'Только для задач, созданных мной и назначенных мной',
-    '%A' => '%A',
-    '%b %e, %Y, %k:%M %p' => '%b %e, %Y, %k:%M %p',
-    'New due date: %B %e, %Y' => 'Новая дата завершения: %B %e, %Y',
-    'Start date changed: %B %e, %Y' => 'Изменить дату начала: %B %e, %Y',
     '%%Y-%%m-%%d' => '%%Y-%%m-%%d',
     'Total for all columns' => 'Суммарно для всех колонок',
     'You need at least 2 days of data to show the chart.' => 'Для отображения диаграммы нужно по крайней мере 2 дня.',
@@ -786,7 +776,6 @@ return array(
     'Not assigned' => 'Не назначенные',
     'View advanced search syntax' => 'Просмотр расширенного синтаксиса поиска',
     'Overview' => 'Обзор',
-    '%b %e %Y' => '%b %e %Y',
     'Board/Calendar/List view' => 'Просмотр Доска/Календарь/Список',
     'Switch to the board view' => 'Переключиться в режим доски',
     'Switch to the calendar view' => 'Переключиться в режим календаря',
@@ -876,8 +865,6 @@ return array(
     'End date:' => 'Дата завершения:',
     'There is no start date or end date for this project.' => 'В проекте не указаны дата начала или завершения.',
     'Projects Gantt chart' => 'Диаграмма Ганта проектов',
-    'Start date: %s' => 'Дата начала: %s',
-    'End date: %s' => 'Дата завершения: %s',
     'Link type' => 'Тип ссылки',
     'Change task color when using a specific task link' => 'Изменение цвета задач при использовании ссылки на определенные задачи',
     'Task link creation or modification' => 'Ссылка на создание или модификацию задачи',
@@ -1125,4 +1112,10 @@ return array(
     'Moved:' => 'Перемещена:',
     'Task #%d' => 'Задача #%d',
     'Sub-tasks' => 'Подзадачи',
+    // 'Date and time format' => '',
+    // 'Time format' => '',
+    // 'Start date: ' => '',
+    // 'End date: ' => '',
+    // 'New due date: ' => '',
+    // 'Start date changed: ' => '',
 );
diff --git a/app/Locale/sr_Latn_RS/translations.php b/app/Locale/sr_Latn_RS/translations.php
index 47ae3d7b..3551c281 100644
--- a/app/Locale/sr_Latn_RS/translations.php
+++ b/app/Locale/sr_Latn_RS/translations.php
@@ -102,7 +102,6 @@ return array(
     'Open a task' => 'Otvori zadatak',
     'Do you really want to open this task: "%s"?' => 'Da li zaista želiš da otvoriš zadatak: "%s"?',
     'Back to the board' => 'Nazad na tablu',
-    'Created on %B %e, %Y at %k:%M %p' => 'Kreiran %e %B %Y o %k:%M',
     'There is nobody assigned' => 'Niko nije dodeljen!',
     'Column on the board:' => 'Kolona na tabli:',
     'Close this task' => 'Zatvori ovaj zadatak',
@@ -156,7 +155,6 @@ return array(
     'Work in progress' => 'U radu',
     'Done' => 'Gotovo',
     'Application version:' => 'Verzija aplikacije:',
-    '%B %e, %Y at %k:%M %p' => '%e %B %Y o %k:%M',
     'Id' => 'Id',
     '%d closed tasks' => '%d zatvorenih zadataka',
     'No task for this project' => 'Nema dodeljenih zadataka ovom projektu',
@@ -180,8 +178,6 @@ return array(
     'Edit this task' => 'Izmeni ovaj zadatak',
     'Due Date' => 'Termin',
     'Invalid date' => 'Loš datum',
-    'Must be done before %B %e, %Y' => 'Termin do %e %B %Y',
-    '%B %e, %Y' => '%e %B %Y',
     'Automatic actions' => 'Automatske akcije',
     'Your automatic action have been created successfully.' => 'Uspešno kreirana automatska akcija',
     'Unable to create your automatic action.' => 'Nemoguće kreiranje automatske akcije',
@@ -317,7 +313,6 @@ return array(
     'Unable to upload the file.' => 'Nije moguće snimiti fajl.',
     'Display another project' => 'Prikaži drugi projekat',
     'Created by %s' => 'Kreirao %s',
-    'Last modified on %B %e, %Y at %k:%M %p' => 'Poslednja izmena %e %B %Y o %k:%M',
     'Tasks Export' => 'Izvoz zadataka',
     'Tasks exportation for "%s"' => 'Izvoz zadataka za "%s"',
     'Start Date' => 'Početni datum',
@@ -589,7 +584,6 @@ return array(
     // 'This task' => '',
     // '<1h' => '',
     // '%dh' => '',
-    // '%b %e' => '',
     // 'Expand tasks' => '',
     // 'Collapse tasks' => '',
     // 'Expand/collapse tasks' => '',
@@ -758,10 +752,6 @@ return array(
     // 'Only for tasks assigned to me' => '',
     // 'Only for tasks created by me' => '',
     // 'Only for tasks created by me and assigned to me' => '',
-    // '%A' => '',
-    // '%b %e, %Y, %k:%M %p' => '',
-    // 'New due date: %B %e, %Y' => '',
-    // 'Start date changed: %B %e, %Y' => '',
     // '%%Y-%%m-%%d' => '',
     // 'Total for all columns' => '',
     // 'You need at least 2 days of data to show the chart.' => '',
@@ -786,7 +776,6 @@ return array(
     // 'Not assigned' => '',
     // 'View advanced search syntax' => '',
     // 'Overview' => '',
-    // '%b %e %Y' => '',
     // 'Board/Calendar/List view' => '',
     // 'Switch to the board view' => '',
     // 'Switch to the calendar view' => '',
@@ -876,8 +865,6 @@ return array(
     // 'End date:' => '',
     // 'There is no start date or end date for this project.' => '',
     // 'Projects Gantt chart' => '',
-    // 'Start date: %s' => '',
-    // 'End date: %s' => '',
     // 'Link type' => '',
     // 'Change task color when using a specific task link' => '',
     // 'Task link creation or modification' => '',
@@ -1125,4 +1112,10 @@ return array(
     // 'Moved:' => '',
     // 'Task #%d' => '',
     // 'Sub-tasks' => '',
+    // 'Date and time format' => '',
+    // 'Time format' => '',
+    // 'Start date: ' => '',
+    // 'End date: ' => '',
+    // 'New due date: ' => '',
+    // 'Start date changed: ' => '',
 );
diff --git a/app/Locale/sv_SE/translations.php b/app/Locale/sv_SE/translations.php
index 4218561a..c0aa883c 100644
--- a/app/Locale/sv_SE/translations.php
+++ b/app/Locale/sv_SE/translations.php
@@ -102,7 +102,6 @@ return array(
     'Open a task' => 'Öppna en uppgift',
     'Do you really want to open this task: "%s"?' => 'Vill du verkligen öppna denna uppgift: "%s"?',
     'Back to the board' => 'Tillbaka till tavlan',
-    'Created on %B %e, %Y at %k:%M %p' => 'Skapad %Y-%m-%d kl %H:%M',
     'There is nobody assigned' => 'Det finns ingen tilldelad',
     'Column on the board:' => 'Kolumn på tavlan:',
     'Close this task' => 'Stäng uppgiften',
@@ -156,7 +155,6 @@ return array(
     'Work in progress' => 'Pågående',
     'Done' => 'Slutfört',
     'Application version:' => 'Version:',
-    '%B %e, %Y at %k:%M %p' => '%Y-%m-%d kl %H:%M',
     'Id' => 'ID',
     '%d closed tasks' => '%d stängda uppgifter',
     'No task for this project' => 'Inga uppgifter i detta projekt',
@@ -180,8 +178,6 @@ return array(
     'Edit this task' => 'Ändra denna uppgift',
     'Due Date' => 'Måldatum',
     'Invalid date' => 'Ej tillåtet datum',
-    'Must be done before %B %e, %Y' => 'Måste vara klart innan %Y-%m-%d',
-    '%B %e, %Y' => '%Y-%m-%d',
     'Automatic actions' => 'Automatiska åtgärder',
     'Your automatic action have been created successfully.' => 'Din automatiska åtgärd har skapats.',
     'Unable to create your automatic action.' => 'Kunde inte skapa din automatiska åtgärd.',
@@ -317,7 +313,6 @@ return array(
     'Unable to upload the file.' => 'Kunde inte ladda upp filen.',
     'Display another project' => 'Visa ett annat projekt',
     'Created by %s' => 'Skapad av %s',
-    'Last modified on %B %e, %Y at %k:%M %p' => 'Senaste ändring %Y-%m-%d kl %H:%M',
     'Tasks Export' => 'Exportera uppgifter',
     'Tasks exportation for "%s"' => 'Exportera uppgifter för "%s"',
     'Start Date' => 'Startdatum',
@@ -589,7 +584,6 @@ return array(
     'This task' => 'Denna uppgift',
     '<1h' => '<1h',
     '%dh' => '%dh',
-    '%b %e' => '%b %e',
     'Expand tasks' => 'Expandera uppgifter',
     'Collapse tasks' => 'Minimera uppgifter',
     'Expand/collapse tasks' => 'Expandera/minimera uppgifter',
@@ -758,10 +752,6 @@ return array(
     'Only for tasks assigned to me' => 'Bara för uppgifter tilldelade mig',
     'Only for tasks created by me' => 'Bara för uppgifter skapade av mig',
     'Only for tasks created by me and assigned to me' => 'Bara för uppgifter skapade av mig och tilldelade till mig',
-    '%A' => '%A',
-    '%b %e, %Y, %k:%M %p' => '%b %e, %Y, %k:%M %p',
-    'New due date: %B %e, %Y' => 'Nytt förfallodatum: %B %e, %Y',
-    'Start date changed: %B %e, %Y' => 'Startdatum ändrat: %B %e, %Y',
     '%%Y-%%m-%%d' => '%%Y-%%m-%%d',
     'Total for all columns' => 'Totalt för alla kolumner',
     'You need at least 2 days of data to show the chart.' => 'Du behöver minst två dagars data för att visa diagrammet.',
@@ -786,7 +776,6 @@ return array(
     'Not assigned' => 'Inte tilldelad',
     'View advanced search syntax' => 'Visa avancerad söksyntax',
     'Overview' => 'Översikts',
-    '%b %e %Y' => '%b %e %Y',
     'Board/Calendar/List view' => 'Tavla/Kalender/Listvy',
     'Switch to the board view' => 'Växla till tavelvy',
     'Switch to the calendar view' => 'Växla till kalendervy',
@@ -876,8 +865,6 @@ return array(
     // 'End date:' => '',
     // 'There is no start date or end date for this project.' => '',
     // 'Projects Gantt chart' => '',
-    // 'Start date: %s' => '',
-    // 'End date: %s' => '',
     // 'Link type' => '',
     // 'Change task color when using a specific task link' => '',
     // 'Task link creation or modification' => '',
@@ -1125,4 +1112,10 @@ return array(
     // 'Moved:' => '',
     // 'Task #%d' => '',
     // 'Sub-tasks' => '',
+    // 'Date and time format' => '',
+    // 'Time format' => '',
+    // 'Start date: ' => '',
+    // 'End date: ' => '',
+    // 'New due date: ' => '',
+    // 'Start date changed: ' => '',
 );
diff --git a/app/Locale/th_TH/translations.php b/app/Locale/th_TH/translations.php
index eb4c0e77..1ccc2d90 100644
--- a/app/Locale/th_TH/translations.php
+++ b/app/Locale/th_TH/translations.php
@@ -102,7 +102,6 @@ return array(
     'Open a task' => 'เปิดงาน',
     'Do you really want to open this task: "%s"?' => 'คุณต้องการเปิดงาน: « %s » ใช่หรือไม่?',
     'Back to the board' => 'กลับไปที่บอร์ด',
-    'Created on %B %e, %Y at %k:%M %p' => 'สร้างวันที่ %d/%m/%Y เวลา %H:%M',
     'There is nobody assigned' => 'ไม่มีใครถูกกำหนด',
     'Column on the board:' => 'คอลัมน์บนบอร์ด:',
     'Close this task' => 'ปิดงานนี้',
@@ -156,7 +155,6 @@ return array(
     'Work in progress' => 'กำลังทำ',
     'Done' => 'เสร็จ',
     'Application version:' => 'แอพเวอร์ชัน:',
-    '%B %e, %Y at %k:%M %p' => '%d/%m/%Y เวลา %H:%M',
     'Id' => 'ไอดี',
     '%d closed tasks' => '%d งานที่ปิด',
     'No task for this project' => 'ไม่มีงานสำหรับโปรเจคนี้',
@@ -180,8 +178,6 @@ return array(
     'Edit this task' => 'แก้ไขงาน',
     'Due Date' => 'วันที่ครบกำหนด',
     'Invalid date' => 'วันที่ผิด',
-    'Must be done before %B %e, %Y' => 'ต้องทำให้เสร็จก่อน %d/%m/%Y',
-    '%B %e, %Y' => '%d/%m/%Y',
     'Automatic actions' => 'การกระทำอัตโนมัติ',
     'Your automatic action have been created successfully.' => 'การกระทำอัตโนมัติสร้างเรียบร้อยแล้ว',
     'Unable to create your automatic action.' => 'ไม่สามารถสร้างการกระทำอัตโนมัติได้',
@@ -317,7 +313,6 @@ return array(
     'Unable to upload the file.' => 'ไม่สามารถอัพโหลดไฟล์ได้',
     'Display another project' => 'แสดงโปรเจคอื่น',
     'Created by %s' => 'สร้างโดย %s',
-    'Last modified on %B %e, %Y at %k:%M %p' => 'แก้ไขล่าสุดวันที่ %B %e, %Y เวลา %k:%M %p',
     'Tasks Export' => 'ส่งออกงาน',
     'Tasks exportation for "%s"' => 'ส่งออกงานสำหรับ "%s"',
     'Start Date' => 'เริ่มวันที่',
@@ -589,7 +584,6 @@ return array(
     'This task' => 'งานนี้',
     // '<1h' => '',
     // '%dh' => '',
-    // '%b %e' => '',
     'Expand tasks' => 'ขยายงาน',
     'Collapse tasks' => 'ย่องาน',
     'Expand/collapse tasks' => 'ขยาย/ย่อ งาน',
@@ -758,10 +752,6 @@ return array(
     // 'Only for tasks assigned to me' => '',
     // 'Only for tasks created by me' => '',
     // 'Only for tasks created by me and assigned to me' => '',
-    // '%A' => '',
-    // '%b %e, %Y, %k:%M %p' => '',
-    // 'New due date: %B %e, %Y' => '',
-    // 'Start date changed: %B %e, %Y' => '',
     // '%%Y-%%m-%%d' => '',
     // 'Total for all columns' => '',
     // 'You need at least 2 days of data to show the chart.' => '',
@@ -786,7 +776,6 @@ return array(
     // 'Not assigned' => '',
     // 'View advanced search syntax' => '',
     // 'Overview' => '',
-    // '%b %e %Y' => '',
     // 'Board/Calendar/List view' => '',
     // 'Switch to the board view' => '',
     // 'Switch to the calendar view' => '',
@@ -876,8 +865,6 @@ return array(
     // 'End date:' => '',
     // 'There is no start date or end date for this project.' => '',
     // 'Projects Gantt chart' => '',
-    // 'Start date: %s' => '',
-    // 'End date: %s' => '',
     // 'Link type' => '',
     // 'Change task color when using a specific task link' => '',
     // 'Task link creation or modification' => '',
@@ -1125,4 +1112,10 @@ return array(
     // 'Moved:' => '',
     // 'Task #%d' => '',
     // 'Sub-tasks' => '',
+    // 'Date and time format' => '',
+    // 'Time format' => '',
+    // 'Start date: ' => '',
+    // 'End date: ' => '',
+    // 'New due date: ' => '',
+    // 'Start date changed: ' => '',
 );
diff --git a/app/Locale/tr_TR/translations.php b/app/Locale/tr_TR/translations.php
index 6fecb37a..10153331 100644
--- a/app/Locale/tr_TR/translations.php
+++ b/app/Locale/tr_TR/translations.php
@@ -102,7 +102,6 @@ return array(
     'Open a task' => 'Bir görevi aç',
     'Do you really want to open this task: "%s"?' => 'Bu görevi gerçekten açmak istiyor musunuz: "%s"?',
     'Back to the board' => 'Tabloya dön',
-    'Created on %B %e, %Y at %k:%M %p' => '%B %e, %Y, saat %k:%M %p da oluşturuldu',
     'There is nobody assigned' => 'Kimse atanmamış',
     'Column on the board:' => 'Tablodaki sütun:',
     'Close this task' => 'Görevi kapat',
@@ -156,7 +155,6 @@ return array(
     'Work in progress' => 'İşlemde',
     'Done' => 'Tamamlandı',
     'Application version:' => 'Uygulama versiyonu:',
-    '%B %e, %Y at %k:%M %p' => '%B %e, %Y saat %k:%M %p',
     'Id' => 'Kod',
     '%d closed tasks' => '%d kapatılmış görevler',
     'No task for this project' => 'Bu proje için görev yok',
@@ -180,8 +178,6 @@ return array(
     'Edit this task' => 'Bu görevi değiştir',
     'Due Date' => 'Bitiş Tarihi',
     'Invalid date' => 'Geçersiz tarihi',
-    'Must be done before %B %e, %Y' => '%B %e, %Y tarihinden önce yapılmalı',
-    '%B %e, %Y' => '%d %B %Y',
     'Automatic actions' => 'Otomatik işlemler',
     'Your automatic action have been created successfully.' => 'Otomatik işlem başarıyla oluşturuldu',
     'Unable to create your automatic action.' => 'Otomatik işleminiz oluşturulamadı',
@@ -317,7 +313,6 @@ return array(
     'Unable to upload the file.' => 'Dosya yüklenemiyor.',
     'Display another project' => 'Başka bir proje göster',
     'Created by %s' => '%s tarafından oluşturuldu',
-    'Last modified on %B %e, %Y at %k:%M %p' => 'Son değişiklik tarihi %d.%m.%Y, saati %H:%M',
     'Tasks Export' => 'Görevleri dışa aktar',
     'Tasks exportation for "%s"' => '"%s" için görevleri dışa aktar',
     'Start Date' => 'Başlangıç tarihi',
@@ -589,7 +584,6 @@ return array(
     'This task' => 'Bu görev',
     '<1h' => '<1s',
     '%dh' => '%ds',
-    // '%b %e' => '',
     'Expand tasks' => 'Görevleri genişlet',
     'Collapse tasks' => 'Görevleri daralt',
     'Expand/collapse tasks' => 'Görevleri genişlet/daralt',
@@ -758,10 +752,6 @@ return array(
     'Only for tasks assigned to me' => 'Yalnızca bana atanmış görevler için',
     'Only for tasks created by me' => 'Yalnızca benim oluşturduğum görevler için',
     'Only for tasks created by me and assigned to me' => 'Yalnızca benim oluşturduğum ve bana atanmış görevler için',
-    '%A' => '%A',
-    '%b %e, %Y, %k:%M %p' => '%b %e, %Y, %k:%M %p',
-    'New due date: %B %e, %Y' => 'Yeni tamamlanma tarihi: %B %e, %Y',
-    'Start date changed: %B %e, %Y' => 'Başlangıç tarihi değiştirildi: %B %e, %Y',
     '%%Y-%%m-%%d' => '%%Y-%%m-%%d',
     'Total for all columns' => 'Tüm sütunlar için toplam',
     'You need at least 2 days of data to show the chart.' => 'Grafiği göstermek için en az iki günlük veriye ihtiyaç var.',
@@ -786,7 +776,6 @@ return array(
     'Not assigned' => 'Atanmamış',
     'View advanced search syntax' => 'Gelişmiş arama kodlarını göster',
     'Overview' => 'Genel bakış',
-    '%b %e %Y' => '%b %e %Y',
     'Board/Calendar/List view' => 'Tablo/Takvim/Liste görünümü',
     'Switch to the board view' => 'Tablo görünümüne geç',
     'Switch to the calendar view' => 'Takvim görünümüne geç',
@@ -876,8 +865,6 @@ return array(
     'End date:' => 'Bitiş tarihi:',
     'There is no start date or end date for this project.' => 'Bu proje için başlangıç veya bitiş tarihi yok.',
     'Projects Gantt chart' => 'Projeler Gantt diyagramı',
-    'Start date: %s' => 'Başlangıç tarihi: %s',
-    'End date: %s' => 'Bitiş tarihi: %s',
     'Link type' => 'Bağlantı türü',
     'Change task color when using a specific task link' => 'Belirli bir görev bağlantısı kullanıldığında görevin rengini değiştir',
     'Task link creation or modification' => 'Görev bağlantısı oluşturulması veya değiştirilmesi',
@@ -1125,4 +1112,10 @@ return array(
     // 'Moved:' => '',
     // 'Task #%d' => '',
     // 'Sub-tasks' => '',
+    // 'Date and time format' => '',
+    // 'Time format' => '',
+    // 'Start date: ' => '',
+    // 'End date: ' => '',
+    // 'New due date: ' => '',
+    // 'Start date changed: ' => '',
 );
diff --git a/app/Locale/zh_CN/translations.php b/app/Locale/zh_CN/translations.php
index ae90468d..acdcdf30 100644
--- a/app/Locale/zh_CN/translations.php
+++ b/app/Locale/zh_CN/translations.php
@@ -102,7 +102,6 @@ return array(
     'Open a task' => '开一个任务',
     'Do you really want to open this task: "%s"?' => '你确定要开这个任务吗？"%s"',
     'Back to the board' => '回到看板',
-    'Created on %B %e, %Y at %k:%M %p' => '创建时间：%Y/%m/%d %H:%M',
     'There is nobody assigned' => '当前无人被指派',
     'Column on the board:' => '看板上的栏目：',
     'Close this task' => '关闭该任务',
@@ -156,7 +155,6 @@ return array(
     'Work in progress' => '工作进行中',
     'Done' => '完成',
     'Application version:' => '应用程序版本：',
-    '%B %e, %Y at %k:%M %p' => '%Y/%m/%d %H:%M',
     'Id' => '编号',
     '%d closed tasks' => '%d个已关闭任务',
     'No task for this project' => '该项目尚无任务',
@@ -180,8 +178,6 @@ return array(
     'Edit this task' => '编辑该任务',
     'Due Date' => '到期时间',
     'Invalid date' => '无效日期',
-    'Must be done before %B %e, %Y' => '必须在%Y/%m/%d前完成',
-    '%B %e, %Y' => '%Y/%m/%d',
     'Automatic actions' => '自动动作',
     'Your automatic action have been created successfully.' => '您的自动动作已成功创建',
     'Unable to create your automatic action.' => '无法为您创建自动动作。',
@@ -317,7 +313,6 @@ return array(
     'Unable to upload the file.' => '无法上传文件',
     'Display another project' => '显示其它项目',
     'Created by %s' => '创建者：%s',
-    'Last modified on %B %e, %Y at %k:%M %p' => '最后修改：%Y/%m/%d/ %H:%M',
     'Tasks Export' => '任务导出',
     'Tasks exportation for "%s"' => '导出"%s"的任务',
     'Start Date' => '开始时间',
@@ -589,7 +584,6 @@ return array(
     'This task' => '此任务',
     '<1h' => '<1h',
     '%dh' => '%dh',
-    // '%b %e' => '',
     'Expand tasks' => '展开任务',
     'Collapse tasks' => '收缩任务',
     'Expand/collapse tasks' => '展开/收缩任务',
@@ -758,10 +752,6 @@ return array(
     'Only for tasks assigned to me' => '所有指派给我的任务',
     'Only for tasks created by me' => '所有我创建的任务',
     'Only for tasks created by me and assigned to me' => '所有我创建的并且指派给我的任务',
-    // '%A' => '',
-    // '%b %e, %Y, %k:%M %p' => '',
-    'New due date: %B %e, %Y' => '新的超期时间：%B %e, %Y',
-    'Start date changed: %B %e, %Y' => '开始时间已变为：%B %e, %Y',
     // '%%Y-%%m-%%d' => '',
     'Total for all columns' => '所有栏目下的',
     'You need at least 2 days of data to show the chart.' => '当前柱状图至少需要2天的数据。',
@@ -786,7 +776,6 @@ return array(
     'Not assigned' => '未指派',
     'View advanced search syntax' => '查看高级搜索语法',
     'Overview' => '概览',
-    // '%b %e %Y' => '',
     'Board/Calendar/List view' => '看板/日程/列表视图',
     'Switch to the board view' => '切换到看板视图',
     'Switch to the calendar view' => '切换到日程视图',
@@ -876,8 +865,6 @@ return array(
     'End date:' => '结束日期',
     'There is no start date or end date for this project.' => '当前项目没有开始或结束日期',
     'Projects Gantt chart' => '项目甘特图',
-    'Start date: %s' => '开始日期%s',
-    'End date: %s' => '结束日期%s',
     'Link type' => '关联类型',
     'Change task color when using a specific task link' => '当任务关联到指定任务时改变颜色',
     'Task link creation or modification' => '任务链接创建或更新时间',
@@ -1125,4 +1112,10 @@ return array(
     // 'Moved:' => '',
     // 'Task #%d' => '',
     // 'Sub-tasks' => '',
+    // 'Date and time format' => '',
+    // 'Time format' => '',
+    // 'Start date: ' => '',
+    // 'End date: ' => '',
+    // 'New due date: ' => '',
+    // 'Start date changed: ' => '',
 );
diff --git a/app/Model/File.php b/app/Model/File.php
index be62cdb3..46fc4bb9 100644
--- a/app/Model/File.php
+++ b/app/Model/File.php
@@ -308,7 +308,7 @@ class File extends Base
      */
     public function uploadScreenshot($project_id, $task_id, $blob)
     {
-        $original_filename = e('Screenshot taken %s', dt('%B %e, %Y at %k:%M %p', time())).'.png';
+        $original_filename = e('Screenshot taken %s', $this->helper->dt->datetime(time())).'.png';
         return $this->uploadContent($project_id, $task_id, $original_filename, $blob);
     }
 
diff --git a/app/Model/TaskCreation.php b/app/Model/TaskCreation.php
index 975cc7a3..f7d981fa 100644
--- a/app/Model/TaskCreation.php
+++ b/app/Model/TaskCreation.php
@@ -49,8 +49,9 @@ class TaskCreation extends Base
      */
     public function prepare(array &$values)
     {
-        $this->dateParser->convert($values, array('date_due'));
-        $this->dateParser->convert($values, array('date_started'), true);
+        $values = $this->dateParser->convert($values, array('date_due'));
+        $values = $this->dateParser->convert($values, array('date_started'), true);
+
         $this->removeFields($values, array('another_task'));
         $this->resetFields($values, array('date_started', 'creator_id', 'owner_id', 'swimlane_id', 'date_due', 'score', 'category_id', 'time_estimated'));
 
diff --git a/app/Model/TaskExport.php b/app/Model/TaskExport.php
index 278c0897..ed179a4f 100644
--- a/app/Model/TaskExport.php
+++ b/app/Model/TaskExport.php
@@ -106,7 +106,7 @@ class TaskExport extends Base
         $task['score'] = $task['score'] ?: 0;
         $task['swimlane_id'] = isset($swimlanes[$task['swimlane_id']]) ? $swimlanes[$task['swimlane_id']] : '?';
 
-        $this->dateParser->format($task, array('date_due', 'date_modification', 'date_creation', 'date_started', 'date_completed'), 'Y-m-d');
+        $task = $this->dateParser->format($task, array('date_due', 'date_modification', 'date_creation', 'date_started', 'date_completed'), 'Y-m-d');
 
         return $task;
     }
diff --git a/app/Model/TaskModification.php b/app/Model/TaskModification.php
index eee7b2e0..8e59b3fe 100644
--- a/app/Model/TaskModification.php
+++ b/app/Model/TaskModification.php
@@ -84,8 +84,9 @@ class TaskModification extends Base
      */
     public function prepare(array &$values)
     {
-        $this->dateParser->convert($values, array('date_due'));
-        $this->dateParser->convert($values, array('date_started'), true);
+        $values = $this->dateParser->convert($values, array('date_due'));
+        $values = $this->dateParser->convert($values, array('date_started'), true);
+
         $this->removeFields($values, array('another_task', 'id'));
         $this->resetFields($values, array('date_due', 'date_started', 'score', 'category_id', 'time_estimated', 'time_spent'));
         $this->convertIntegerFields($values, array('priority', 'is_active', 'recurrence_status', 'recurrence_trigger', 'recurrence_factor', 'recurrence_timeframe', 'recurrence_basedate'));
diff --git a/app/Template/app/notifications.php b/app/Template/app/notifications.php
index 511f377b..4cb3c571 100644
--- a/app/Template/app/notifications.php
+++ b/app/Template/app/notifications.php
@@ -49,7 +49,7 @@
                 <?php endif ?>
             </td>
             <td>
-                <?= dt('%B %e, %Y at %k:%M %p', $notification['date_creation']) ?>
+                <?= $this->dt->datetime($notification['date_creation']) ?>
             </td>
             <td>
                 <i class="fa fa-check fa-fw"></i>
diff --git a/app/Template/app/tasks.php b/app/Template/app/tasks.php
index f4f9b2ad..786d7159 100644
--- a/app/Template/app/tasks.php
+++ b/app/Template/app/tasks.php
@@ -33,7 +33,7 @@
                 <?php endif ?>
             </td>
             <td>
-                <?= dt('%B %e, %Y', $task['date_due']) ?>
+                <?= $this->dt->date($task['date_due']) ?>
             </td>
         </tr>
         <?php endforeach ?>
diff --git a/app/Template/board/task_footer.php b/app/Template/board/task_footer.php
index 1912dd83..73e68602 100644
--- a/app/Template/board/task_footer.php
+++ b/app/Template/board/task_footer.php
@@ -22,7 +22,7 @@
     <?php if (! empty($task['date_due'])): ?>
         <span class="task-board-date <?= time() > $task['date_due'] ? 'task-board-date-overdue' : '' ?>">
             <i class="fa fa-calendar"></i>
-            <?= (date('Y') === date('Y', $task['date_due']) ? dt('%b %e', $task['date_due']) : dt('%b %e %Y', $task['date_due'])) ?>
+            <?= $this->dt->date($task['date_due']) ?>
         </span>
     <?php endif ?>
 
diff --git a/app/Template/board/tooltip_comments.php b/app/Template/board/tooltip_comments.php
index 2e2c0c1e..ca91e13f 100644
--- a/app/Template/board/tooltip_comments.php
+++ b/app/Template/board/tooltip_comments.php
@@ -4,7 +4,7 @@
             <?php if (! empty($comment['username'])): ?>
                 <span class="comment-username"><?= $this->e($comment['name'] ?: $comment['username']) ?></span> @
             <?php endif ?>
-            <span class="comment-date"><?= dt('%b %e, %Y, %k:%M %p', $comment['date_creation']) ?></span>
+            <span class="comment-date"><?= $this->dt->datetime($comment['date_creation']) ?></span>
         </p>
 
 		<div class="comment-inner">
diff --git a/app/Template/comment/show.php b/app/Template/comment/show.php
index 26b300e8..2c9b426f 100644
--- a/app/Template/comment/show.php
+++ b/app/Template/comment/show.php
@@ -9,7 +9,7 @@
             <span class="comment-username"><?= $this->e($comment['name'] ?: $comment['username']) ?></span> @
         <?php endif ?>
 
-        <span class="comment-date"><?= dt('%B %e, %Y at %k:%M %p', $comment['date_creation']) ?></span>
+        <span class="comment-date"><?= $this->dt->datetime($comment['date_creation']) ?></span>
     </p>
     <div class="comment-inner">
 
diff --git a/app/Template/config/application.php b/app/Template/config/application.php
index 35d85dd8..48b04cf9 100644
--- a/app/Template/config/application.php
+++ b/app/Template/config/application.php
@@ -19,6 +19,12 @@
     <?= $this->form->select('application_date_format', $date_formats, $values, $errors) ?>
     <p class="form-help"><?= t('ISO format is always accepted, example: "%s" and "%s"', date('Y-m-d'), date('Y_m_d')) ?></p>
 
+    <?= $this->form->label(t('Date and time format'), 'application_datetime_format') ?>
+    <?= $this->form->select('application_datetime_format', $datetime_formats, $values, $errors) ?>
+
+    <?= $this->form->label(t('Time format'), 'application_time_format') ?>
+    <?= $this->form->select('application_time_format', $time_formats, $values, $errors) ?>
+
     <?= $this->form->checkbox('password_reset', t('Enable "Forget Password"'), 1, $values['password_reset'] == 1) ?>
 
     <?= $this->form->label(t('Custom Stylesheet'), 'application_stylesheet') ?>
diff --git a/app/Template/event/events.php b/app/Template/event/events.php
index aec0b29e..bbb01be4 100644
--- a/app/Template/event/events.php
+++ b/app/Template/event/events.php
@@ -14,7 +14,7 @@
                 <?php elseif ($this->text->contains($event['event_name'], 'comment')): ?>
                     <i class="fa fa-comments-o"></i>
                 <?php endif ?>
-                &nbsp;<?= dt('%B %e, %Y at %k:%M %p', $event['date_creation']) ?>
+                &nbsp;<?= $this->dt->datetime($event['date_creation']) ?>
             </p>
             <div class="activity-content"><?= $event['event_content'] ?></div>
         </div>
diff --git a/app/Template/file/show.php b/app/Template/file/show.php
index b87739a8..7a4d38b4 100644
--- a/app/Template/file/show.php
+++ b/app/Template/file/show.php
@@ -14,7 +14,7 @@
                     </div>
                     <p>
                         <?= $this->e($file['name']) ?>
-                        <span class="tooltip" title='<?= t('uploaded by: %s', $file['user_name'] ?: $file['username']).'<br>'.t('uploaded on: %s', dt('%B %e, %Y at %k:%M %p', $file['date'])).'<br>'.t('size: %s', $this->text->bytes($file['size'])) ?>'>
+                        <span class="tooltip" title='<?= t('uploaded by: %s', $file['user_name'] ?: $file['username']).'<br>'.t('uploaded on: %s', $this->dt->datetime($file['date'])).'<br>'.t('size: %s', $this->text->bytes($file['size'])) ?>'>
                             <i class="fa fa-info-circle"></i>
                         </span>
                     </p>
@@ -38,7 +38,7 @@
                     <td><i class="fa <?= $this->file->icon($file['name']) ?> fa-fw"></i></td>
                     <td>
                         <?= $this->e($file['name']) ?>
-                        <span class="tooltip" title='<?= t('uploaded by: %s', $file['user_name'] ?: $file['username']).'<br>'.t('uploaded on: %s', dt('%B %e, %Y at %k:%M %p', $file['date'])).'<br>'.t('size: %s', $this->text->bytes($file['size'])) ?>'>
+                        <span class="tooltip" title='<?= t('uploaded by: %s', $file['user_name'] ?: $file['username']).'<br>'.t('uploaded on: %s', $this->dt->datetime($file['date'])).'<br>'.t('size: %s', $this->text->bytes($file['size'])) ?>'>
                             <i class="fa fa-info-circle"></i>
                         </span>
                     </td>
diff --git a/app/Template/listing/show.php b/app/Template/listing/show.php
index c24110f4..e7aa5947 100644
--- a/app/Template/listing/show.php
+++ b/app/Template/listing/show.php
@@ -43,7 +43,7 @@
                     <?php endif ?>
                 </td>
                 <td>
-                    <?= dt('%B %e, %Y', $task['date_due']) ?>
+                    <?= $this->dt->date($task['date_due']) ?>
                 </td>
                 <td>
                     <?php if ($task['is_active'] == \Kanboard\Model\Task::STATUS_OPEN): ?>
diff --git a/app/Template/notification/task_create.php b/app/Template/notification/task_create.php
index 1d834d44..fb7898fc 100644
--- a/app/Template/notification/task_create.php
+++ b/app/Template/notification/task_create.php
@@ -2,11 +2,11 @@
 
 <ul>
     <li>
-        <?= dt('Created on %B %e, %Y at %k:%M %p', $task['date_creation']) ?>
+        <?= t('Created:').' '.$this->dt->datetime($task['date_creation']) ?>
     </li>
     <?php if ($task['date_due']): ?>
     <li>
-        <strong><?= dt('Must be done before %B %e, %Y', $task['date_due']) ?></strong>
+        <strong><?= t('Due date:').' '.$this->dt->date($task['date_due']) ?></strong>
     </li>
     <?php endif ?>
     <?php if (! empty($task['creator_username'])): ?>
diff --git a/app/Template/notification/task_overdue.php b/app/Template/notification/task_overdue.php
index a231937b..d7e6ff5a 100644
--- a/app/Template/notification/task_overdue.php
+++ b/app/Template/notification/task_overdue.php
@@ -9,7 +9,7 @@
             <?php else: ?>
                 <?= $this->e($task['title']) ?>
             <?php endif ?>
-            (<?= dt('%B %e, %Y', $task['date_due']) ?>)
+            (<?= $this->dt->date($task['date_due']) ?>)
             <?php if ($task['assignee_username']): ?>
                 (<strong><?= t('Assigned to %s', $task['assignee_name'] ?: $task['assignee_username']) ?></strong>)
             <?php endif ?>
diff --git a/app/Template/project/index.php b/app/Template/project/index.php
index c5dd267c..8d384e58 100644
--- a/app/Template/project/index.php
+++ b/app/Template/project/index.php
@@ -57,10 +57,10 @@
                     <?= $this->url->link($this->e($project['name']), 'project', 'show', array('project_id' => $project['id'])) ?>
                 </td>
                 <td>
-                    <?= $project['start_date'] ?>
+                    <?= $this->dt->date($project['start_date']) ?>
                 </td>
                 <td>
-                    <?= $project['end_date'] ?>
+                    <?= $this->dt->date($project['end_date']) ?>
                 </td>
                 <td>
                     <?php if ($project['owner_id'] > 0): ?>
diff --git a/app/Template/project/show.php b/app/Template/project/show.php
index 5f1aefc1..166b8902 100644
--- a/app/Template/project/show.php
+++ b/app/Template/project/show.php
@@ -21,15 +21,15 @@
     <?php endif ?>
 
     <?php if ($project['last_modified']): ?>
-        <li><?= dt('Last modified on %B %e, %Y at %k:%M %p', $project['last_modified']) ?></li>
+        <li><?= t('Modified:').' '.$this->dt->datetime($project['last_modified']) ?></li>
     <?php endif ?>
 
     <?php if ($project['start_date']): ?>
-        <li><?= t('Start date: %s', $project['start_date']) ?></li>
+        <li><?= t('Start date: ').$this->dt->date($project['start_date']) ?></li>
     <?php endif ?>
 
     <?php if ($project['end_date']): ?>
-        <li><?= t('End date: %s', $project['end_date']) ?></li>
+        <li><?= t('End date: ').$this->dt->date($project['end_date']) ?></li>
     <?php endif ?>
 
     <?php if ($stats['nb_tasks'] > 0): ?>
diff --git a/app/Template/project_user/tasks.php b/app/Template/project_user/tasks.php
index f4fc2723..8d1cbd96 100644
--- a/app/Template/project_user/tasks.php
+++ b/app/Template/project_user/tasks.php
@@ -33,10 +33,10 @@
                 <?php endif ?>
             </td>
             <td>
-                <?= dt('%B %e, %Y', $task['date_started']) ?>
+                <?= $this->dt->date($task['date_started']) ?>
             </td>
             <td>
-                <?= dt('%B %e, %Y', $task['date_due']) ?>
+                <?= $this->dt->date($task['date_due']) ?>
             </td>
         </tr>
         <?php endforeach ?>
diff --git a/app/Template/search/results.php b/app/Template/search/results.php
index 88eed87c..3bb0e603 100644
--- a/app/Template/search/results.php
+++ b/app/Template/search/results.php
@@ -38,7 +38,7 @@
             <?php endif ?>
         </td>
         <td>
-            <?= dt('%B %e, %Y', $task['date_due']) ?>
+            <?= $this->dt->date($task['date_due']) ?>
         </td>
         <td>
             <?php if ($task['is_active'] == \Kanboard\Model\Task::STATUS_OPEN): ?>
diff --git a/app/Template/task/changes.php b/app/Template/task/changes.php
index f288a8f4..db844857 100644
--- a/app/Template/task/changes.php
+++ b/app/Template/task/changes.php
@@ -31,7 +31,7 @@
                     if (empty($task['date_due'])) {
                         echo '<li>'.t('The due date have been removed').'</li>';
                     } else {
-                        echo '<li>'.dt('New due date: %B %e, %Y', $task['date_due']).'</li>';
+                        echo '<li>'.t('New due date: ').$this->dt->date($task['date_due']).'</li>';
                     }
                     break;
                 case 'description':
@@ -56,7 +56,7 @@
                     break;
                 case 'date_started':
                     if ($value != 0) {
-                        echo '<li>'.dt('Start date changed: %B %e, %Y', $task['date_started']).'</li>';
+                        echo '<li>'.t('Start date changed: ').$this->dt->datetime($task['date_started']).'</li>';
                     }
                     break;
                 default:
diff --git a/app/Template/task/details.php b/app/Template/task/details.php
index 838eb260..5c2e3cff 100644
--- a/app/Template/task/details.php
+++ b/app/Template/task/details.php
@@ -79,7 +79,7 @@
                 <?php if ($task['date_due']): ?>
                 <li>
                     <strong><?= t('Due date:') ?></strong>
-                    <span><?= dt('%B %e, %Y', $task['date_due']) ?></span>
+                    <span><?= $this->dt->date($task['date_due']) ?></span>
                 </li>
                 <?php endif ?>
                 <?php if ($task['time_estimated']): ?>
@@ -100,28 +100,28 @@
             <ul class="no-bullet">
                 <li>
                     <strong><?= t('Created:') ?></strong>
-                    <span><?= dt('%B %e, %Y at %k:%M %p', $task['date_creation']) ?></span>
+                    <span><?= $this->dt->datetime($task['date_creation']) ?></span>
                 </li>
                 <li>
                     <strong><?= t('Modified:') ?></strong>
-                    <span><?= dt('%B %e, %Y at %k:%M %p', $task['date_modification']) ?></span>
+                    <span><?= $this->dt->datetime($task['date_modification']) ?></span>
                 </li>
                 <?php if ($task['date_completed']): ?>
                 <li>
                     <strong><?= t('Completed:') ?></strong>
-                    <span><?= dt('%B %e, %Y at %k:%M %p', $task['date_completed']) ?></span>
+                    <span><?= $this->dt->datetime($task['date_completed']) ?></span>
                 </li>
                 <?php endif ?>
                 <?php if ($task['date_started']): ?>
                 <li>
                     <strong><?= t('Started:') ?></strong>
-                    <span><?= dt('%B %e, %Y at %k:%M %p', $task['date_started']) ?></span>
+                    <span><?= $this->dt->datetime($task['date_started']) ?></span>
                 </li>
                 <?php endif ?>
                 <?php if ($task['date_moved']): ?>
                 <li>
                     <strong><?= t('Moved:') ?></strong>
-                    <span><?= dt('%B %e, %Y at %k:%M %p', $task['date_moved']) ?></span>
+                    <span><?= $this->dt->datetime($task['date_moved']) ?></span>
                 </li>
                 <?php endif ?>
             </ul>
diff --git a/app/Template/task/time_tracking_details.php b/app/Template/task/time_tracking_details.php
index 85ad5567..147c5109 100644
--- a/app/Template/task/time_tracking_details.php
+++ b/app/Template/task/time_tracking_details.php
@@ -16,8 +16,8 @@
         <tr>
             <td><?= $this->url->link($this->e($record['user_fullname'] ?: $record['username']), 'user', 'show', array('user_id' => $record['user_id'])) ?></td>
             <td><?= t($record['subtask_title']) ?></td>
-            <td><?= dt('%B %e, %Y at %k:%M %p', $record['start']) ?></td>
-            <td><?= dt('%B %e, %Y at %k:%M %p', $record['end']) ?></td>
+            <td><?= $this->dt->datetime($record['start']) ?></td>
+            <td><?= $this->dt->datetime($record['end']) ?></td>
             <td><?= n($record['time_spent']).' '.t('hours') ?></td>
         </tr>
         <?php endforeach ?>
diff --git a/app/Template/task/transitions.php b/app/Template/task/transitions.php
index 2ca2387f..d79c2fd9 100644
--- a/app/Template/task/transitions.php
+++ b/app/Template/task/transitions.php
@@ -15,7 +15,7 @@
         </tr>
         <?php foreach ($transitions as $transition): ?>
         <tr>
-            <td><?= dt('%B %e, %Y at %k:%M %p', $transition['date']) ?></td>
+            <td><?= $this->dt->datetime($transition['date']) ?></td>
             <td><?= $this->e($transition['src_column']) ?></td>
             <td><?= $this->e($transition['dst_column']) ?></td>
             <td><?= $this->url->link($this->e($transition['name'] ?: $transition['username']), 'user', 'show', array('user_id' => $transition['user_id'])) ?></td>
diff --git a/app/Template/task_external_link/show.php b/app/Template/task_external_link/show.php
index 2dc3d1dd..12d8e4f6 100644
--- a/app/Template/task_external_link/show.php
+++ b/app/Template/task_external_link/show.php
@@ -31,7 +31,7 @@
                     <?= $this->e($link['creator_name'] ?: $link['creator_username']) ?>
                 </td>
                 <td>
-                    <?= dt('%B %e, %Y', $link['date_creation']) ?>
+                    <?= $this->dt->date($link['date_creation']) ?>
                 </td>
                 <?php if ($this->user->hasProjectAccess('TaskExternalLink', 'edit', $task['project_id'])): ?>
                 <td>
diff --git a/app/Template/user/last.php b/app/Template/user/last.php
index 8879466e..d6c86391 100644
--- a/app/Template/user/last.php
+++ b/app/Template/user/last.php
@@ -14,7 +14,7 @@
     </tr>
     <?php foreach ($last_logins as $login): ?>
     <tr>
-        <td><?= dt('%B %e, %Y at %k:%M %p', $login['date_creation']) ?></td>
+        <td><?= $this->dt->datetime($login['date_creation']) ?></td>
         <td><?= $this->e($login['auth_type']) ?></td>
         <td><?= $this->e($login['ip']) ?></td>
         <td><?= $this->e($login['user_agent']) ?></td>
diff --git a/app/Template/user/password_reset.php b/app/Template/user/password_reset.php
index b4c9a0c4..4e9063ef 100644
--- a/app/Template/user/password_reset.php
+++ b/app/Template/user/password_reset.php
@@ -15,8 +15,8 @@
     </tr>
     <?php foreach ($tokens as $token): ?>
     <tr>
-        <td><?= dt('%B %e, %Y at %k:%M %p', $token['date_creation']) ?></td>
-        <td><?= dt('%B %e, %Y at %k:%M %p', $token['date_expiration']) ?></td>
+        <td><?= $this->dt->datetime($token['date_creation']) ?></td>
+        <td><?= $this->dt->datetime($token['date_expiration']) ?></td>
         <td><?= $token['is_active'] == 0 ? t('No') : t('Yes') ?></td>
         <td><?= $this->e($token['ip']) ?></td>
         <td><?= $this->e($token['user_agent']) ?></td>
diff --git a/app/Template/user/sessions.php b/app/Template/user/sessions.php
index 7a66c5ad..8db02430 100644
--- a/app/Template/user/sessions.php
+++ b/app/Template/user/sessions.php
@@ -15,8 +15,8 @@
     </tr>
     <?php foreach ($sessions as $session): ?>
     <tr>
-        <td><?= dt('%B %e, %Y at %k:%M %p', $session['date_creation']) ?></td>
-        <td><?= dt('%B %e, %Y at %k:%M %p', $session['expiration']) ?></td>
+        <td><?= $this->dt->datetime($session['date_creation']) ?></td>
+        <td><?= $this->dt->datetime($session['expiration']) ?></td>
         <td><?= $this->e($session['ip']) ?></td>
         <td><?= $this->e($session['user_agent']) ?></td>
         <td><?= $this->url->link(t('Remove'), 'User', 'removeSession', array('user_id' => $user['id'], 'id' => $session['id']), true) ?></td>
diff --git a/app/Template/user/timesheet.php b/app/Template/user/timesheet.php
index 5c0d3af8..4a6e42c5 100644
--- a/app/Template/user/timesheet.php
+++ b/app/Template/user/timesheet.php
@@ -18,8 +18,8 @@
         <tr>
             <td><?= $this->url->link($this->e($record['task_title']), 'task', 'show', array('project_id' => $record['project_id'], 'task_id' => $record['task_id'])) ?></td>
             <td><?= $this->url->link($this->e($record['subtask_title']), 'task', 'show', array('project_id' => $record['project_id'], 'task_id' => $record['task_id'])) ?></td>
-            <td><?= dt('%B %e, %Y at %k:%M %p', $record['start']) ?></td>
-            <td><?= dt('%B %e, %Y at %k:%M %p', $record['end']) ?></td>
+            <td><?= $this->dt->datetime($record['start']) ?></td>
+            <td><?= $this->dt->datetime($record['end']) ?></td>
             <td><?= n($record['time_spent']).' '.t('hours') ?></td>
         </tr>
         <?php endforeach ?>
diff --git a/app/Validator/TaskValidator.php b/app/Validator/TaskValidator.php
index 7b73aeba..1a77dd32 100644
--- a/app/Validator/TaskValidator.php
+++ b/app/Validator/TaskValidator.php
@@ -40,8 +40,8 @@ class TaskValidator extends Base
             new Validators\Integer('priority', t('This value must be an integer')),
             new Validators\MaxLength('title', t('The maximum length is %d characters', 200), 200),
             new Validators\MaxLength('reference', t('The maximum length is %d characters', 50), 50),
-            new Validators\Date('date_due', t('Invalid date'), $this->dateParser->getDateFormats()),
-            new Validators\Date('date_started', t('Invalid date'), $this->dateParser->getAllFormats()),
+            new Validators\Date('date_due', t('Invalid date'), $this->dateParser->getDateFormats(true)),
+            new Validators\Date('date_started', t('Invalid date'), $this->dateParser->getDateTimeFormats(true)),
             new Validators\Numeric('time_spent', t('This value must be numeric')),
             new Validators\Numeric('time_estimated', t('This value must be numeric')),
         );
diff --git a/app/functions.php b/app/functions.php
index fe6e6757..b9b30834 100644
--- a/app/functions.php
+++ b/app/functions.php
@@ -31,13 +31,3 @@ function n($value)
 {
     return Translator::getInstance()->number($value);
 }
-
-/**
- * Translate a date
- *
- * @return string
- */
-function dt($format, $timestamp)
-{
-    return Translator::getInstance()->datetime($format, $timestamp);
-}
diff --git a/doc/translations.markdown b/doc/translations.markdown
index 629c4355..00707e1c 100644
--- a/doc/translations.markdown
+++ b/doc/translations.markdown
@@ -5,7 +5,7 @@ How to translate Kanboard to a new language?
 --------------------------------------------
 
 - Translations are stored inside the directory `app/Locale`
-- There is subdirectory for each language, for example in French we have `fr_FR`, Italian `it_IT` etc.
+- There is a subdirectory for each language, for example in French we have `fr_FR`, Italian `it_IT` etc.
 - A translation is a PHP file that returns an Array with a key-value pairs
 - The key is the original text in English and the value is the translation of the corresponding language
 - **French translations are always up to date**
@@ -34,20 +34,9 @@ Translations are displayed with the following functions in the source code:
 
 - `t()`: display text with HTML escaping
 - `e()`: display text without HTML escaping
-- `dt()`: display date and time using the `strftime()` function formats
 
 Always use the english version in the source code.
 
-### Date and time translation
-
-Date strings use the function `strftime()` to format the date.
-
-For example, the original English version can be defined like that `Created on %B %e, %Y at %k:%M %p` and that will output something like that `Created on January 11, 2015 at 15:19 PM`. The French version can be modified to display a different format, `Créé le %d/%m/%Y à %H:%M` and the result will be `Créé le 11/01/2015 à 15:19`.
-
-All formats are available in the [PHP documentation](http://php.net/strftime).
-
-### Placeholders
-
 Text strings use the function `sprintf()` to replace elements:
 
 - `%s` is used to replace a string
diff --git a/tests/units/Core/DateParserTest.php b/tests/units/Core/DateParserTest.php
index 0d345784..dc3366b3 100644
--- a/tests/units/Core/DateParserTest.php
+++ b/tests/units/Core/DateParserTest.php
@@ -6,79 +6,167 @@ use Kanboard\Core\DateParser;
 
 class DateParserTest extends Base
 {
+    public function testGetTimeFormats()
+    {
+        $dateParser = new DateParser($this->container);
+        $this->assertCount(2, $dateParser->getTimeFormats());
+        $this->assertContains('H:i', $dateParser->getTimeFormats());
+        $this->assertContains('g:i a', $dateParser->getTimeFormats());
+    }
+
+    public function testGetDateFormats()
+    {
+        $dateParser = new DateParser($this->container);
+        $this->assertCount(4, $dateParser->getDateFormats());
+        $this->assertCount(6, $dateParser->getDateFormats(true));
+        $this->assertContains('d/m/Y', $dateParser->getDateFormats());
+        $this->assertNotContains('Y-m-d', $dateParser->getDateFormats());
+        $this->assertContains('Y-m-d', $dateParser->getDateFormats(true));
+    }
+
+    public function testGetDateTimeFormats()
+    {
+        $dateParser = new DateParser($this->container);
+        $this->assertCount(8, $dateParser->getDateTimeFormats());
+        $this->assertCount(12, $dateParser->getDateTimeFormats(true));
+        $this->assertContains('d/m/Y H:i', $dateParser->getDateTimeFormats());
+        $this->assertNotContains('Y-m-d H:i', $dateParser->getDateTimeFormats());
+        $this->assertContains('Y-m-d g:i a', $dateParser->getDateTimeFormats(true));
+    }
+
+    public function testGetAllDateFormats()
+    {
+        $dateParser = new DateParser($this->container);
+        $this->assertCount(12, $dateParser->getAllDateFormats());
+        $this->assertCount(18, $dateParser->getAllDateFormats(true));
+        $this->assertContains('d/m/Y', $dateParser->getAllDateFormats());
+        $this->assertContains('d/m/Y H:i', $dateParser->getAllDateFormats());
+        $this->assertNotContains('Y-m-d H:i', $dateParser->getAllDateFormats());
+        $this->assertContains('Y-m-d g:i a', $dateParser->getAllDateFormats(true));
+        $this->assertContains('Y-m-d', $dateParser->getAllDateFormats(true));
+    }
+
+    public function testGetAllAvailableFormats()
+    {
+        $dateParser = new DateParser($this->container);
+
+        $formats = $dateParser->getAvailableFormats($dateParser->getDateFormats());
+        $this->assertArrayHasKey('d/m/Y', $formats);
+        $this->assertContains(date('d/m/Y'), $formats);
+
+        $formats = $dateParser->getAvailableFormats($dateParser->getDateTimeFormats());
+        $this->assertArrayHasKey('d/m/Y H:i', $formats);
+        $this->assertContains(date('d/m/Y H:i'), $formats);
+
+        $formats = $dateParser->getAvailableFormats($dateParser->getAllDateFormats());
+        $this->assertArrayHasKey('d/m/Y', $formats);
+        $this->assertContains(date('d/m/Y'), $formats);
+        $this->assertArrayHasKey('d/m/Y H:i', $formats);
+        $this->assertContains(date('d/m/Y H:i'), $formats);
+    }
+
+    public function testGetTimestamp()
+    {
+        $dateParser = new DateParser($this->container);
+
+        $this->assertEquals(1393995600, $dateParser->getTimestamp(1393995600));
+        $this->assertEquals('2014-03-05', date('Y-m-d', $dateParser->getTimestamp('2014-03-05')));
+        $this->assertEquals('2014-03-05', date('Y-m-d', $dateParser->getTimestamp('2014_03_05')));
+        $this->assertEquals('2014-03-05', date('Y-m-d', $dateParser->getTimestamp('03/05/2014')));
+        $this->assertEquals('2014-03-25 17:18', date('Y-m-d H:i', $dateParser->getTimestamp('03/25/2014 5:18 pm')));
+        $this->assertEquals('2014-03-25 05:18', date('Y-m-d H:i', $dateParser->getTimestamp('03/25/2014 5:18 am')));
+        $this->assertEquals('2014-03-25 17:18', date('Y-m-d H:i', $dateParser->getTimestamp('03/25/2014 5:18pm')));
+        $this->assertEquals('2014-03-25 23:14', date('Y-m-d H:i', $dateParser->getTimestamp('03/25/2014 23:14')));
+        $this->assertEquals('2014-03-29 23:14', date('Y-m-d H:i', $dateParser->getTimestamp('2014_03_29 23:14')));
+        $this->assertEquals('2014-03-29 23:14', date('Y-m-d H:i', $dateParser->getTimestamp('2014-03-29 23:14')));
+    }
+
     public function testDateRange()
     {
-        $d = new DateParser($this->container);
+        $dateParser = new DateParser($this->container);
 
-        $this->assertTrue($d->withinDateRange(new DateTime('2015-03-14 15:30:00'), new DateTime('2015-03-14 15:00:00'), new DateTime('2015-03-14 16:00:00')));
-        $this->assertFalse($d->withinDateRange(new DateTime('2015-03-14 15:30:00'), new DateTime('2015-03-14 16:00:00'), new DateTime('2015-03-14 17:00:00')));
+        $this->assertTrue($dateParser->withinDateRange(new DateTime('2015-03-14 15:30:00'), new DateTime('2015-03-14 15:00:00'), new DateTime('2015-03-14 16:00:00')));
+        $this->assertFalse($dateParser->withinDateRange(new DateTime('2015-03-14 15:30:00'), new DateTime('2015-03-14 16:00:00'), new DateTime('2015-03-14 17:00:00')));
+    }
+
+    public function testGetHours()
+    {
+        $dateParser = new DateParser($this->container);
+
+        $this->assertEquals(1, $dateParser->getHours(new DateTime('2015-03-14 15:00:00'), new DateTime('2015-03-14 16:00:00')));
+        $this->assertEquals(2.5, $dateParser->getHours(new DateTime('2015-03-14 15:00:00'), new DateTime('2015-03-14 17:30:00')));
+        $this->assertEquals(2.75, $dateParser->getHours(new DateTime('2015-03-14 15:00:00'), new DateTime('2015-03-14 17:45:00')));
+        $this->assertEquals(3, $dateParser->getHours(new DateTime('2015-03-14 14:57:00'), new DateTime('2015-03-14 17:58:00')));
+        $this->assertEquals(3, $dateParser->getHours(new DateTime('2015-03-14 14:57:00'), new DateTime('2015-03-14 11:58:00')));
     }
 
     public function testRoundSeconds()
     {
-        $d = new DateParser($this->container);
-        $this->assertEquals('16:30', date('H:i', $d->getRoundedSeconds(strtotime('16:28'))));
-        $this->assertEquals('16:00', date('H:i', $d->getRoundedSeconds(strtotime('16:02'))));
-        $this->assertEquals('16:15', date('H:i', $d->getRoundedSeconds(strtotime('16:14'))));
-        $this->assertEquals('17:00', date('H:i', $d->getRoundedSeconds(strtotime('16:58'))));
+        $dateParser = new DateParser($this->container);
+        $this->assertEquals('16:30', date('H:i', $dateParser->getRoundedSeconds(strtotime('16:28'))));
+        $this->assertEquals('16:00', date('H:i', $dateParser->getRoundedSeconds(strtotime('16:02'))));
+        $this->assertEquals('16:15', date('H:i', $dateParser->getRoundedSeconds(strtotime('16:14'))));
+        $this->assertEquals('17:00', date('H:i', $dateParser->getRoundedSeconds(strtotime('16:58'))));
     }
 
-    public function testGetHours()
+    public function testGetIsoDate()
     {
-        $d = new DateParser($this->container);
+        $dateParser = new DateParser($this->container);
+
+        $this->assertEquals('2016-02-06', $dateParser->getIsoDate(1454786217));
+        $this->assertEquals('2014-03-05', $dateParser->getIsoDate('2014-03-05'));
+        $this->assertEquals('2014-03-05', $dateParser->getIsoDate('2014_03_05'));
+        $this->assertEquals('2014-03-05', $dateParser->getIsoDate('03/05/2014'));
+        $this->assertEquals('2014-03-25', $dateParser->getIsoDate('03/25/2014 5:18 pm'));
+        $this->assertEquals('2014-03-25', $dateParser->getIsoDate('03/25/2014 5:18 am'));
+        $this->assertEquals('2014-03-25', $dateParser->getIsoDate('03/25/2014 5:18pm'));
+        $this->assertEquals('2014-03-25', $dateParser->getIsoDate('03/25/2014 23:14'));
+        $this->assertEquals('2014-03-29', $dateParser->getIsoDate('2014_03_29 23:14'));
+        $this->assertEquals('2014-03-29', $dateParser->getIsoDate('2014-03-29 23:14'));
+    }
 
-        $this->assertEquals(1, $d->getHours(new DateTime('2015-03-14 15:00:00'), new DateTime('2015-03-14 16:00:00')));
-        $this->assertEquals(2.5, $d->getHours(new DateTime('2015-03-14 15:00:00'), new DateTime('2015-03-14 17:30:00')));
-        $this->assertEquals(2.75, $d->getHours(new DateTime('2015-03-14 15:00:00'), new DateTime('2015-03-14 17:45:00')));
-        $this->assertEquals(3, $d->getHours(new DateTime('2015-03-14 14:57:00'), new DateTime('2015-03-14 17:58:00')));
-        $this->assertEquals(3, $d->getHours(new DateTime('2015-03-14 14:57:00'), new DateTime('2015-03-14 11:58:00')));
+    public function testGetTimestampFromIsoFormat()
+    {
+        $dateParser = new DateParser($this->container);
+        $this->assertEquals('2014-03-05 00:00', date('Y-m-d H:i', $dateParser->getTimestampFromIsoFormat('2014-03-05')));
+        $this->assertEquals(date('Y-m-d 00:00', strtotime('+2 days')), date('Y-m-d H:i', $dateParser->getTimestampFromIsoFormat(strtotime('+2 days'))));
     }
 
-    public function testValidDate()
+    public function testRemoveTimeFromTimestamp()
     {
-        $d = new DateParser($this->container);
-
-        $this->assertEquals('2014-03-05', date('Y-m-d', $d->getValidDate('2014-03-05', 'Y-m-d')));
-        $this->assertEquals('2014-03-05', date('Y-m-d', $d->getValidDate('2014_03_05', 'Y_m_d')));
-        $this->assertEquals('2014-03-05', date('Y-m-d', $d->getValidDate('05/03/2014', 'd/m/Y')));
-        $this->assertEquals('2014-03-05', date('Y-m-d', $d->getValidDate('03/05/2014', 'm/d/Y')));
-        $this->assertEquals('2014-03-05', date('Y-m-d', $d->getValidDate('3/5/2014', 'm/d/Y')));
-        $this->assertEquals('2014-03-05', date('Y-m-d', $d->getValidDate('5/3/2014', 'd/m/Y')));
-        $this->assertEquals('2014-03-05', date('Y-m-d', $d->getValidDate('5/3/14', 'd/m/y')));
-        $this->assertEquals(0, $d->getValidDate('5/3/14', 'd/m/Y'));
-        $this->assertEquals(0, $d->getValidDate('5-3-2014', 'd/m/Y'));
+        $dateParser = new DateParser($this->container);
+        $this->assertEquals('2016-02-06 00:00', date('Y-m-d H:i', $dateParser->removeTimeFromTimestamp(1454786217)));
     }
 
-    public function testGetTimestamp()
+    public function testFormat()
     {
-        $d = new DateParser($this->container);
-
-        $this->assertEquals('2014-03-05', date('Y-m-d', $d->getTimestamp('2014-03-05')));
-        $this->assertEquals('2014-03-05', date('Y-m-d', $d->getTimestamp('2014_03_05')));
-        $this->assertEquals('2014-03-05', date('Y-m-d', $d->getTimestamp('03/05/2014')));
-        $this->assertEquals('2014-03-25 17:18', date('Y-m-d H:i', $d->getTimestamp('03/25/2014 5:18 pm')));
-        $this->assertEquals('2014-03-25 05:18', date('Y-m-d H:i', $d->getTimestamp('03/25/2014 5:18 am')));
-        $this->assertEquals('2014-03-25 05:18', date('Y-m-d H:i', $d->getTimestamp('03/25/2014 5:18am')));
-        $this->assertEquals('2014-03-25 23:14', date('Y-m-d H:i', $d->getTimestamp('03/25/2014 23:14')));
-        $this->assertEquals('2014-03-29 23:14', date('Y-m-d H:i', $d->getTimestamp('2014_03_29 23:14')));
-        $this->assertEquals('2014-03-29 23:14', date('Y-m-d H:i', $d->getTimestamp('2014-03-29 23:14')));
+        $dateParser = new DateParser($this->container);
+        $values['date'] = '1454787006';
+
+        $this->assertEquals(array('date' => '06/02/2016'), $dateParser->format($values, array('date'), 'd/m/Y'));
+        $this->assertEquals(array('date' => '02/06/2016 7:30 pm'), $dateParser->format($values, array('date'), 'm/d/Y g:i a'));
     }
 
     public function testConvert()
     {
-        $d = new DateParser($this->container);
-
+        $dateParser = new DateParser($this->container);
         $values = array(
             'date_due' => '2015-01-25',
-            'date_started' => '2015_01_25',
+            'date_started' => '2015-01-25 17:25',
         );
 
-        $d->convert($values, array('date_due', 'date_started'));
+        $this->assertEquals(
+            array('date_due' => 1422144000, 'date_started' => 1422144000),
+            $dateParser->convert($values, array('date_due', 'date_started'))
+        );
 
-        $this->assertEquals(mktime(0, 0, 0, 1, 25, 2015), $values['date_due']);
-        $this->assertEquals('2015-01-25', date('Y-m-d', $values['date_due']));
+        $values = array(
+            'date_started' => '2015-01-25 17:25',
+        );
 
-        $this->assertEquals(mktime(0, 0, 0, 1, 25, 2015), $values['date_started']);
-        $this->assertEquals('2015-01-25', date('Y-m-d', $values['date_started']));
+        $this->assertEquals(
+            array('date_started' => 1422206700),
+            $dateParser->convert($values, array('date_due', 'date_started'), true)
+        );
     }
 }
diff --git a/tests/units/Helper/DatetimeHelperTest.php b/tests/units/Helper/DatetimeHelperTest.php
index 8e9c461b..f27a2eb9 100644
--- a/tests/units/Helper/DatetimeHelperTest.php
+++ b/tests/units/Helper/DatetimeHelperTest.php
@@ -6,23 +6,45 @@ use Kanboard\Helper\Dt;
 
 class DatetimeHelperTest extends Base
 {
+    public function testGetTime()
+    {
+        $helper = new Dt($this->container);
+        $this->assertEquals('17:25', $helper->time(1422206700));
+    }
+
+    public function testGetDate()
+    {
+        $helper = new Dt($this->container);
+        $this->assertEquals('01/25/2015', $helper->date(1422206700));
+        $this->assertEquals('01/25/2015', $helper->date('2015-01-25'));
+        $this->assertEquals('', $helper->date('0'));
+        $this->assertEquals('', $helper->date(0));
+        $this->assertEquals('', $helper->date(''));
+    }
+
+    public function testGetDatetime()
+    {
+        $helper = new Dt($this->container);
+        $this->assertEquals('01/25/2015 17:25', $helper->datetime(1422206700));
+    }
+
     public function testAge()
     {
-        $h = new Dt($this->container);
-
-        $this->assertEquals('&lt;15m', $h->age(0, 30));
-        $this->assertEquals('&lt;30m', $h->age(0, 1000));
-        $this->assertEquals('&lt;1h', $h->age(0, 3000));
-        $this->assertEquals('~2h', $h->age(0, 2*3600));
-        $this->assertEquals('1d', $h->age(0, 30*3600));
-        $this->assertEquals('2d', $h->age(0, 65*3600));
+        $helper = new Dt($this->container);
+
+        $this->assertEquals('&lt;15m', $helper->age(0, 30));
+        $this->assertEquals('&lt;30m', $helper->age(0, 1000));
+        $this->assertEquals('&lt;1h', $helper->age(0, 3000));
+        $this->assertEquals('~2h', $helper->age(0, 2*3600));
+        $this->assertEquals('1d', $helper->age(0, 30*3600));
+        $this->assertEquals('2d', $helper->age(0, 65*3600));
     }
 
     public function testGetDayHours()
     {
-        $h = new Dt($this->container);
+        $helper = new Dt($this->container);
 
-        $slots = $h->getDayHours();
+        $slots = $helper->getDayHours();
 
         $this->assertNotEmpty($slots);
         $this->assertCount(48, $slots);
@@ -36,9 +58,9 @@ class DatetimeHelperTest extends Base
 
     public function testGetWeekDays()
     {
-        $h = new Dt($this->container);
+        $helper = new Dt($this->container);
 
-        $slots = $h->getWeekDays();
+        $slots = $helper->getWeekDays();
 
         $this->assertNotEmpty($slots);
         $this->assertCount(7, $slots);
@@ -48,9 +70,9 @@ class DatetimeHelperTest extends Base
 
     public function testGetWeekDay()
     {
-        $h = new Dt($this->container);
+        $helper = new Dt($this->container);
 
-        $this->assertEquals('Monday', $h->getWeekDay(1));
-        $this->assertEquals('Sunday', $h->getWeekDay(7));
+        $this->assertEquals('Monday', $helper->getWeekDay(1));
+        $this->assertEquals('Sunday', $helper->getWeekDay(7));
     }
 }
diff --git a/tests/units/Model/TaskCreationTest.php b/tests/units/Model/TaskCreationTest.php
index 19b3b0d1..781a7147 100644
--- a/tests/units/Model/TaskCreationTest.php
+++ b/tests/units/Model/TaskCreationTest.php
@@ -295,7 +295,7 @@ class TaskCreationTest extends Base
         $task = $tf->getById(2);
         $this->assertNotEmpty($task);
         $this->assertEquals(2, $task['id']);
-        $this->assertEquals($timestamp, $task['date_due']);
+        $this->assertEquals(date('Y-m-d 00:00', $timestamp), date('Y-m-d 00:00', $task['date_due']));
 
         $task = $tf->getById(3);
         $this->assertEquals(3, $task['id']);
@@ -422,6 +422,6 @@ class TaskCreationTest extends Base
 
         $task = $tf->getById(1);
         $this->assertNotEmpty($task);
-        $this->assertEquals('2050-01-10 12:30', date('Y-m-d H:i', $task['date_due']));
+        $this->assertEquals('2050-01-10 00:00', date('Y-m-d H:i', $task['date_due']));
     }
 }
diff --git a/tests/units/Model/TaskDuplicationTest.php b/tests/units/Model/TaskDuplicationTest.php
index 798b3835..8649c6b0 100644
--- a/tests/units/Model/TaskDuplicationTest.php
+++ b/tests/units/Model/TaskDuplicationTest.php
@@ -2,6 +2,7 @@
 
 require_once __DIR__.'/../Base.php';
 
+use Kanboard\Core\DateParser;
 use Kanboard\Model\Task;
 use Kanboard\Model\TaskCreation;
 use Kanboard\Model\TaskDuplication;
@@ -665,6 +666,7 @@ class TaskDuplicationTest extends Base
         $tf = new TaskFinder($this->container);
         $p = new Project($this->container);
         $c = new Category($this->container);
+        $dp = new DateParser($this->container);
 
         $this->assertEquals(1, $p->create(array('name' => 'test1')));
 
@@ -685,7 +687,7 @@ class TaskDuplicationTest extends Base
         $this->assertNotEmpty($task);
         $this->assertEquals(Task::RECURRING_STATUS_PROCESSED, $task['recurrence_status']);
         $this->assertEquals(2, $task['recurrence_child']);
-        $this->assertEquals(1436561776, $task['date_due'], '', 2);
+        $this->assertEquals(1436486400, $task['date_due'], '', 2);
 
         $task = $tf->getById(2);
         $this->assertNotEmpty($task);
@@ -695,6 +697,6 @@ class TaskDuplicationTest extends Base
         $this->assertEquals(Task::RECURRING_BASEDATE_TRIGGERDATE, $task['recurrence_basedate']);
         $this->assertEquals(1, $task['recurrence_parent']);
         $this->assertEquals(2, $task['recurrence_factor']);
-        $this->assertEquals(strtotime('+2 days'), $task['date_due'], '', 2);
+        $this->assertEquals($dp->removeTimeFromTimestamp(strtotime('+2 days')), $task['date_due'], '', 2);
     }
 }
-- 
cgit v1.2.3