diff --git a/src/IDF/Views/Issue.php b/src/IDF/Views/Issue.php
index cd1ae69..7462aac 100644
--- a/src/IDF/Views/Issue.php
+++ b/src/IDF/Views/Issue.php
@@ -1117,15 +1117,22 @@ class IDF_Views_Issue
     public static function getDateShortcuts()
     {
         return array(
-            'date_today' => date('Y-m-d'),
-            'date_tomorrow' => date('Y-m-d', strtotime('tomorrow')),
-            'date_eow' => date('Y-m-d', strtotime('next friday')),
-            'date_eom' => date('Y-m-d', strtotime('last day of this month')),
-            'date_2_hours' => date('Y-m-d H:i', strtotime('+2 hours')),
-            'date_2_days' => date('Y-m-d', strtotime('+2 days')),
-            'date_1_week' => date('Y-m-d', strtotime('+1 week')),
-            'date_two_weeks' => date('Y-m-d', strtotime('+2 week')),
-            'date_one_month' => date('Y-m-d', strtotime('+1 month')),
+            'date_shortcuts' => array(
+                __('Soon') => array(
+                    __('Today') => date('Y-m-d'),
+                    __('Tomorrow') => date('Y-m-d', strtotime('tomorrow')),
+                    __('2 Days') => date('Y-m-d', strtotime('+2 days')),
+                ),
+                __('Midterm') => array(
+                    __('Friday') => date('Y-m-d', strtotime('next friday')),
+                    __('1 Week') => date('Y-m-d', strtotime('+1 week')),
+                    __('A Fortnight') => date('Y-m-d', strtotime('+2 week')),
+                ),
+                __('Longterm') => array(
+                    __('End of the Month') => date('Y-m-d', strtotime('last day of this month')),
+                    __('1 Month') => date('Y-m-d', strtotime('+1 month')),
+                ),
+            ),
         );
     }
 }
diff --git a/src/IDF/templates/idf/issues/create.html b/src/IDF/templates/idf/issues/create.html
index 8754bdb..42d0560 100644
--- a/src/IDF/templates/idf/issues/create.html
+++ b/src/IDF/templates/idf/issues/create.html
@@ -67,22 +67,17 @@
 <td>{if $form.f.due_dtime.errors}{$form.f.due_dtime.fieldErrors}{/if}
 {$form.f.due_dtime|unsafe}
 <div id="due_dtime_wrapper">
-<a href="#" id="due_dtime_shortcut_link">Date shortcuts&hellip; ▾</a>
+    <a href="#" id="due_dtime_shortcut_link">Date shortcuts&hellip; ▾</a>
+    {if $date_shortcuts}
     <dl id="due_dtime_more_shortcuts" style="display: none">
-        <dt>Soon</dt>
-        <dd><a href="#" rel="{$date_today}" class="due_dtime_shortcut" id="due_dtime_today_more">Today</a></dd>
-        <dd><a href="#" rel="{$date_tomorrow}" class="due_dtime_shortcut" id="due_dtime_tomorrow">Tomorrow</a></dd>
-        <dd><a href="#" rel="{$date_2_days}" class="due_dtime_shortcut" id="due_dtime_2_days">2 Days</a></dd>
-
-        <dt>Midterm</dt>
-        <dd><a href="#" rel="{$date_eow}" class="due_dtime_shortcut" id="due_dtime_eow">End of the Week</a></dd>
-        <dd><a href="#" rel="{$date_1_week}" class="due_dtime_shortcut" id="due_dtime_1_week">1 Week</a></dd>
-        <dd><a href="#" rel="{$date_two_weeks}" class="due_dtime_shortcut" id="due_dtime_two_weeks">A Fortnight</a></dd>
-
-        <dt>Longterm</dt>
-        <dd><a href="#" rel="{$date_eom}" class="due_dtime_shortcut" id="due_dtime_eom">End of the Month</a></dd>
-        <dd><a href="#" rel="{$date_one_month}" class="due_dtime_shortcut" id="due_dtime_one_month">1 Month</a></dd>
+        {foreach $date_shortcuts as $time_span => $shortcuts}
+            <dt>{$time_span}</dt>
+            {foreach $shortcuts as $title => $date}
+                <dd><a href="#" rel="{$date}" class="due_dtime_shortcut">{$title}</a></dd>
+            {/foreach}
+        {/foreach}
     </dl>
+    {/if}
 </div>
 </td>
 <tr>
diff --git a/src/IDF/templates/idf/issues/view.html b/src/IDF/templates/idf/issues/view.html
index 2391204..398a105 100644
--- a/src/IDF/templates/idf/issues/view.html
+++ b/src/IDF/templates/idf/issues/view.html
@@ -132,22 +132,17 @@
 <td>{if $form.f.due_dtime.errors}{$form.f.due_dtime.fieldErrors}{/if}
 {$form.f.due_dtime|unsafe}
 <div id="due_dtime_wrapper">
-<a href="#" id="due_dtime_shortcut_link">Date shortcuts&hellip; ▾</a>
+    <a href="#" id="due_dtime_shortcut_link">Date shortcuts&hellip; ▾</a>
+    {if $date_shortcuts}
     <dl id="due_dtime_more_shortcuts" style="display: none">
-        <dt>Soon</dt>
-        <dd><a href="#" rel="{$date_today}" class="due_dtime_shortcut" id="due_dtime_today_more">Today</a></dd>
-        <dd><a href="#" rel="{$date_tomorrow}" class="due_dtime_shortcut" id="due_dtime_tomorrow">Tomorrow</a></dd>
-        <dd><a href="#" rel="{$date_2_days}" class="due_dtime_shortcut" id="due_dtime_2_days">2 Days</a></dd>
-
-        <dt>Midterm</dt>
-        <dd><a href="#" rel="{$date_eow}" class="due_dtime_shortcut" id="due_dtime_eow">End of the Week</a></dd>
-        <dd><a href="#" rel="{$date_1_week}" class="due_dtime_shortcut" id="due_dtime_1_week">1 Week</a></dd>
-        <dd><a href="#" rel="{$date_two_weeks}" class="due_dtime_shortcut" id="due_dtime_two_weeks">A Fortnight</a></dd>
-
-        <dt>Longterm</dt>
-        <dd><a href="#" rel="{$date_eom}" class="due_dtime_shortcut" id="due_dtime_eom">End of the Month</a></dd>
-        <dd><a href="#" rel="{$date_one_month}" class="due_dtime_shortcut" id="due_dtime_one_month">1 Month</a></dd>
+        {foreach $date_shortcuts as $time_span => $shortcuts}
+            <dt>{$time_span}</dt>
+            {foreach $shortcuts as $title => $date}
+                <dd><a href="#" rel="{$date}" class="due_dtime_shortcut">{$title}</a></dd>
+            {/foreach}
+        {/foreach}
     </dl>
+    {/if}
 </div>
 </td>
 <tr>