summaryrefslogtreecommitdiffstats
path: root/i18n
diff options
context:
space:
mode:
authorChris Duarte <csduarte@users.noreply.github.com>2018-03-22 06:53:43 -0700
committerJoram Wilander <jwawilander@gmail.com>2018-03-22 09:53:43 -0400
commit74e703f58daff2aded07a969410f988cff9ada9b (patch)
tree354150b3a53f00edea40d6488c4a6f0bacfde107 /i18n
parent9d701c704416a1d8648dd2818a8a15c4da99b424 (diff)
downloadchat-74e703f58daff2aded07a969410f988cff9ada9b.tar.gz
chat-74e703f58daff2aded07a969410f988cff9ada9b.tar.bz2
chat-74e703f58daff2aded07a969410f988cff9ada9b.zip
Timezone feature (#8185)
* Add supported timezones into config Remove Timezone list creation in favor of timezone from configs Add Timezone field to Users table Clean up format of SupportedTimezones in config * Remove unwanted change * Add test for updating user timezone * Add empty map[string]string if Timezone is null * Add EnableTimezoneSelection config * Revert back to map[string]string for ClientConfig * Refactor SupportedTimezones into timezones.json * Include timezones.json in TestConfigFlag * Add timezone api endpoint * Bump varchar size to 256 and setMaxSize in user_store * Refactor LoadConfig to LoadConfig and LoadTimezoneConfig * Remove unnecessary argument in LoadConfig, mail_test * Add test for timezone endpoint * Add license header * Refactor timezones endpoint to system.go * Add system base route to timezone endpoint * db timezone upgrade in db v4.9 * Avoid saving SupportedTimezones to config.json * Add timezonePath support in config * Remove EnableTimezoneSelection from config * Use return statement without return parameter * Refactor test for SupportedTimezones * Check for supportedTimezone != nil instead of using len * Decouple SupportedTimezones out of Config * Fix failing test * Add LastTeamIconUpdate back in upgrade.go * Write timezone config in config_flag_test * Add code fallback for default timezone support
Diffstat (limited to 'i18n')
-rw-r--r--i18n/en.json12
1 files changed, 12 insertions, 0 deletions
diff --git a/i18n/en.json b/i18n/en.json
index 42650a868..974334d85 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -3771,6 +3771,18 @@
"translation": "This team has reached the maximum number of allowed accounts. Contact your systems administrator to set a higher limit."
},
{
+ "id": "app.timezones.failed_deserialize.app_error",
+ "translation": "Failed to deserialize Timezone config file={{.Filename}}, err={{.Error}}"
+ },
+ {
+ "id": "app.timezones.load_config.app_error",
+ "translation": "Timezone config file does not exists file={{.Filename}}"
+ },
+ {
+ "id": "app.timezones.read_config.app_error",
+ "translation": "Failed to read Timezone config file={{.Filename}}, err={{.Error}}"
+ },
+ {
"id": "app.user_access_token.disabled",
"translation": "Personal access tokens are disabled on this server. Please contact your system administrator for details."
},