diff options
| author | Anthony M. Powers <tehraven@users.noreply.github.com> | 2016-06-10 06:59:05 -0700 |
|---|---|---|
| committer | Joram Wilander <jwawilander@gmail.com> | 2016-06-10 09:59:05 -0400 |
| commit | 09536af5add55bfc51840e8ecd927f03a69ea035 (patch) | |
| tree | e2542f50079820e5d3eb4de4fb550a4376caa9a2 /webapp | |
| parent | 252d1c7e9822722e75b52944c8dd58ab3b36ca07 (diff) | |
| download | chat-09536af5add55bfc51840e8ecd927f03a69ea035.tar.gz chat-09536af5add55bfc51840e8ecd927f03a69ea035.tar.bz2 chat-09536af5add55bfc51840e8ecd927f03a69ea035.zip | |
PLT-3156 Typo in 'Edit Nickname' message when nickname is set through login provider (#3204)
* Fixed a typo to an error message regarding editing an account field handled by a login provider. (PLT-3156)
* Added 'field_handled_externally' to the en language file.
Other languages are needed.
Diffstat (limited to 'webapp')
| -rw-r--r-- | webapp/components/user_settings/user_settings_general.jsx | 2 | ||||
| -rw-r--r-- | webapp/i18n/en.json | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/webapp/components/user_settings/user_settings_general.jsx b/webapp/components/user_settings/user_settings_general.jsx index bd1e2829d..e586c9290 100644 --- a/webapp/components/user_settings/user_settings_general.jsx +++ b/webapp/components/user_settings/user_settings_general.jsx @@ -596,7 +596,7 @@ class UserSettingsGeneralTab extends React.Component { <span> <FormattedMessage id='user.settings.general.field_handled_externally' - defaultMessage='This field is handled through your login provider. If you want to change it, you need to do so though your login provider.' + defaultMessage='This field is handled through your login provider. If you want to change it, you need to do so through your login provider.' /> </span> ); diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index 8c3d62663..29269adeb 100644 --- a/webapp/i18n/en.json +++ b/webapp/i18n/en.json @@ -1341,6 +1341,7 @@ "user.settings.general.emailMatch": "The new emails you entered do not match.", "user.settings.general.emptyName": "Click 'Edit' to add your full name", "user.settings.general.emptyNickname": "Click 'Edit' to add a nickname", + "user.settings.general.field_handled_externally": "This field is handled through your login provider. If you want to change it, you need to do so through your login provider.", "user.settings.general.firstName": "First Name", "user.settings.general.fullName": "Full Name", "user.settings.general.imageTooLarge": "Unable to upload profile image. File is too large.", |