From a6bb9b87f7b9208ece16aa28816803763ab0ae80 Mon Sep 17 00:00:00 2001
From: Eric Sethna <eric@spinpunch.com>
Date: Thu, 11 Aug 2016 12:35:31 -0600
Subject: Clarify help text for available lanuages in localization_settings.jsx
 (#3776)

* Update localization_settings.jsx

* Update en.json

* Update localization_settings.jsx

* Update en.json
---
 webapp/components/admin_console/localization_settings.jsx | 2 +-
 webapp/i18n/en.json                                       | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/webapp/components/admin_console/localization_settings.jsx b/webapp/components/admin_console/localization_settings.jsx
index a9a0a8044..b5bc28b52 100644
--- a/webapp/components/admin_console/localization_settings.jsx
+++ b/webapp/components/admin_console/localization_settings.jsx
@@ -114,7 +114,7 @@ export default class LocalizationSettings extends AdminSettings {
                     helpText={
                         <FormattedHTMLMessage
                             id='admin.general.localization.availableLocalesDescription'
-                            defaultMessage='Set which languages are available for users in Account Settings (leave this field blank to have all supported languages available).<br /><br />Would like to help with translations? Join the <a href="http://translate.mattermost.com/" target="_blank">Mattermost Translation Server</a> to contribute.'
+                            defaultMessage='Set which languages are available for users in Account Settings (leave this field blank to have all supported languages available). If you’re manually adding new languages, the <strong>Default Client Language</strong> must be added before saving this setting.<br /><br />Would like to help with translations? Join the <a href="http://translate.mattermost.com/" target="_blank">Mattermost Translation Server</a> to contribute.'
                         />
                     }
                     noResultText={
diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json
index 9e899754e..72733c60b 100644
--- a/webapp/i18n/en.json
+++ b/webapp/i18n/en.json
@@ -282,7 +282,7 @@
   "admin.files.storage": "Storage",
   "admin.general.configuration": "Configuration",
   "admin.general.localization": "Localization",
-  "admin.general.localization.availableLocalesDescription": "Set which languages are available for users in Account Settings (leave this field blank to have all supported languages available).<br /><br />Would like to help with translations? Join the <a href='http://translate.mattermost.com/' target='_blank'>Mattermost Translation Server</a> to contribute.",
+  "admin.general.localization.availableLocalesDescription": "Set which languages are available for users in Account Settings (leave this field blank to have all supported languages available). If you’re manually adding new languages, the <strong>Default Client Language</strong> must be added before saving this setting.<br /><br />Would like to help with translations? Join the <a href='http://translate.mattermost.com/' target='_blank'>Mattermost Translation Server</a> to contribute.",
   "admin.general.localization.availableLocalesTitle": "Available Languages:",
   "admin.general.localization.clientLocaleDescription": "Default language for newly created users and pages where the user hasn't logged in.",
   "admin.general.localization.clientLocaleTitle": "Default Client Language:",
-- 
cgit v1.2.3-1-g7c22