Merge branch '19.0' of [email protected]:Dolibarr/dolibarr.git into 20.0

Dolibarr · Oct 3, 2024 · 37c5500 · 37c5500
2 parents 20d66a6 + 6a09e7c
commit 37c5500
Showing 1 changed file with 6 additions and 5 deletions.
diff --git a/htdocs/core/lib/date.lib.php b/htdocs/core/lib/date.lib.php
@@ -36,18 +36,18 @@
 function get_tz_array()
 {
 	$tzarray = array(
-		-11 => "Pacific/Midway",
-		-10 => "Pacific/Fakaofo",
+		-11 => "Pacific/Pago_Pago",
+		-10 => "Pacific/Honolulu",
 		-9 => "America/Anchorage",
 		-8 => "America/Los_Angeles",
 		-7 => "America/Dawson_Creek",
 		-6 => "America/Chicago",
 		-5 => "America/Bogota",
-		-4 => "America/Anguilla",
+		-4 => "America/Asuncion",
 		-3 => "America/Araguaina",
 		-2 => "America/Noronha",
 		-1 => "Atlantic/Azores",
-		0 => "Africa/Abidjan",
+		0 => "Europe/London",
 		1 => "Europe/Paris",
 		2 => "Europe/Helsinki",
 		3 => "Europe/Moscow",
@@ -60,7 +60,8 @@ function get_tz_array()
 		10 => "Australia/Sydney",
 		11 => "Pacific/Noumea",
 		12 => "Pacific/Auckland",
-		13 => "Pacific/Enderbury"
+		13 => "Pacific/Fakaofo",
+		14 => "Pacific/Kiritimati"
 	);
 	return $tzarray;
 }