Merged changes from STABLE for timezone display

diff --git a/admin/config.html b/admin/config.html
index 0e3290a29cfcdf64897c3a10922996d7e8a4eef4..dbe4db4aaced2525e8c4aeef014f37d555fd7afa 100644 (file)
--- a/admin/config.html
+++ b/admin/config.html
@@ -50,16 +50,17 @@
            $config->timezone = 99;
        }
        $timenow = time();
+       $timeformat = get_string('strftimedaytime');
 
        for ($tz = -26; $tz <= 26; $tz++) {
            $zone = (float)$tz/2.0;
            $usertime = $timenow + ($tz * 1800);
            if ($tz == 0) {
-               $timezones["$zone"] = gmstrftime("%a, %I:%M %p", $usertime)." (GMT)";
+               $timezones["$zone"] = gmstrftime($timeformat, $usertime)." (GMT)";
            } else if ($tz < 0) {
-               $timezones["$zone"] = gmstrftime("%a, %I:%M %p", $usertime)." (GMT$zone)";
+               $timezones["$zone"] = gmstrftime($timeformat, $usertime)." (GMT$zone)";
            } else {
-               $timezones["$zone"] = gmstrftime("%a, %I:%M %p", $usertime)." (GMT+$zone)";
+               $timezones["$zone"] = gmstrftime($timeformat, $usertime)." (GMT+$zone)";
            }
        }
 

diff --git a/admin/timezone.php b/admin/timezone.php
index 0821d18f62d6ea2a51990e3a0c464bb41e983f6f..17d4bfcdc7ef58c4a8b27779f8b1302ed550e95b 100644 (file)
--- a/admin/timezone.php
+++ b/admin/timezone.php
@@ -33,16 +33,17 @@
         $user->timezone = 99;
     }
     $timenow = time();
+    $timeformat = get_string('strftimedaytime');
 
     for ($tz = -26; $tz <= 26; $tz++) {
         $zone = (float)$tz/2.0;
         $usertime = $timenow + ($tz * 1800);
         if ($tz == 0) {
-            $timezones["$zone"] = gmstrftime("%a, %I:%M %p", $usertime)." (GMT)";
+            $timezones["$zone"] = gmstrftime($timeformat, $usertime)." (GMT)";
         } else if ($tz < 0) {
-            $timezones["$zone"] = gmstrftime("%a, %I:%M %p", $usertime)." (GMT$zone)";
+            $timezones["$zone"] = gmstrftime($timeformat, $usertime)." (GMT$zone)";
         } else {
-            $timezones["$zone"] = gmstrftime("%a, %I:%M %p", $usertime)." (GMT+$zone)";
+            $timezones["$zone"] = gmstrftime($timeformat, $usertime)." (GMT+$zone)";
         }
     }
 

diff --git a/lang/en/moodle.php b/lang/en/moodle.php
index ad5bfc49e8d0193884dc1023c529dc57a66baf8a..d6db2d19d9cd5e42920f36c954193da21255c689 100644 (file)
--- a/lang/en/moodle.php
+++ b/lang/en/moodle.php
@@ -904,6 +904,7 @@ $string['strftimemonthyear'] = '%%B %%Y';
 $string['strftimerecent'] = '%%d %%b, %%H:%%M';
 $string['strftimerecentfull'] = '%%a, %%d %%b %%Y, %%I:%%M %%p';
 $string['strftimetime'] = '%%I:%%M %%p';
+$string['strftimedaytime'] = '%%a, %%H:%%M';
 $string['stringsnotset'] = 'The following strings are not defined in $a';
 $string['studentnotallowed'] = 'Sorry, but you can not enter this course as \'$a\'';
 $string['students'] = 'Students';

diff --git a/user/edit.html b/user/edit.html
index 2b2f5c8af93e2f646ad2d534017a19dd6c81773a..13dd673f13be749fa30b922a4edd325ad33e62fa 100644 (file)
--- a/user/edit.html
+++ b/user/edit.html
@@ -164,16 +164,17 @@ if (isadmin()) {
            $user->timezone = 99;
        }
        $timenow = time();
+       $timeformat = get_string('strftimedaytime');
 
        for ($tz = -26; $tz <= 26; $tz++) {
            $zone = (float)$tz/2.0;
            $usertime = $timenow + ($tz * 1800);
            if ($tz == 0) {
-               $timezones["$zone"] = gmstrftime("%a, %I:%M %p", $usertime)." (GMT)";
+               $timezones["$zone"] = gmstrftime($timeformat, $usertime)." (GMT)";
            } else if ($tz < 0) {
-               $timezones["$zone"] = gmstrftime("%a, %I:%M %p", $usertime)." (GMT$zone)";
+               $timezones["$zone"] = gmstrftime($timeformat, $usertime)." (GMT$zone)";
            } else {
-               $timezones["$zone"] = gmstrftime("%a, %I:%M %p", $usertime)." (GMT+$zone)";
+               $timezones["$zone"] = gmstrftime($timeformat, $usertime)." (GMT+$zone)";
            }
        }