Merge branch 'develop' into feat/auto-detect-language

Author: raclim

.github/CONTRIBUTING.md

@@ -53,7 +53,7 @@ Issues with these labels are a great place to start!
 - [Need Steps to Reproduce](https://github.com/processing/p5.js-web-editor/labels/Needs%20Steps%20to%20Reproduce)
 - [Ready for Work](https://github.com/processing/p5.js-web-editor/labels/Ready%20for%20Work)
 
-A breakdown of what each label means can be found in the [Preparing an Issue Guide](#preparing-an-issue). 
+A breakdown of what each label means can be found in the [Preparing an Issue Guide](../contributor_docs/preparing_an_issue.md). 
 
 When approaching these issues, know that it's okay to not know how to fix an issue! Feel free to ask questions about to approach the problem. We are all here to learn and make something awesome. Someone from the community will help you out, and asking questions is a great way to learn about the p5.js editor, its file structure, and development process.
 
@@ -83,7 +83,7 @@ Before submitting a pull request, make sure that:
 ---
 
 ## Ideas for Getting Started
-* Use the [p5.js Editor](https://editor.p5js.org)! Find a bug? Think of something you think would add to the project? Reference the [Preparing an Issue Guide](#preparing-an-issue) and open an issue.
+* Use the [p5.js Editor](https://editor.p5js.org)! Find a bug? Think of something you think would add to the project? Reference the [Preparing an Issue Guide](../contributor_docs/preparing_an_issue.md) and open an issue.
 * Expand an existing issue. Sometimes issues are missing steps to reproduce, or need suggestions for potential solutions. Sometimes they need another voice saying, "this is really important!"
 * Try getting the project running locally on your computer by following the [installation steps](./../contributor_docs/installation.md).
 * Look through the documentation in the [developer docs](../contributor_docs/) and the [development guide](./../contributor_docs/development.md). Is there anything that could be expanded? Is there anything missing?

client/modules/IDE/components/Header/Nav.jsx

@@ -378,7 +378,7 @@ const AuthenticatedUserMenu = () => {
           {t('Nav.Auth.MyAssets')}
         </MenubarItem>
         <MenubarItem id="account-settings" href="/account">
-          {t('Preferences.Settings')}
+          {t('Nav.Auth.MyAccount')}
         </MenubarItem>
         <MenubarItem id="account-logout" onClick={() => dispatch(logoutUser())}>
           {t('Nav.Auth.LogOut')}

client/modules/User/components/AccountForm.jsx

@@ -176,7 +176,7 @@ function AccountForm() {
             </Field>
           )}
           <Button type="submit" disabled={submitting || invalid}>
-            {t('AccountForm.SubmitSaveAllSettings')}
+            {t('AccountForm.SaveAccountDetails')}
           </Button>
         </form>
       )}

client/modules/User/components/AccountForm.unit.test.jsx

@@ -61,8 +61,8 @@ describe('<AccountForm />', () => {
   it('handles form submission and calls updateSettings', async () => {
     subject();
 
-    const saveAllSettingsButton = screen.getByRole('button', {
-      name: /save all settings/i
+    const saveAccountDetailsButton = screen.getByRole('button', {
+      name: /save account details/i
     });
 
     const currentPasswordElement = screen.getByLabelText(/current password/i);
@@ -81,7 +81,7 @@ describe('<AccountForm />', () => {
     });
 
     await act(async () => {
-      fireEvent.click(saveAllSettingsButton);
+      fireEvent.click(saveAccountDetailsButton);
     });
 
     await waitFor(() => {
@@ -92,8 +92,8 @@ describe('<AccountForm />', () => {
   it('Save all setting button should get disabled while submitting and enable when not submitting', async () => {
     subject();
 
-    const saveAllSettingsButton = screen.getByRole('button', {
-      name: /save all settings/i
+    const saveAccountDetailsButton = screen.getByRole('button', {
+      name: /save account details/i
     });
 
     const currentPasswordElement = screen.getByLabelText(/current password/i);
@@ -110,12 +110,12 @@ describe('<AccountForm />', () => {
         value: 'newPassword'
       }
     });
-    expect(saveAllSettingsButton).not.toHaveAttribute('disabled');
+    expect(saveAccountDetailsButton).not.toHaveAttribute('disabled');
 
     await act(async () => {
-      fireEvent.click(saveAllSettingsButton);
+      fireEvent.click(saveAccountDetailsButton);
       await waitFor(() => {
-        expect(saveAllSettingsButton).toHaveAttribute('disabled');
+        expect(saveAccountDetailsButton).toHaveAttribute('disabled');
       });
     });
   });

package-lock.json

@@ -367,13 +367,13 @@
     "CurrentPasswordARIA": "Current Password",
     "NewPassword": "New Password",
     "NewPasswordARIA": "New Password",
-    "SubmitSaveAllSettings": "Save All Settings"
+    "SaveAccountDetails": "Save Account Details"
   },
   "AccountView": {
     "SocialLogin": "Social Login",
     "SocialLoginDescription": "Use your GitHub or Google account to log into the p5.js Web Editor.",
     "Title": "p5.js Web Editor | Account Settings",
-    "Settings": "Account Settings",
+    "Settings": "My Account",
     "AccountTab": "Account",
     "AccessTokensTab": "Access Tokens"
   },