From 212a39b0250ca18632c0c3ccc21229daed3981e8 Mon Sep 17 00:00:00 2001
From: Michael Jumper <mjumper@apache.org>
Date: Thu, 9 May 2019 18:39:18 -0700
Subject: [PATCH] GUACAMOLE-422: Add definitions and translations for the
 RDP/SSH "timezone" parameter.

---
 .../main/resources/org/apache/guacamole/protocols/rdp.json    | 4 ++++
 .../main/resources/org/apache/guacamole/protocols/ssh.json    | 4 ++++
 guacamole/src/main/webapp/translations/en.json                | 2 ++
 3 files changed, 10 insertions(+)

diff --git a/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/rdp.json b/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/rdp.json
index e3de15f40..11a4d080f 100644
--- a/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/rdp.json
+++ b/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/rdp.json
@@ -106,6 +106,10 @@
                         "tr-tr-qwerty"
                     ]
                 },
+                {
+                    "name"  : "timezone",
+                    "type"  : "TEXT"
+                },
                 {
                     "name"    : "console",
                     "type"    : "BOOLEAN",
diff --git a/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/ssh.json b/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/ssh.json
index 3d0b4d9a1..a25e26628 100644
--- a/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/ssh.json
+++ b/guacamole-ext/src/main/resources/org/apache/guacamole/protocols/ssh.json
@@ -78,6 +78,10 @@
                     "name"  : "locale",
                     "type"  : "TEXT"
                 },
+                {
+                    "name"  : "timezone",
+                    "type"  : "TEXT"
+                },
                 {
                     "name"  : "server-alive-interval",
                     "type"  : "NUMERIC"
diff --git a/guacamole/src/main/webapp/translations/en.json b/guacamole/src/main/webapp/translations/en.json
index b5ab0d5f3..93a580e0a 100644
--- a/guacamole/src/main/webapp/translations/en.json
+++ b/guacamole/src/main/webapp/translations/en.json
@@ -428,6 +428,7 @@
         "FIELD_HEADER_SFTP_ROOT_DIRECTORY"        : "File browser root directory:",
         "FIELD_HEADER_SFTP_USERNAME"              : "Username:",
         "FIELD_HEADER_STATIC_CHANNELS" : "Static channel names:",
+        "FIELD_HEADER_TIMEZONE"        : "Time zone:",
         "FIELD_HEADER_USERNAME"        : "Username:",
         "FIELD_HEADER_WIDTH"           : "Width:",
 
@@ -506,6 +507,7 @@
         "FIELD_HEADER_SERVER_ALIVE_INTERVAL" : "Server keepalive interval:",
         "FIELD_HEADER_SFTP_ROOT_DIRECTORY"   : "File browser root directory:",
         "FIELD_HEADER_TERMINAL_TYPE"   : "Terminal type:",
+        "FIELD_HEADER_TIMEZONE"        : "Time zone ($TZ):",
         "FIELD_HEADER_TYPESCRIPT_NAME" : "Typescript name:",
         "FIELD_HEADER_TYPESCRIPT_PATH" : "Typescript path:",