summaryrefslogtreecommitdiffstats
path: root/i18n
diff options
context:
space:
mode:
authorHarrison Healey <harrisonmhealey@gmail.com>2016-08-02 16:37:09 -0400
committerGitHub <noreply@github.com>2016-08-02 16:37:09 -0400
commitc4a3118e9f885e92bb9b7d882898e9a51fc3be69 (patch)
tree7564e7aa04e7c656781b34375d6964d029755c38 /i18n
parente67bbcb0ae483cc86ae3a80ace36f1e6e663b589 (diff)
downloadchat-c4a3118e9f885e92bb9b7d882898e9a51fc3be69.tar.gz
chat-c4a3118e9f885e92bb9b7d882898e9a51fc3be69.tar.bz2
chat-c4a3118e9f885e92bb9b7d882898e9a51fc3be69.zip
PLT-3408 Add SiteURL to config.json (#3692)
* PLT-3408 Changed serverside code to get the service's URL from config.json * PLT-3408 Changed most clientside code to use the SiteURL config setting instead of window.location * PLT-3408 Changed default SiteURL to be autodetected
Diffstat (limited to 'i18n')
-rw-r--r--i18n/en.json4
1 files changed, 4 insertions, 0 deletions
diff --git a/i18n/en.json b/i18n/en.json
index 425bffd5f..34c435b82 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -2816,6 +2816,10 @@
"translation": "Invalid Username attribute. Must be set."
},
{
+ "id": "model.config.is_valid.site_url.app_error",
+ "translation": "Site URL must be a valid URL and start with http:// or https://"
+ },
+ {
"id": "model.config.is_valid.sitename_length.app_error",
"translation": "Site name must be less than or equal to {{.MaxLength}} characters."
},