Merge branch 'master' into dev

2020-09-12 04:37:02 -07:00
parent 8e3286179a e426524992
commit 372f709f95
17 changed files with 641 additions and 1455 deletions
--- a/components/settings/ProfileSettings.js
+++ b/components/settings/ProfileSettings.js
@@ -38,7 +38,9 @@ export default function ProfileSettings() {
        <dd>{user.username}</dd>
      </dl>
      {changePassword && (
-        <Modal title="Change password">
+        <Modal
+          title={<FormattedMessage id="title.change-password" defaultMessage="Change password" />}
+        >
          <ChangePasswordForm
            values={{ user_id }}
            onSave={handleSave}