diff options
| author | Joram Wilander <jwawilander@gmail.com> | 2016-02-25 09:50:50 -0500 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2016-02-25 09:50:50 -0500 |
| commit | e66520ea47819851d0d3b28a68da9c2b8f6ea404 (patch) | |
| tree | fdbd571e2b70f1c0a7c376906c67eb79ccba70e1 | |
| parent | 6f319fc64c9a947d8f076262aaab51354cb39ecd (diff) | |
| parent | 7679637019f91f115431687430f2eb71d1d0748c (diff) | |
| download | chat-e66520ea47819851d0d3b28a68da9c2b8f6ea404.tar.gz chat-e66520ea47819851d0d3b28a68da9c2b8f6ea404.tar.bz2 chat-e66520ea47819851d0d3b28a68da9c2b8f6ea404.zip | |
Merge pull request #2245 from mattermost/esethna-patch-1
Update activity_log_modal.jsx help text to remove hard coded session length
| -rw-r--r-- | web/react/components/activity_log_modal.jsx | 2 | ||||
| -rw-r--r-- | web/static/i18n/en.json | 2 | ||||
| -rw-r--r-- | web/static/i18n/es.json | 1 |
3 files changed, 2 insertions, 3 deletions
diff --git a/web/react/components/activity_log_modal.jsx b/web/react/components/activity_log_modal.jsx index 1a0c9c6d5..95b4caa12 100644 --- a/web/react/components/activity_log_modal.jsx +++ b/web/react/components/activity_log_modal.jsx @@ -254,7 +254,7 @@ export default class ActivityLogModal extends React.Component { <p className='session-help-text'> <FormattedMessage id='activity_log.sessionsDescription' - defaultMessage="Sessions are created when you log in with your email and password to a new browser on a device. Sessions let you use Mattermost for up to 30 days without having to log in again. If you want to log out sooner, use the 'Logout' button below to end a session." + defaultMessage="Sessions are created when you log in to a new browser on a device. Sessions let you use Mattermost without having to log in again for a time period specified by the System Admin. If you want to log out sooner, use the 'Logout' button below to end a session." /> </p> {content} diff --git a/web/static/i18n/en.json b/web/static/i18n/en.json index 0a4cbde6b..1e68ac1f6 100644 --- a/web/static/i18n/en.json +++ b/web/static/i18n/en.json @@ -17,7 +17,7 @@ "activity_log.moreInfo": "More info", "activity_log.os": "OS: {os}", "activity_log.sessionId": "Session ID: {id}", - "activity_log.sessionsDescription": "Sessions are created when you log in with your email and password to a new browser on a device. Sessions let you use Mattermost for up to 30 days without having to log in again. If you want to log out sooner, use the 'Logout' button below to end a session.", + "activity_log.sessionsDescription": "Sessions are created when you log in to a new browser on a device. Sessions let you use Mattermost without having to log in again for a time period specified by the System Admin. If you want to log out sooner, use the 'Logout' button below to end a session.", "activity_log_modal.android": "Android", "activity_log_modal.androidNativeApp": "Android Native App", "activity_log_modal.iphoneNativeApp": "iPhone Native App", diff --git a/web/static/i18n/es.json b/web/static/i18n/es.json index 3991a5b84..1fa86e9ad 100644 --- a/web/static/i18n/es.json +++ b/web/static/i18n/es.json @@ -17,7 +17,6 @@ "activity_log.moreInfo": "Mas información", "activity_log.os": "Sistema Operativo: {os}", "activity_log.sessionId": "Sesión ID: {id}", - "activity_log.sessionsDescription": "Las sesiones son creadas cuando inicias sesión con tus credenciales en un nuevo navegador desde cualquier dispositivo. Las sesiones te permiten utilizar Mattermost por un período de hasta 30 días sin tener que iniciar sesión nuevamente. Si quieres cerrar tu sesión antes de ese tiempo, utiliza el botón de 'Cerrar Sesión' en la parte de abajo.", "activity_log_modal.android": "Android", "activity_log_modal.androidNativeApp": "Android App Nativa", "activity_log_modal.iphoneNativeApp": "iPhone App Nativa", |