Merge branch '2460-tu-zona-horaria-es-distinta-pero-igual' into 'develop'

fixed bug: when system timezone is equal to your timezone, dont show the…

See merge request artica/pandorafms!1645
This commit is contained in:
vgilc 2018-08-01 15:20:08 +02:00
commit fcda8f56f9
1 changed files with 11 additions and 7 deletions

View File

@ -3955,6 +3955,7 @@ function ui_get_using_system_timezone_warning ($tag = "h3", $return = true) {
$user_offset = (-get_fixed_offset() / 60) / 60;
if ($config["timezone"] != date_default_timezone_get()) {
$message = sprintf(
__("These controls are using the timezone of the system (%s) instead of yours (%s). The difference with your time zone in hours is %s."),
$config["timezone"],
@ -3962,6 +3963,9 @@ function ui_get_using_system_timezone_warning ($tag = "h3", $return = true) {
$user_offset > 0 ? "+" . $user_offset : $user_offset
);
return ui_print_info_message($message, '', $return, $tag);
} else
return '';
}
/**