MDL-74379 core: Update date_format_string to use x-os functions

moodle · Jun 30, 2022 · 4fd50e8 · 4fd50e8
1 parent fe88f32
commit 4fd50e8
Showing 1 changed file with 3 additions and 6 deletions.
diff --git a/lib/moodlelib.php b/lib/moodlelib.php
@@ -2354,18 +2354,15 @@ function date_format_string($date, $format, $tz = 99) {
 
     date_default_timezone_set(core_date::get_user_timezone($tz));
 
-    $datearray = getdate($date);
-
-    if (nl_langinfo(AM_STR) == nl_langinfo(PM_STR)) {
-
+    if (strftime('%p', 0) === strftime('%p', HOURSECS * 18)) {
+        $datearray = getdate($date);
         $format = str_replace([
             '%P',
             '%p',
         ], [
             $datearray['hours'] < 12 ? get_string('am', 'langconfig') : get_string('pm', 'langconfig'),
             $datearray['hours'] < 12 ? get_string('amcaps', 'langconfig') : get_string('pmcaps', 'langconfig'),
-            ],
-        $format);
+        ], $format);
     }
 
     $datestring = strftime($format, $date);