CalendarField: changing strftime to date (#44114)

joomla · Nov 13, 2024 · 26c9f50 · 26c9f50
1 parent cb0c4c8
commit 26c9f50
Show file tree

Hide file tree

Showing 2 changed files with 26 additions and 1 deletion.
diff --git a/libraries/src/Form/Field/CalendarField.php b/libraries/src/Form/Field/CalendarField.php
@@ -11,6 +11,7 @@
 
 use Joomla\CMS\Factory;
 use Joomla\CMS\Form\FormField;
+use Joomla\CMS\HTML\HTMLHelper;
 use Joomla\CMS\Language\Text;
 use Joomla\Registry\Registry;
 
@@ -320,7 +321,7 @@ protected function getInput()
                 $date  = \DateTimeImmutable::createFromFormat('U', strtotime($value));
                 $value = $date->format($this->filterFormat);
             } else {
-                $value = strftime($this->format, strtotime($value));
+                $value = date(HTMLHelper::strftimeFormatToDateFormat($this->format), strtotime($value));
             }
 
             date_default_timezone_set($tz);

diff --git a/libraries/src/HTML/HTMLHelper.php b/libraries/src/HTML/HTMLHelper.php
@@ -1271,6 +1271,18 @@ public static function strftimeFormatToDateFormat(string $strftimeformat)
                 '%H',
                 '%M',
                 '%S',
+                '%a',
+                '%A',
+                '%e',
+                '%j',
+                '%u',
+                '%w',
+                '%W',
+                '%b',
+                '%B',
+                '%h',
+                '%g',
+                '%I',
             ],
             [
                 'Y',
@@ -1279,6 +1291,18 @@ public static function strftimeFormatToDateFormat(string $strftimeformat)
                 'H',
                 'i',
                 's',
+                'D',
+                'l',
+                'j',
+                'z',
+                'N',
+                'w',
+                'W',
+                'M',
+                'F',
+                'M',
+                'y',
+                'h',
             ],
             $strftimeformat
         );
-Original file line number
+Diff line change
@@ Expand Up @@
                     '%H',
                     '%M',
                     '%S',
+                    '%a',
+                    '%A',
+                    '%e',
+                    '%j',
+                    '%u',
+                    '%w',
+                    '%W',
+                    '%b',
+                    '%B',
+                    '%h',
+                    '%g',
+                    '%I',
                 ],
                 [
                     'Y',
@@ Expand All @@
                     'H',
                     'i',
                     's',
+                    'D',
+                    'l',
+                    'j',
+                    'z',
+                    'N',
+                    'w',
+                    'W',
+                    'M',
+                    'F',
+                    'M',
+                    'y',
+                    'h',
                 ],
                 $strftimeformat
             );
@@ Expand Down @@