Use Horde_Core_Script_Package_Datejs::translateFormat() to translate …

…between JS and PHP date formats (Bug #14303).
horde · Mar 31, 2016 · 3f314cd · 3f314cd
1 parent a53af2f
commit 3f314cd
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 4 deletions.
diff --git a/nag/docs/CHANGES b/nag/docs/CHANGES
@@ -16,6 +16,14 @@ v4.3.0-git
 [jan] Return ETags with browse() API method.
 
 
+------
+v4.2.8
+------
+
+[mjr] Honor date_format prefs in Task form (Bug #14287).
+[jan] Update Greek translation (Limperis Antonis <limperis@cti.gr>).
+
+
 ------
 v4.2.7
 ------

diff --git a/nag/package.xml b/nag/package.xml
@@ -1725,12 +1725,27 @@
    <stability>
     <release>stable</release>
     <api>stable</api></stability>
-   <date>2016-02-02</date>
+   <date>2016-03-21</date>
    <license uri="http://www.horde.org/licenses/gpl">GPL-2.0</license>
    <notes>
+* [mjr] Honor date_format prefs in Task form (Bug #14287).
 * [jan] Update Greek translation (Limperis Antonis &lt;limperis@cti.gr&gt;).
    </notes>
   </release>
+  <release>
+   <version>
+    <release>4.2.9</release>
+    <api>4.2.0</api></version>
+   <stability>
+    <release>stable</release>
+    <api>stable</api></stability>
+   <date>2016-03-21</date>
+   <license uri="http://www.horde.org/licenses/gpl">GPL-2.0</license>
+   <notes>
+* [jan] Fix regression with date picker in tasks form (Bug #14303).
+* [mjr] Fix handling EAS categories/tags.
+   </notes>
+  </release>
   <release>
    <version>
     <release>4.3.0</release>

diff --git a/nag/templates/javascript_defs.php b/nag/templates/javascript_defs.php
@@ -3,9 +3,9 @@
 /* Variables used in core javascript files. */
 $code['conf'] = array(
     'URI_AJAX' => (string)$GLOBALS['registry']->getServiceLink('ajax', 'nag'),
-    'date_format' => str_replace(array('%e', '%d', '%a', '%A', '%m', '%h', '%b', '%B', '%y', '%Y'),
-                                 array('d', 'dd', 'ddd', 'dddd', 'MM', 'MMM', 'MMM', 'MMMM', 'yy', 'yyyy'),
-                                 $GLOBALS['prefs']->getValue('date_format_mini')),
+    'date_format' => Horde_Core_Script_Package_Datejs::translateFormat(
+        $GLOBALS['prefs']->getValue('date_format_mini')
+    ),
     'tasklist_info_url' => (string)Horde::url('tasklists/info.php'),
     'time_format' => $GLOBALS['prefs']->getValue('twentyFour') ? 'HH:mm' : 'hh:mm tt',
 );