summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJason Blais <jason@spinpunch.com>2016-10-03 09:04:38 -0400
committerHarrison Healey <harrisonmhealey@gmail.com>2016-10-03 09:04:38 -0400
commit5f8e5c401bd96cba9a98b2db02d72f9cbacb0103 (patch)
tree2b6961e3175ce4680dfa69f5f86bda1767372ee0
parent8a0e649f989a824bb3bbfd1900a5b8e5383b47e1 (diff)
downloadchat-5f8e5c401bd96cba9a98b2db02d72f9cbacb0103.tar.gz
chat-5f8e5c401bd96cba9a98b2db02d72f9cbacb0103.tar.bz2
chat-5f8e5c401bd96cba9a98b2db02d72f9cbacb0103.zip
Change "Max Burst" to "Maximum Burst Size" (#4130)
* Update en.json * Update rate_settings.jsx * Update en.json
-rw-r--r--i18n/en.json2
-rw-r--r--webapp/components/admin_console/rate_settings.jsx2
-rw-r--r--webapp/i18n/en.json2
3 files changed, 3 insertions, 3 deletions
diff --git a/i18n/en.json b/i18n/en.json
index 7bfab85f6..ca75b2b10 100644
--- a/i18n/en.json
+++ b/i18n/en.json
@@ -3117,7 +3117,7 @@
},
{
"id": "model.config.is_valid.max_burst.app_error",
- "translation": "Max burst must be greater than zero."
+ "translation": "Maximum burst size must be greater than zero."
},
{
"id": "model.config.is_valid.encrypt_sql.app_error",
diff --git a/webapp/components/admin_console/rate_settings.jsx b/webapp/components/admin_console/rate_settings.jsx
index 8159f4b0d..73e9a4131 100644
--- a/webapp/components/admin_console/rate_settings.jsx
+++ b/webapp/components/admin_console/rate_settings.jsx
@@ -105,7 +105,7 @@ export default class RateSettings extends AdminSettings {
label={
<FormattedMessage
id='admin.rate.maxBurst'
- defaultMessage='Max Burst:'
+ defaultMessage='Maximum Burst Size:'
/>
}
placeholder={Utils.localizeMessage('admin.rate.maxBurstExample', 'Ex "100"')}
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index 73580b67c..bba88381a 100644
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -543,7 +543,7 @@
"admin.rate.remoteDescription": "When true, rate limit API access by IP address.",
"admin.rate.remoteTitle": "Vary rate limit by remote address: ",
"admin.rate.title": "Rate Limit Settings",
- "admin.rate.maxBurst": "Max Burst:",
+ "admin.rate.maxBurst": "Maximum Burst Size:",
"admin.rate.maxBurstExample": "Ex \"100\"",
"admin.rate.maxBurstDescription": "Maximum number of requests allowed beyond the per second query limit.",
"admin.recycle.button": "Recycle Database Connections",