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

2022-06-30 10:35:19 +08:00
parent 09858c06d7
commit 694ef721b6
1 changed files with 3 additions and 6 deletions
@@ -2357,18 +2357,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);