Merge pull request #3862 from hotosm/fix/typos

Spelling corrections

frontend/src/components/comments/messages.js

@@ -22,7 +22,7 @@ export default defineMessages({
   },
   messageError: {
     id: 'comment.input.sending.error',
-    defaultMessage: 'An error ocurred while sending message.',
+    defaultMessage: 'An error occurred while sending message.',
   },
   managersHashtagTip: {
     id: 'comment.hashtags.help.managers',

frontend/src/components/comments/tests/status.test.js

@@ -12,7 +12,7 @@ describe('MessageStatus', () => {
         <MessageStatus status="error" />
       </ReduxIntlProviders>,
     );
-    expect(screen.getByText('An error ocurred while sending message.').className).toBe('red');
+    expect(screen.getByText('An error occurred while sending message.').className).toBe('red');
   });
   it('with status = messageSent', () => {
     render(

frontend/src/components/projectEdit/messages.js

@@ -247,7 +247,7 @@ export default defineMessages({
   },
   transferProjectSuccess: {
     id: 'projects.actions.transfer_project.success',
-    defaultMessage: 'The project was transfered successfully.',
+    defaultMessage: 'The project was transferred successfully.',
   },
   transferProjectError: {
     id: 'projects.actions.transfer_project.error',

frontend/src/components/projects/messages.js

@@ -137,7 +137,7 @@ export default defineMessages({
     defaultMessage: 'Urgent projects',
   },
   sortByBeginner: {
-    id: 'project.sortby.difficulty.begginer',
+    id: 'project.sortby.difficulty.beginner',
     defaultMessage: 'Beginner projects',
   },
   sortByAdvanced: {

frontend/src/components/taskSelection/index.js

@@ -139,7 +139,7 @@ export function TaskSelection({ project, type, loading }: Object) {
   }, [latestActivities, project.projectId]);
 
   // show the tasks tab when the page loads if the user has already contributed
-  // to the project. If no, show the intructions tab.
+  // to the project. If no, show the instructions tab.
   useEffect(() => {
     if (contributions && contributions.userContributions && activeSection === null) {
       const currentUserContributions = contributions.userContributions.filter(

frontend/src/components/taskSelection/messages.js

@@ -44,7 +44,7 @@ export default defineMessages({
   },
   lockErrorLicenseDescription: {
     id: 'project.tasks.lock_error.license.description',
-    defaultMessage: 'Please accept this license in order to colaborate in this project. ',
+    defaultMessage: 'Please accept this license in order to collaborate in this project. ',
   },
   acceptLicense: {
     id: 'project.tasks.lock_error.license.accept',
@@ -415,12 +415,12 @@ export default defineMessages({
     id: 'project.tasks.history.title',
     defaultMessage: 'Task {n}',
   },
-  taskSplitted: {
-    id: 'project.tasks.history.splitted',
+  taskUnavailable: {
+    id: 'project.tasks.history.unavailable',
     defaultMessage: 'Task unavailable',
   },
-  taskSplittedDescription: {
-    id: 'project.tasks.history.splitted.description',
+  taskSplitDescription: {
+    id: 'project.tasks.history.split.description',
     defaultMessage: 'The task {id} was split and its history is not available anymore',
   },
   taskData: {

frontend/src/components/taskSelection/taskList.js

@@ -357,11 +357,11 @@ function TaskActivityModal({
             <div className="w-100 pa4 blue-dark bg-white">
               <CloseIcon className="h1 w1 fr pointer" onClick={() => close()} />
               <h3 className="ttu f3 pa0 ma0 barlow-condensed b mb4">
-                <FormattedMessage {...messages.taskSplitted} />
+                <FormattedMessage {...messages.taskUnavailable} />
               </h3>
               <p className="pb0">
                 <FormattedMessage
-                  {...messages.taskSplittedDescription}
+                  {...messages.taskSplitDescription}
                   values={{ id: <b>#{taskId}</b> }}
                 />
               </p>
@@ -394,7 +394,7 @@ function PaginatedList({
   useEffect(() => {
     latestItems.current = items;
   });
-  // the useEffect above avoids the next one to run everytime the items change
+  // the useEffect above avoids the next one to run every time the items change
   useEffect(() => {
     // switch the taskList page to always show the selected task.
     // Only do it if there is only one task selected

frontend/src/components/teamsAndOrgs/menu.js

@@ -14,7 +14,7 @@ export function ManagementMenu({ isAdmin }: Object) {
     'users',
     'licenses',
   ];
-  // non admin users can only see the three first itens
+  // non admin users can only see the three first items
   if (!isAdmin) {
     links = links.slice(0, 3);
   }

frontend/src/components/teamsAndOrgs/tests/menu.test.js

@@ -3,14 +3,14 @@ import React from 'react';
 import { createComponentWithIntl } from '../../../utils/testWithIntl';
 import { ManagementMenu } from '../menu';
 
-describe('ManagementMenu itens for', () => {
-  it('ADMIN users should include all itens', () => {
+describe('ManagementMenu items for', () => {
+  it('ADMIN users should include all items', () => {
     const element = createComponentWithIntl(<ManagementMenu isAdmin={true} />);
     const testInstance = element.root;
     expect(testInstance.findAllByType('a').length).toBe(7);
   });
 
-  it('non ADMIN users should include only 3 itens', () => {
+  it('non ADMIN users should include only 3 items', () => {
     const element = createComponentWithIntl(<ManagementMenu isAdmin={false} />);
     const testInstance = element.root;
     expect(testInstance.findAllByType('a').length).toBe(3);

frontend/src/locales/en.json

@@ -8,7 +8,7 @@
   "comment.input.imageUpload.progress": "Uploading file...",
   "comment.input.sending.progress": "Sending message...",
   "comment.input.sending.success": "Message sent.",
-  "comment.input.sending.error": "An error ocurred while sending message.",
+  "comment.input.sending.error": "An error occurred while sending message.",
   "comment.hashtags.help.managers": "Add \"{hashtag}\" to notify the project managers about your comment.",
   "comment.hashtags.help.author": "Add \"{hashtag}\" to notify the project author about your comment.",
   "mytasks.mainSection.title": "My Tasks",
@@ -360,7 +360,7 @@
   "projects.actions.transfer_project.button": "Transfer project",
   "projects.actions.transfer_project.title": "Transfer project ownership",
   "projects.actions.transfer_project.alert": "In case of wrong transfer, contact the new owner to revert the change.",
-  "projects.actions.transfer_project.success": "The project was transfered successfully.",
+  "projects.actions.transfer_project.success": "The project was transferred successfully.",
   "projects.actions.transfer_project.error": "The project transfer failed.",
   "projects.actions.delete_project.title": "Delete project",
   "projects.actions.delete_project.alert": "You can only delete projects that has no received contributions.",
@@ -468,7 +468,7 @@
   "project.sortby.id.descending": "New projects",
   "project.sortby.id.ascending": "Old projects",
   "project.sortby.priority": "Urgent projects",
-  "project.sortby.difficulty.begginer": "Beginner projects",
+  "project.sortby.difficulty.beginner": "Beginner projects",
   "project.sortby.difficulty.advanced": "Advanced projects",
   "project.sortby.more_active": "Active projects",
   "project.nav.apply": "Apply",
@@ -505,7 +505,7 @@
   "project.tasks.lock_error.generic": "It wasn't possible to lock this task for you...",
   "project.tasks.lock_error.generic.description": "Some error occurred when trying to lock this task. Check if your user matches the level, role and permissions required by this project.",
   "project.tasks.lock_error.license.title": "This project has a required license.",
-  "project.tasks.lock_error.license.description": "Please accept this license in order to colaborate in this project. ",
+  "project.tasks.lock_error.license.description": "Please accept this license in order to collaborate in this project. ",
   "project.tasks.lock_error.license.accept": "Accept",
   "project.tasks.lock_error.cancel": "Cancel",
   "project.tasks.lock_error.another_project": "We found another mapping task already locked by you",
@@ -597,8 +597,8 @@
   "project.tasks.action.submit_task": "Submit task",
   "project.tasks.action.submit_tasks": "Submit tasks",
   "project.tasks.history.title": "Task {n}",
-  "project.tasks.history.splitted": "Task unavailable",
-  "project.tasks.history.splitted.description": "The task {id} was split and its history is not available anymore",
+  "project.tasks.history.unavailable": "Task unavailable",
+  "project.tasks.history.split.description": "The task {id} was split and its history is not available anymore",
   "project.tasks.activity.data.links": "Task data",
   "project.tasks.activity.project_id": "Project #{id}",
   "project.tasks.activity.overpass.download": "Download from Overpass",
@@ -813,7 +813,7 @@
   "users.detail.heatmapLegendLess": "less",
   "users.detail.delay_popup": "These statistics need heavy calculations and changes are showing up with a delay of around one hour.",
   "users.detail.teams": "Teams",
-  "error.page.title": "An error ocurred",
+  "error.page.title": "An error occurred",
   "error.page.description": "Something did not work well...",
   "error.page.link": "Return",
   "notFound.page.title": "Page not found",
@@ -836,7 +836,7 @@
   "teamsAndOrgs.management.button.cancel_request": "Cancel request",
   "teamsAndOrgs.management.button.leave_team": "Leave team",
   "teamsAndOrgs.management.button.cancel": "Cancel",
-  "teamsAndOrgs.management.organisation.manage.error": "You are not a manager of this organisation, so you are not allowed to edit it.",
+  "teamsAndOrgs.management.organisation.manage.error": "You are not a manager of this organization, so you are not allowed to edit it.",
   "teamsAndOrgs.management.organisation.manage": "Manage organization",
   "teamsAndOrgs.management.team.manage": "Manage team",
   "teamsAndOrgs.management.campaign.manage": "Manage campaign",

frontend/src/views/messages.js

@@ -6,7 +6,7 @@ import { defineMessages } from 'react-intl';
 export default defineMessages({
   errorFallback: {
     id: 'error.page.title',
-    defaultMessage: 'An error ocurred',
+    defaultMessage: 'An error occurred',
   },
   errorFallbackMessage: {
     id: 'error.page.description',
@@ -99,7 +99,7 @@ export default defineMessages({
   editOrgNotAllowed: {
     id: 'teamsAndOrgs.management.organisation.manage.error',
     defaultMessage:
-      'You are not a manager of this organisation, so you are not allowed to edit it.',
+      'You are not a manager of this organization, so you are not allowed to edit it.',
   },
   manageOrganisation: {
     id: 'teamsAndOrgs.management.organisation.manage',

scripts/database/export-import-projects/README

@@ -2,10 +2,10 @@
 
 These migration scripts allow to restore deleted projects using postgres commands. For now, there are two scripts:
 1. dbtocsv.sh: By setting the required variables, this script reads the defined project ids within the PROJECT_IDS variable and starts saving the required information for each table in a csv file.
-2. restart_table.sh: which destroys and then creates with postgis extension the desired database. However, migration tables are not executed within this script. You need to run `python manage.py db upgrade` yourself everytime the database is restarted.
+2. restart_table.sh: which destroys and then creates with postgis extension the desired database. However, migration tables are not executed within this script. You need to run `python manage.py db upgrade` yourself every time the database is restarted.
 
 Tables to migrate and verify if they are necessary to:
-[x] projects 
+[x] projects
 [] messages
 [x] project_allowed_users
 [x] project_chat