Merge branch 'psi-occurred' into 'master'

Correct spelling of occurred

See merge request gitlab-org/gitlab!54537

app/assets/javascripts/notifications/constants.js

@@ -22,10 +22,10 @@ export const i18n = {
     owner_disabled: __('Notifications have been disabled by the project or group owner'),
   },
   updateNotificationLevelErrorMessage: __(
-    'An error occured while updating the notification settings. Please try again.',
+    'An error occurred while updating the notification settings. Please try again.',
   ),
   loadNotificationLevelErrorMessage: __(
-    'An error occured while loading the notification settings. Please try again.',
+    'An error occurred while loading the notification settings. Please try again.',
   ),
   customNotificationsModal: {
     title: __('Custom notification events'),

app/assets/javascripts/pipelines/components/graph/graph_component_wrapper.vue

@@ -32,7 +32,7 @@ export default {
     };
   },
   errorTexts: {
-    [DRAW_FAILURE]: __('An error ocurred while drawing job relationship links.'),
+    [DRAW_FAILURE]: __('An error occurred while drawing job relationship links.'),
     [LOAD_FAILURE]: __('We are currently unable to fetch data for this pipeline.'),
     [DEFAULT]: __('An unknown error occurred while loading this graph.'),
   },

app/assets/javascripts/projects/pipelines/charts/components/pipeline_charts.vue

@@ -252,10 +252,10 @@ export default {
   },
   errorTexts: {
     [LOAD_ANALYTICS_FAILURE]: s__(
-      'PipelineCharts|An error has ocurred when retrieving the analytics data',
+      'PipelineCharts|An error has occurred when retrieving the analytics data',
     ),
     [LOAD_PIPELINES_FAILURE]: s__(
-      'PipelineCharts|An error has ocurred when retrieving the pipelines data',
+      'PipelineCharts|An error has occurred when retrieving the pipelines data',
     ),
     [PARSE_FAILURE]: s__('PipelineCharts|There was an error parsing the data for the charts.'),
     [DEFAULT]: s__('PipelineCharts|An unknown error occurred while processing CI/CD analytics.'),

app/assets/javascripts/projects/settings_service_desk/components/service_desk_root.vue

@@ -95,7 +95,7 @@ export default {
         })
         .catch((err) => {
           this.showAlert(
-            sprintf(__('An error occured while saving changes: %{error}'), {
+            sprintf(__('An error occurred while saving changes: %{error}'), {
               error: err?.response?.data?.message,
             }),
           );

app/assets/javascripts/reports/components/grouped_test_reports_app.vue

@@ -86,7 +86,7 @@ export default {
       }
 
       if (!report.name) {
-        return s__('Reports|An error occured while loading report');
+        return s__('Reports|An error occurred while loading report');
       }
 
       return reportTextBuilder(name, summary);

app/assets/javascripts/static_site_editor/constants.js

@@ -12,7 +12,7 @@ export const SUBMIT_CHANGES_MERGE_REQUEST_ERROR = s__(
   'StaticSiteEditor|Could not create merge request.',
 );
 export const LOAD_CONTENT_ERROR = __(
-  'An error ocurred while loading your content. Please try again.',
+  'An error occurred while loading your content. Please try again.',
 );
 
 export const DEFAULT_FORMATTING_CHANGES_COMMIT_MESSAGE = s__(

ee/app/assets/javascripts/admin/dev_ops_report/constants.js

@@ -49,7 +49,7 @@ export const DEVOPS_ADOPTION_STRINGS = {
     filterPlaceholder: s__('DevopsAdoption|Filter by name'),
     selectedGroupsTextSingular: s__('DevopsAdoption|%{selectedCount} group selected'),
     selectedGroupsTextPlural: s__('DevopsAdoption|%{selectedCount} groups selected'),
-    error: s__('DevopsAdoption|An error occured while saving the group. Please try again.'),
+    error: s__('DevopsAdoption|An error occurred while saving the group. Please try again.'),
     noResults: s__('DevopsAdoption|No filter results.'),
   },
   table: {
@@ -95,7 +95,7 @@ export const DEVOPS_ADOPTION_STRINGS = {
     ),
     cancel: __('Cancel'),
     confirm: s__('DevopsAdoption|Remove Group'),
-    error: s__('DevopsAdoption|An error occured while removing the group. Please try again.'),
+    error: s__('DevopsAdoption|An error occurred while removing the group. Please try again.'),
   },
   tableCell: {
     trueText: s__('DevopsAdoption|Adopted'),

ee/app/assets/javascripts/integrations/edit/components/jira_issue_creation_vulnerabilities.vue

@@ -27,7 +27,7 @@ export const i18n = {
     defaultText: s__('JiraService|Select issue type'),
   },
   fetchIssueTypesButtonLabel: s__('JiraService|Fetch issue types for this Jira project'),
-  fetchIssueTypesErrorMessage: s__('JiraService|An error occured while fetching issue list'),
+  fetchIssueTypesErrorMessage: s__('JiraService|An error occurred while fetching issue list'),
   projectKeyWarnings: {
     missing: s__('JiraService|Project key is required to generate issue types'),
     changed: s__('JiraService|Project key changed, refresh list'),

ee/lib/gitlab/status_page/storage.rb

@@ -52,7 +52,7 @@ module Gitlab
       class Error < StandardError
         def initialize(bucket:, error:, **args)
           super(
-            "Error occured #{error.class.name.inspect} " \
+            "Error occurred #{error.class.name.inspect} " \
             "for bucket #{bucket.inspect}. " \
             "Arguments: #{args.inspect}"
           )

ee/spec/frontend/admin/dev_ops_report/mock_data.js

@@ -128,9 +128,9 @@ export const devopsAdoptionTableHeaders = [
 
 export const segmentName = 'Foooo';
 
-export const genericErrorMessage = 'An error occured while saving the group. Please try again.';
+export const genericErrorMessage = 'An error occurred while saving the group. Please try again.';
 
 export const dataErrorMessage = 'Name already taken.';
 
 export const genericDeleteErrorMessage =
-  'An error occured while removing the group. Please try again.';
+  'An error occurred while removing the group. Please try again.';

ee/spec/lib/gitlab/status_page/storage/s3_client_spec.rb

@@ -168,7 +168,7 @@ RSpec.describe Gitlab::StatusPage::Storage::S3Client, :aws_s3 do
   end
 
   def error_message(error_class, **args)
-    %{Error occured "Aws::S3::Errors::#{error_class}" } \
+    %{Error occurred "Aws::S3::Errors::#{error_class}" } \
       "for bucket #{bucket_name.inspect}. Arguments: #{args.inspect}"
   end
 

ee/spec/lib/gitlab/status_page/storage/s3_multipart_upload_spec.rb

@@ -108,7 +108,7 @@ RSpec.describe Gitlab::StatusPage::Storage::S3MultipartUpload, :aws_s3 do
   end
 
   def error_message(error_class, **args)
-    %{Error occured "Aws::S3::Errors::#{error_class}" } \
+    %{Error occurred "Aws::S3::Errors::#{error_class}" } \
       "for bucket #{bucket_name.inspect}. Arguments: #{args.inspect}"
   end
 end

locale/gitlab.pot

@@ -3214,15 +3214,6 @@ msgstr ""
 msgid "An error has occurred"
 msgstr ""
 
-msgid "An error occured while loading the notification settings. Please try again."
-msgstr ""
-
-msgid "An error occured while saving changes: %{error}"
-msgstr ""
-
-msgid "An error occured while updating the notification settings. Please try again."
-msgstr ""
-
 msgid "An error occurred adding a draft to the thread."
 msgstr ""
 
@@ -3301,6 +3292,9 @@ msgstr ""
 msgid "An error occurred while dismissing the feature highlight. Refresh the page and try dismissing again."
 msgstr ""
 
+msgid "An error occurred while drawing job relationship links."
+msgstr ""
+
 msgid "An error occurred while enabling Service Desk."
 msgstr ""
 
@@ -3457,12 +3451,18 @@ msgstr ""
 msgid "An error occurred while loading the merge request."
 msgstr ""
 
+msgid "An error occurred while loading the notification settings. Please try again."
+msgstr ""
+
 msgid "An error occurred while loading the pipeline."
 msgstr ""
 
 msgid "An error occurred while loading the pipelines jobs."
 msgstr ""
 
+msgid "An error occurred while loading your content. Please try again."
+msgstr ""
+
 msgid "An error occurred while making the request."
 msgstr ""
 
@@ -3505,6 +3505,9 @@ msgstr ""
 msgid "An error occurred while retrieving projects."
 msgstr ""
 
+msgid "An error occurred while saving changes: %{error}"
+msgstr ""
+
 msgid "An error occurred while searching users."
 msgstr ""
 
@@ -3544,6 +3547,9 @@ msgstr ""
 msgid "An error occurred while updating the milestone."
 msgstr ""
 
+msgid "An error occurred while updating the notification settings. Please try again."
+msgstr ""
+
 msgid "An error occurred while validating group path"
 msgstr ""
 
@@ -3556,12 +3562,6 @@ msgstr ""
 msgid "An error occurred. Please try again."
 msgstr ""
 
-msgid "An error ocurred while drawing job relationship links."
-msgstr ""
-
-msgid "An error ocurred while loading your content. Please try again."
-msgstr ""
-
 msgid "An example project for managing Kubernetes clusters integrated with GitLab"
 msgstr ""
 
@@ -10359,10 +10359,10 @@ msgstr ""
 msgid "DevopsAdoption|Adopted"
 msgstr ""
 
-msgid "DevopsAdoption|An error occured while removing the group. Please try again."
+msgid "DevopsAdoption|An error occurred while removing the group. Please try again."
 msgstr ""
 
-msgid "DevopsAdoption|An error occured while saving the group. Please try again."
+msgid "DevopsAdoption|An error occurred while saving the group. Please try again."
 msgstr ""
 
 msgid "DevopsAdoption|Approvals"
@@ -16807,7 +16807,7 @@ msgstr ""
 msgid "JiraService|%{user_link} mentioned this issue in %{entity_link} of %{project_link}%{branch}:{quote}%{entity_message}{quote}"
 msgstr ""
 
-msgid "JiraService|An error occured while fetching issue list"
+msgid "JiraService|An error occurred while fetching issue list"
 msgstr ""
 
 msgid "JiraService|Automatically transitions Jira issues to the \"Done\" category. %{linkStart}Learn more%{linkEnd}"
@@ -21695,10 +21695,10 @@ msgstr ""
 msgid "Pipeline: %{status}"
 msgstr ""
 
-msgid "PipelineCharts|An error has ocurred when retrieving the analytics data"
+msgid "PipelineCharts|An error has occurred when retrieving the analytics data"
 msgstr ""
 
-msgid "PipelineCharts|An error has ocurred when retrieving the pipelines data"
+msgid "PipelineCharts|An error has occurred when retrieving the pipelines data"
 msgstr ""
 
 msgid "PipelineCharts|An unknown error occurred while processing CI/CD analytics."
@@ -24925,10 +24925,10 @@ msgstr ""
 msgid "Reports|Activity"
 msgstr ""
 
-msgid "Reports|An error occured while loading report"
+msgid "Reports|An error occurred while loading %{name} results"
 msgstr ""
 
-msgid "Reports|An error occurred while loading %{name} results"
+msgid "Reports|An error occurred while loading report"
 msgstr ""
 
 msgid "Reports|Class"

spec/controllers/projects/web_ide_schemas_controller_spec.rb

@@ -53,13 +53,13 @@ RSpec.describe Projects::WebIdeSchemasController do
     end
 
     context 'when an error occurs parsing the schema' do
-      let(:result) { { status: :error, message: 'Some error occured' } }
+      let(:result) { { status: :error, message: 'Some error occurred' } }
 
       it 'returns 422 with the error' do
         subject
 
         expect(response).to have_gitlab_http_status(:unprocessable_entity)
-        expect(response.body).to eq('{"status":"error","message":"Some error occured"}')
+        expect(response.body).to eq('{"status":"error","message":"Some error occurred"}')
       end
     end
   end

spec/features/projects/pages/user_edits_settings_spec.rb

@@ -140,7 +140,7 @@ RSpec.describe 'Pages edits pages settings', :js do
 
       before do
         allow(Projects::UpdateService).to receive(:new).and_return(service)
-        allow(service).to receive(:execute).and_return(status: :error, message: 'Some error has occured')
+        allow(service).to receive(:execute).and_return(status: :error, message: 'Some error has occurred')
       end
 
       it 'tries to change the setting' do
@@ -150,7 +150,7 @@ RSpec.describe 'Pages edits pages settings', :js do
 
         click_button 'Save'
 
-        expect(page).to have_text('Some error has occured')
+        expect(page).to have_text('Some error has occurred')
       end
     end
 

spec/frontend/monitoring/components/dashboard_panel_builder_spec.js

@@ -188,7 +188,7 @@ describe('dashboard invalid url parameters', () => {
   });
 
   describe('when there is an error', () => {
-    const mockError = 'an error ocurred!';
+    const mockError = 'an error occurred!';
 
     beforeEach(() => {
       store.commit(`monitoringDashboard/${types.RECEIVE_PANEL_PREVIEW_FAILURE}`, mockError);

spec/frontend/monitoring/requests/index_spec.js

@@ -94,7 +94,7 @@ describe('monitoring metrics_requests', () => {
     it('rejects after getting an HTTP 500 error', () => {
       mock.onGet(prometheusEndpoint).reply(500, {
         status: 'error',
-        error: 'An error ocurred',
+        error: 'An error occurred',
       });
 
       return getPrometheusQueryData(prometheusEndpoint, params).catch((error) => {
@@ -106,7 +106,7 @@ describe('monitoring metrics_requests', () => {
       // Mock multiple attempts while the cache is filling up and fails
       mock.onGet(prometheusEndpoint).reply(statusCodes.UNAUTHORIZED, {
         status: 'error',
-        error: 'An error ocurred',
+        error: 'An error occurred',
       });
 
       return getPrometheusQueryData(prometheusEndpoint, params).catch((error) => {
@@ -120,7 +120,7 @@ describe('monitoring metrics_requests', () => {
       mock.onGet(prometheusEndpoint).replyOnce(statusCodes.NO_CONTENT);
       mock.onGet(prometheusEndpoint).reply(500, {
         status: 'error',
-        error: 'An error ocurred',
+        error: 'An error occurred',
       }); // 3rd attempt
 
       return getPrometheusQueryData(prometheusEndpoint, params).catch((error) => {

spec/frontend/notifications/components/custom_notifications_modal_spec.js

@@ -180,7 +180,7 @@ describe('CustomNotificationsModal', () => {
         expect(
           mockToastShow,
         ).toHaveBeenCalledWith(
-          'An error occured while loading the notification settings. Please try again.',
+          'An error occurred while loading the notification settings. Please try again.',
           { type: 'error' },
         );
       });
@@ -258,7 +258,7 @@ describe('CustomNotificationsModal', () => {
         expect(
           mockToastShow,
         ).toHaveBeenCalledWith(
-          'An error occured while updating the notification settings. Please try again.',
+          'An error occurred while updating the notification settings. Please try again.',
           { type: 'error' },
         );
       });

spec/frontend/notifications/components/notifications_dropdown_spec.js

@@ -255,7 +255,7 @@ describe('NotificationsDropdown', () => {
       expect(
         mockToastShow,
       ).toHaveBeenCalledWith(
-        'An error occured while updating the notification settings. Please try again.',
+        'An error occurred while updating the notification settings. Please try again.',
         { type: 'error' },
       );
     });

spec/frontend/projects/settings_service_desk/components/service_desk_root_spec.js

@@ -154,7 +154,7 @@ describe('ServiceDeskRoot', () => {
         });
 
         it('shows an error message', () => {
-          expect(getAlertText()).toContain('An error occured while saving changes:');
+          expect(getAlertText()).toContain('An error occurred while saving changes:');
         });
       });
     });