From bae57838c2dd789064b246308c7cb3a33bba5b8e Mon Sep 17 00:00:00 2001
From: Frédéric Guillot <fred@kanboard.net>
Date: Sun, 5 Oct 2014 11:22:10 -0400
Subject: Input date format is now a config parameter instead of the current
 locale

---
 app/Templates/config_application.php | 4 ++++
 app/Templates/project_export.php     | 4 ++--
 app/Templates/task_edit.php          | 2 +-
 app/Templates/task_new.php           | 2 +-
 4 files changed, 8 insertions(+), 4 deletions(-)

(limited to 'app/Templates')

diff --git a/app/Templates/config_application.php b/app/Templates/config_application.php
index 251a45dc..97071bd0 100644
--- a/app/Templates/config_application.php
+++ b/app/Templates/config_application.php
@@ -16,6 +16,10 @@
     <?= Helper\form_label(t('Timezone'), 'application_timezone') ?>
     <?= Helper\form_select('application_timezone', $timezones, $values, $errors) ?><br/>
 
+    <?= Helper\form_label(t('Date format'), 'application_date_format') ?>
+    <?= Helper\form_select('application_date_format', $date_formats, $values, $errors) ?><br/>
+    <p class="form-help"><?= t('ISO format is always accepted, example: "%s" and "%s"', date('Y-m-d'), date('Y_m_d')) ?></p>
+
     <div class="form-actions">
         <input type="submit" value="<?= t('Save') ?>" class="btn btn-blue"/>
     </div>
diff --git a/app/Templates/project_export.php b/app/Templates/project_export.php
index 46b4f369..02eb389f 100644
--- a/app/Templates/project_export.php
+++ b/app/Templates/project_export.php
@@ -11,10 +11,10 @@
     <?= Helper\form_hidden('project_id', $values) ?>
 
     <?= Helper\form_label(t('Start Date'), 'from') ?>
-    <?= Helper\form_text('from', $values, $errors, array('required', 'placeholder="'.t('month/day/year').'"'), 'form-date') ?><br/>
+    <?= Helper\form_text('from', $values, $errors, array('required', 'placeholder="'.Helper\in_list($date_format, $date_formats).'"'), 'form-date') ?><br/>
 
     <?= Helper\form_label(t('End Date'), 'to') ?>
-    <?= Helper\form_text('to', $values, $errors, array('required', 'placeholder="'.t('month/day/year').'"'), 'form-date') ?>
+    <?= Helper\form_text('to', $values, $errors, array('required', 'placeholder="'.Helper\in_list($date_format, $date_formats).'"'), 'form-date') ?>
 
     <div class="form-help"><?= t('Others formats accepted: %s and %s', date('Y-m-d'), date('Y_m_d')) ?></div>
 
diff --git a/app/Templates/task_edit.php b/app/Templates/task_edit.php
index 4038717e..73e00a31 100644
--- a/app/Templates/task_edit.php
+++ b/app/Templates/task_edit.php
@@ -34,7 +34,7 @@
         <?= Helper\form_number('score', $values, $errors) ?><br/>
 
         <?= Helper\form_label(t('Due Date'), 'date_due') ?>
-        <?= Helper\form_text('date_due', $values, $errors, array('placeholder="'.t('month/day/year').'"'), 'form-date') ?><br/>
+        <?= Helper\form_text('date_due', $values, $errors, array('placeholder="'.Helper\in_list($date_format, $date_formats).'"'), 'form-date') ?><br/>
         <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/Templates/task_new.php b/app/Templates/task_new.php
index e07d436c..867bcbc9 100644
--- a/app/Templates/task_new.php
+++ b/app/Templates/task_new.php
@@ -39,7 +39,7 @@
             <?= Helper\form_number('score', $values, $errors) ?><br/>
 
             <?= Helper\form_label(t('Due Date'), 'date_due') ?>
-            <?= Helper\form_text('date_due', $values, $errors, array('placeholder="'.t('month/day/year').'"'), 'form-date') ?><br/>
+            <?= Helper\form_text('date_due', $values, $errors, array('placeholder="'.Helper\in_list($date_format, $date_formats).'"'), 'form-date') ?><br/>
             <div class="form-help"><?= t('Others formats accepted: %s and %s', date('Y-m-d'), date('Y_m_d')) ?></div>
         </div>
 
-- 
cgit v1.2.3