From ce5f3aeee15f0537ccdbb5314842506959423676 Mon Sep 17 00:00:00 2001 From: Harrison Healey Date: Tue, 7 Jun 2016 17:43:46 -0400 Subject: Changed default LocalizationSettings.AvailableLocales to include all locales (#3280) --- webapp/i18n/i18n.jsx | 1 + 1 file changed, 1 insertion(+) (limited to 'webapp/i18n') diff --git a/webapp/i18n/i18n.jsx b/webapp/i18n/i18n.jsx index 783cef975..3a66c5c33 100644 --- a/webapp/i18n/i18n.jsx +++ b/webapp/i18n/i18n.jsx @@ -13,6 +13,7 @@ import frLocaleData from 'react-intl/locale-data/fr'; import jaLocaleData from 'react-intl/locale-data/ja'; import ptLocaleData from 'react-intl/locale-data/pt'; +// should match the values in model/config.go const languages = { en: { value: 'en', -- cgit v1.2.3-1-g7c22 From eefde7d7b6231d2ba143aa496f698d0c9f758bdd Mon Sep 17 00:00:00 2001 From: enahum Date: Thu, 9 Jun 2016 12:08:27 -0300 Subject: PLT-3236 Click in little x for admin console localization settings causes error (#3292) --- webapp/i18n/en.json | 2 ++ webapp/i18n/es.json | 2 ++ 2 files changed, 4 insertions(+) (limited to 'webapp/i18n') diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index 783aea863..1883b234a 100644 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -180,6 +180,7 @@ "admin.email.smtpUsernameTitle": "SMTP Username:", "admin.email.testing": "Testing...", "admin.false": "false", + "admin.general.localization": "Localization", "admin.general.localization.availableLocalesDescription": "Determines which languages are available for users in Account Settings.", "admin.general.localization.clientLocaleDescription": "Default language for newly created users and pages where the user hasn't logged in.", "admin.general.localization.serverLocaleDescription": "Default language for system messages and logs. Changing this will require a server restart before taking effect.", @@ -430,6 +431,7 @@ "admin.sidebar.integrations": "Integrations", "admin.sidebar.ldap": "LDAP", "admin.sidebar.license": "Edition and License", + "admin.sidebar.localization": "Localization", "admin.sidebar.logging": "Logging", "admin.sidebar.login": "Login", "admin.sidebar.logs": "Logs", diff --git a/webapp/i18n/es.json b/webapp/i18n/es.json index 4e3b4d916..95ef986db 100644 --- a/webapp/i18n/es.json +++ b/webapp/i18n/es.json @@ -180,6 +180,7 @@ "admin.email.smtpUsernameTitle": "Usuario SMTP:", "admin.email.testing": "Probando...", "admin.false": "falso", + "admin.general.localization": "Idiomas", "admin.general.localization.availableLocalesDescription": "Determina qué idiomas están disponibles para los usuarios en la Configuración de la Cuenta.", "admin.general.localization.clientLocaleDescription": "Idioma predeterminado para nuevos usuarios y páginas donde el usuario no ha iniciado sesión.", "admin.general.localization.serverLocaleDescription": "Idioma predeterminado para los mensajes del sistema y los registros. Cambiar esto requerirá un reinicio del servidor antes de tomar efecto.", @@ -430,6 +431,7 @@ "admin.sidebar.integrations": "Integraciones", "admin.sidebar.ldap": "LDAP", "admin.sidebar.license": "Edición y Licencia", + "admin.sidebar.localization": "Idiomas", "admin.sidebar.logging": "Registros", "admin.sidebar.login": "Inicio de Sesión", "admin.sidebar.logs": "Registros", -- cgit v1.2.3-1-g7c22 From de907280a7932a387909fc9310e6bd50269bbd98 Mon Sep 17 00:00:00 2001 From: jasonblais Date: Thu, 9 Jun 2016 11:44:13 -0400 Subject: Add server restart note to LDAP sync setting (#3303) * Add server restart note to LDAP sync setting * Add server restart note to LDAP sync setting --- webapp/i18n/en.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'webapp/i18n') diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index 1883b234a..a858e9b94 100644 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -283,7 +283,7 @@ "admin.ldap.serverTitle": "LDAP Server:", "admin.ldap.skipCertificateVerification": "Skip Certificate Verification", "admin.ldap.skipCertificateVerificationDesc": "Skips the certificate verification step for TLS or STARTTLS connections. Not recommended for production environments where TLS is required. For testing only.", - "admin.ldap.syncIntervalHelpText": "LDAP Synchronization is the process by which Mattermost updates its users to reflect any updated data on the LDAP server. For example if a name for a user is updated on the LDAP server, the change will be reflected in Mattermost when the synchronization is performed. Accounts that have been removed from the LDAP server will have their active sessions cleared and no longer be able to login to Mattermost. Mattermost will perform this synchronization regularly according to the interval supplied here. For example, if 60 is supplied, Mattermost will update the users every hour.", + "admin.ldap.syncIntervalHelpText": "LDAP Synchronization is the process by which Mattermost updates its users to reflect any updated data on the LDAP server. For example if a name for a user is updated on the LDAP server, the change will be reflected in Mattermost when the synchronization is performed. Accounts that have been removed from the LDAP server will have their active sessions cleared and no longer be able to login to Mattermost. Mattermost will perform this synchronization regularly according to the interval supplied here. For example, if 60 is supplied, Mattermost will update the users every hour. Changing this will require a server restart before taking effect.", "admin.ldap.syncIntervalTitle": "Synchronization Interval (In Minutes)", "admin.ldap.uernameAttrDesc": "The attribute in the LDAP server that will be used to populate the username field in Mattermost. This may be the same as the ID Attribute.", "admin.ldap.userFilterDisc": "Optionally enter an LDAP Filter to use when searching for user objects. Only the users selected by the query will be able to access Mattermost. For Active Directory, the query to filter out disabled users is (&(objectCategory=Person)(!(UserAccountControl:1.2.840.113556.1.4.803:=2))).", -- cgit v1.2.3-1-g7c22