From 09536af5add55bfc51840e8ecd927f03a69ea035 Mon Sep 17 00:00:00 2001 From: "Anthony M. Powers" Date: Fri, 10 Jun 2016 06:59:05 -0700 Subject: [PATCH] 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. --- webapp/components/user_settings/user_settings_general.jsx | 2 +- webapp/i18n/en.json | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/webapp/components/user_settings/user_settings_general.jsx b/webapp/components/user_settings/user_settings_general.jsx index bd1e2829dd..e586c9290c 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 { ); diff --git a/webapp/i18n/en.json b/webapp/i18n/en.json index 8c3d62663b..29269adeb7 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.",