From 803ff274688cd83e339e5ce0515411d08db71199 Mon Sep 17 00:00:00 2001 From: Michael Jumper Date: Mon, 13 May 2019 18:21:38 -0700 Subject: [PATCH] GUACAMOLE-422: Update TIMEZONE field documentation to reference IANA time zone database. --- .../main/java/org/apache/guacamole/form/TimeZoneField.java | 5 +++-- .../webapp/app/form/controllers/timeZoneFieldController.js | 5 +++-- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/guacamole-ext/src/main/java/org/apache/guacamole/form/TimeZoneField.java b/guacamole-ext/src/main/java/org/apache/guacamole/form/TimeZoneField.java index 93054101b..90084e4cc 100644 --- a/guacamole-ext/src/main/java/org/apache/guacamole/form/TimeZoneField.java +++ b/guacamole-ext/src/main/java/org/apache/guacamole/form/TimeZoneField.java @@ -20,8 +20,9 @@ package org.apache.guacamole.form; /** - * Represents a time zone field. The field may contain only valid time zone IDs, - * as dictated by TimeZone.getAvailableIDs(). + * Represents a time zone field. The field may contain only valid time zone + * identifiers, as defined by the IANA time zone database. Such identifiers are + * also valid Java time zone IDs as dictated by TimeZone.getAvailableIDs(). */ public class TimeZoneField extends Field { diff --git a/guacamole/src/main/webapp/app/form/controllers/timeZoneFieldController.js b/guacamole/src/main/webapp/app/form/controllers/timeZoneFieldController.js index 5f1791533..26157e879 100644 --- a/guacamole/src/main/webapp/app/form/controllers/timeZoneFieldController.js +++ b/guacamole/src/main/webapp/app/form/controllers/timeZoneFieldController.js @@ -19,8 +19,9 @@ /** - * Controller for time zone fields. Time zone fields use Java IDs as the - * standard representation for each supported time zone. + * Controller for time zone fields. Time zone fields use IANA time zone + * database identifiers as the standard representation for each supported time + * zone. These identifiers are also legal Java time zone IDs. */ angular.module('form').controller('timeZoneFieldController', ['$scope', '$injector', function timeZoneFieldController($scope, $injector) {