Merge branch 'MDL-68760' of https://github.com/timhunt/moodle
authorSara Arjona <sara@moodle.com>
Mon, 18 May 2020 18:33:05 +0000 (20:33 +0200)
committerSara Arjona <sara@moodle.com>
Mon, 18 May 2020 18:33:05 +0000 (20:33 +0200)
lang/en/timezones.php
lib/tests/date_test.php

index 417a4fb..b79c92f 100644 (file)
@@ -182,6 +182,7 @@ $string['america/noronha'] = 'America/Noronha';
 $string['america/north_dakota/beulah'] = 'America/North_Dakota/Beulah';
 $string['america/north_dakota/center'] = 'America/North_Dakota/Center';
 $string['america/north_dakota/new_salem'] = 'America/North_Dakota/New_Salem';
+$string['america/nuuk'] = 'America/Nuuk';
 $string['america/ojinaga'] = 'America/Ojinaga';
 $string['america/panama'] = 'America/Panama';
 $string['america/pangnirtung'] = 'America/Pangnirtung';
index 702124e..3cdaf21 100644 (file)
@@ -170,7 +170,8 @@ class core_date_testcase extends advanced_testcase {
         $phpzones = DateTimeZone::listIdentifiers();
         $manager = get_string_manager();
         foreach ($phpzones as $tz) {
-            $this->assertTrue($manager->string_exists(strtolower($tz), 'core_timezones'));
+            $this->assertTrue($manager->string_exists(strtolower($tz), 'core_timezones'),
+                    'String for timezone ' . strtolower($tz) . ' not found.');
         }
     }