From 0285dd94f861b88d3c2dedfd82a49e45da089624 Mon Sep 17 00:00:00 2001 From: Ralf Becker Date: Mon, 12 Oct 2015 14:18:33 +0000 Subject: [PATCH] allow all valid timezones in server-side validation, to allow existing values and in future select arbitrary timezones via an ajax callback --- etemplate/inc/class.etemplate_widget_menupopup.inc.php | 7 +++++++ etemplate/lang/egw_de.lang | 1 + etemplate/lang/egw_en.lang | 1 + 3 files changed, 9 insertions(+) diff --git a/etemplate/inc/class.etemplate_widget_menupopup.inc.php b/etemplate/inc/class.etemplate_widget_menupopup.inc.php index 1d82a09d29..d8e1d10aff 100644 --- a/etemplate/inc/class.etemplate_widget_menupopup.inc.php +++ b/etemplate/inc/class.etemplate_widget_menupopup.inc.php @@ -162,6 +162,13 @@ class etemplate_widget_menupopup extends etemplate_widget } break; + case 'select-timezone': + if (!calendar_timezones::tz2id($val)) + { + self::set_validation_error($form_name, lang("'%1' is NOT a valid timezone!", $val)); + } + break; + default: if(!in_array($val, $allowed)) { diff --git a/etemplate/lang/egw_de.lang b/etemplate/lang/egw_de.lang index 13977227aa..0cf84cedfe 100644 --- a/etemplate/lang/egw_de.lang +++ b/etemplate/lang/egw_de.lang @@ -19,6 +19,7 @@ '%1' is not a valid date !!! etemplate de '%1' ist ein ungültiges Datum !!! '%1' is not a valid floatingpoint number !!! etemplate de '%1' ist keine gültige Gleitkommazahl !!! '%1' is not a valid integer !!! etemplate de '%1' ist keine gültige Ganzzahl !!! +'%1' is not a valid timezone! etemplate de '%1' ist keine gültige Zeitzone! '%1' is not allowed ('%2')! etemplate de '%1' ist NICHT erlaubt ('%2')! '%1' is not allowed%2)! etemplate de '%1' ist NICHT erlaubt '%2'! 1 minute etemplate de 1 Minute diff --git a/etemplate/lang/egw_en.lang b/etemplate/lang/egw_en.lang index d06cda524f..cfd5a1ae7f 100644 --- a/etemplate/lang/egw_en.lang +++ b/etemplate/lang/egw_en.lang @@ -20,6 +20,7 @@ '%1' is not a valid date !!! etemplate en '%1' is not a valid date! '%1' is not a valid floatingpoint number !!! etemplate en '%1' is not a valid floating point number! '%1' is not a valid integer !!! etemplate en '%1' is not a valid integer! +'%1' is not a valid timezone! etemplate en '%1' is not a valid timezone! '%1' is not allowed ('%2')! etemplate en '%1' is NOT allowed ('%2')! '%1' is not allowed%2)! etemplate en '%1' is NOT allowed%2)! 1 minute etemplate en 1 Minute