diff options
author | S4KH <kh.syerikjan@gmail.com> | 2016-10-21 20:36:13 +0800 |
---|---|---|
committer | Christopher Speller <crspeller@gmail.com> | 2016-10-21 08:36:13 -0400 |
commit | 234958e0076655efd8a58ea4502edce3226418ed (patch) | |
tree | 568c2e2f06a6921414e2cded9cb682651768aee8 /i18n | |
parent | d13ba8c55c981978f3b962c6991f478b36bf8a8b (diff) | |
download | chat-234958e0076655efd8a58ea4502edce3226418ed.tar.gz chat-234958e0076655efd8a58ea4502edce3226418ed.tar.bz2 chat-234958e0076655efd8a58ea4502edce3226418ed.zip |
HW 4139: Make channel limits configurable in the System Console (#4154)
* Auto Changes
* 4139 Made channel limits configurable in the System Console as described in the issue
* Removed error message entries from other locales, made maxChannelsPerteam type to pointer
* Added * symbol to maxChannelsPerTeam inside isValid function
* Update team_test.go
* Restored to old test
* Checked maximum number channels per team when creating channel
* Fixed code to pass api/channel_test.go
* Reverted changes on config except MaxChannelsPerTeam
* Update channel.go
* Ran gofmt -w .
* Reverted vendor directoy
Diffstat (limited to 'i18n')
-rw-r--r-- | i18n/en.json | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/i18n/en.json b/i18n/en.json index 5d27af7f1..de4fda4b6 100644 --- a/i18n/en.json +++ b/i18n/en.json @@ -204,6 +204,10 @@ "translation": "Invalid character '__' in channel name for non-direct channel" }, { + "id": "api.channel.create_channel.max_channel_limit.app_error", + "translation": "Cannot create more than {{.MaxChannelsPerTeam}} channels for current team" + }, + { "id": "api.channel.create_default_channels.off_topic", "translation": "Off-Topic" }, @@ -3272,6 +3276,10 @@ "translation": "Invalid maximum users per team for team settings. Must be a positive number." }, { + "id": "model.config.is_valid.max_channels.app_error", + "translation": "Invalid maximum channels per team for team settings. Must be a positive number." + }, + { "id": "model.config.is_valid.password_length.app_error", "translation": "Minimum password length must be a whole number greater than or equal to {{.MinLength}} and less than or equal to {{.MaxLength}}." }, |