diff options
14 files changed, 55 insertions, 55 deletions
diff --git a/app/assets/javascripts/ci_variable_list/ajax_variable_list.js b/app/assets/javascripts/ci_variable_list/ajax_variable_list.js index c7a917457f3..dffabbfe1b8 100644 --- a/app/assets/javascripts/ci_variable_list/ajax_variable_list.js +++ b/app/assets/javascripts/ci_variable_list/ajax_variable_list.js @@ -84,7 +84,7 @@ export default class AjaxVariableList { .catch(() => { loadingIcon.classList.toggle('hide', true); this.variableList.toggleEnableRow(true); - Flash(s__('CiVariable|Error occured while saving variables')); + Flash(s__('CiVariable|Error occurred while saving variables')); }); } diff --git a/app/assets/javascripts/ide/stores/actions/file.js b/app/assets/javascripts/ide/stores/actions/file.js index a297740bd5f..e74b880e02c 100644 --- a/app/assets/javascripts/ide/stores/actions/file.js +++ b/app/assets/javascripts/ide/stores/actions/file.js @@ -82,7 +82,7 @@ export const getFileData = ( .catch(() => { commit(types.TOGGLE_LOADING, { entry: file }); dispatch('setErrorMessage', { - text: __('An error occured whilst loading the file.'), + text: __('An error occurred whilst loading the file.'), action: payload => dispatch('getFileData', payload).then(() => dispatch('setErrorMessage', null)), actionText: __('Please try again'), @@ -124,7 +124,7 @@ export const getRawFileData = ({ state, commit, dispatch, getters }, { path }) = }) .catch(() => { dispatch('setErrorMessage', { - text: __('An error occured whilst loading the file content.'), + text: __('An error occurred whilst loading the file content.'), action: payload => dispatch('getRawFileData', payload).then(() => dispatch('setErrorMessage', null)), actionText: __('Please try again'), diff --git a/app/assets/javascripts/ide/stores/actions/merge_request.js b/app/assets/javascripts/ide/stores/actions/merge_request.js index 8404c6d4f72..18c24369996 100644 --- a/app/assets/javascripts/ide/stores/actions/merge_request.js +++ b/app/assets/javascripts/ide/stores/actions/merge_request.js @@ -25,7 +25,7 @@ export const getMergeRequestData = ( }) .catch(() => { dispatch('setErrorMessage', { - text: __('An error occured whilst loading the merge request.'), + text: __('An error occurred whilst loading the merge request.'), action: payload => dispatch('getMergeRequestData', payload).then(() => dispatch('setErrorMessage', null), @@ -58,7 +58,7 @@ export const getMergeRequestChanges = ( }) .catch(() => { dispatch('setErrorMessage', { - text: __('An error occured whilst loading the merge request changes.'), + text: __('An error occurred whilst loading the merge request changes.'), action: payload => dispatch('getMergeRequestChanges', payload).then(() => dispatch('setErrorMessage', null), @@ -92,7 +92,7 @@ export const getMergeRequestVersions = ( }) .catch(() => { dispatch('setErrorMessage', { - text: __('An error occured whilst loading the merge request version data.'), + text: __('An error occurred whilst loading the merge request version data.'), action: payload => dispatch('getMergeRequestVersions', payload).then(() => dispatch('setErrorMessage', null), diff --git a/app/assets/javascripts/ide/stores/actions/project.js b/app/assets/javascripts/ide/stores/actions/project.js index 2cb08ab2945..b65f631c99c 100644 --- a/app/assets/javascripts/ide/stores/actions/project.js +++ b/app/assets/javascripts/ide/stores/actions/project.js @@ -103,7 +103,7 @@ export const createNewBranchFromDefault = ({ state, dispatch, getters }, branch) }) .catch(() => { dispatch('setErrorMessage', { - text: __('An error occured creating the new branch.'), + text: __('An error occurred creating the new branch.'), action: payload => dispatch('createNewBranchFromDefault', payload), actionText: __('Please try again'), actionPayload: branch, diff --git a/app/assets/javascripts/ide/stores/actions/tree.js b/app/assets/javascripts/ide/stores/actions/tree.js index 9288bbe32f5..de5f6050074 100644 --- a/app/assets/javascripts/ide/stores/actions/tree.js +++ b/app/assets/javascripts/ide/stores/actions/tree.js @@ -76,7 +76,7 @@ export const getFiles = ({ state, commit, dispatch }, { projectId, branchId } = dispatch('showBranchNotFoundError', branchId); } else { dispatch('setErrorMessage', { - text: __('An error occured whilst loading all the files.'), + text: __('An error occurred whilst loading all the files.'), action: payload => dispatch('getFiles', payload).then(() => dispatch('setErrorMessage', null)), actionText: __('Please try again'), diff --git a/app/assets/javascripts/ide/stores/modules/pipelines/actions.js b/app/assets/javascripts/ide/stores/modules/pipelines/actions.js index ea2525a2f0e..51cf4dede42 100644 --- a/app/assets/javascripts/ide/stores/modules/pipelines/actions.js +++ b/app/assets/javascripts/ide/stores/modules/pipelines/actions.js @@ -28,7 +28,7 @@ export const receiveLatestPipelineError = ({ commit, dispatch }, err) => { dispatch( 'setErrorMessage', { - text: __('An error occured whilst fetching the latest pipeline.'), + text: __('An error occurred whilst fetching the latest pipeline.'), action: () => dispatch('forcePipelineRequest').then(() => dispatch('setErrorMessage', null, { root: true }), @@ -84,7 +84,7 @@ export const receiveJobsError = ({ commit, dispatch }, stage) => { dispatch( 'setErrorMessage', { - text: __('An error occured whilst loading the pipelines jobs.'), + text: __('An error occurred whilst loading the pipelines jobs.'), action: payload => dispatch('fetchJobs', payload).then(() => dispatch('setErrorMessage', null, { root: true }), @@ -123,7 +123,7 @@ export const receiveJobTraceError = ({ commit, dispatch }) => { dispatch( 'setErrorMessage', { - text: __('An error occured whilst fetching the job trace.'), + text: __('An error occurred whilst fetching the job trace.'), action: () => dispatch('fetchJobTrace').then(() => dispatch('setErrorMessage', null, { root: true })), actionText: __('Please try again'), diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue index 78f085e5312..21095fcba16 100644 --- a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue +++ b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_machine_type_dropdown.vue @@ -47,7 +47,7 @@ export default { errorMessage() { return sprintf( s__( - 'ClusterIntegration|An error occured while trying to fetch zone machine types: %{error}', + 'ClusterIntegration|An error occurred while trying to fetch zone machine types: %{error}', ), { error: this.gapiError }, ); diff --git a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown.vue b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown.vue index 8e51dd352c7..056584c8865 100644 --- a/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown.vue +++ b/app/assets/javascripts/projects/gke_cluster_dropdowns/components/gke_project_id_dropdown.vue @@ -93,7 +93,7 @@ export default { } return sprintf( - s__('ClusterIntegration|An error occured while trying to fetch your projects: %{error}'), + s__('ClusterIntegration|An error occurred while trying to fetch your projects: %{error}'), { error: this.gapiError }, ); }, diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 7af36b049d8..e0aa7a9843d 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -498,34 +498,7 @@ msgstr "" msgid "An error has occurred" msgstr "" -msgid "An error occured creating the new branch." -msgstr "" - -msgid "An error occured whilst fetching the job trace." -msgstr "" - -msgid "An error occured whilst fetching the latest pipeline." -msgstr "" - -msgid "An error occured whilst loading all the files." -msgstr "" - -msgid "An error occured whilst loading the file content." -msgstr "" - -msgid "An error occured whilst loading the file." -msgstr "" - -msgid "An error occured whilst loading the merge request changes." -msgstr "" - -msgid "An error occured whilst loading the merge request version data." -msgstr "" - -msgid "An error occured whilst loading the merge request." -msgstr "" - -msgid "An error occured whilst loading the pipelines jobs." +msgid "An error occurred creating the new branch." msgstr "" msgid "An error occurred previewing the blob" @@ -603,6 +576,33 @@ msgstr "" msgid "An error occurred while validating username" msgstr "" +msgid "An error occurred whilst fetching the job trace." +msgstr "" + +msgid "An error occurred whilst fetching the latest pipeline." +msgstr "" + +msgid "An error occurred whilst loading all the files." +msgstr "" + +msgid "An error occurred whilst loading the file content." +msgstr "" + +msgid "An error occurred whilst loading the file." +msgstr "" + +msgid "An error occurred whilst loading the merge request changes." +msgstr "" + +msgid "An error occurred whilst loading the merge request version data." +msgstr "" + +msgid "An error occurred whilst loading the merge request." +msgstr "" + +msgid "An error occurred whilst loading the pipelines jobs." +msgstr "" + msgid "An error occurred. Please try again." msgstr "" @@ -1316,7 +1316,7 @@ msgstr "" msgid "CiVariable|All environments" msgstr "" -msgid "CiVariable|Error occured while saving variables" +msgid "CiVariable|Error occurred while saving variables" msgstr "" msgid "CiVariable|Protected" @@ -1397,13 +1397,13 @@ msgstr "" msgid "ClusterIntegration|An error occured while trying to fetch project zones: %{error}" msgstr "" -msgid "ClusterIntegration|An error occured while trying to fetch your projects: %{error}" +msgid "ClusterIntegration|An error occurred when trying to contact the Google Cloud API. Please try again later." msgstr "" -msgid "ClusterIntegration|An error occured while trying to fetch zone machine types: %{error}" +msgid "ClusterIntegration|An error occurred while trying to fetch your projects: %{error}" msgstr "" -msgid "ClusterIntegration|An error occurred when trying to contact the Google Cloud API. Please try again later." +msgid "ClusterIntegration|An error occurred while trying to fetch zone machine types: %{error}" msgstr "" msgid "ClusterIntegration|Applications" diff --git a/scripts/frontend/prettier.js b/scripts/frontend/prettier.js index ce86a9f4601..ffb09ea9779 100644 --- a/scripts/frontend/prettier.js +++ b/scripts/frontend/prettier.js @@ -111,6 +111,6 @@ Promise.all(matchedFiles.map(checkFileWithPrettierConfig)) if (didWarn) process.exit(1); }) .catch(e => { - console.log(`\nAn error occured while processing files with prettier: ${e.message}\n`); + console.log(`\nAn error occurred while processing files with prettier: ${e.message}\n`); process.exit(1); }); diff --git a/spec/javascripts/ide/stores/actions/file_spec.js b/spec/javascripts/ide/stores/actions/file_spec.js index 1ca811e996b..7ddc734ff56 100644 --- a/spec/javascripts/ide/stores/actions/file_spec.js +++ b/spec/javascripts/ide/stores/actions/file_spec.js @@ -296,7 +296,7 @@ describe('IDE store file actions', () => { .getFileData({ state: store.state, commit() {}, dispatch }, { path: localFile.path }) .then(() => { expect(dispatch).toHaveBeenCalledWith('setErrorMessage', { - text: 'An error occured whilst loading the file.', + text: 'An error occurred whilst loading the file.', action: jasmine.any(Function), actionText: 'Please try again', actionPayload: { @@ -408,7 +408,7 @@ describe('IDE store file actions', () => { .then(done.fail) .catch(() => { expect(dispatch).toHaveBeenCalledWith('setErrorMessage', { - text: 'An error occured whilst loading the file content.', + text: 'An error occurred whilst loading the file content.', action: jasmine.any(Function), actionText: 'Please try again', actionPayload: { diff --git a/spec/javascripts/ide/stores/actions/merge_request_spec.js b/spec/javascripts/ide/stores/actions/merge_request_spec.js index d8e9260e932..9bfc7c397b8 100644 --- a/spec/javascripts/ide/stores/actions/merge_request_spec.js +++ b/spec/javascripts/ide/stores/actions/merge_request_spec.js @@ -82,7 +82,7 @@ describe('IDE store merge request actions', () => { .then(done.fail) .catch(() => { expect(dispatch).toHaveBeenCalledWith('setErrorMessage', { - text: 'An error occured whilst loading the merge request.', + text: 'An error occurred whilst loading the merge request.', action: jasmine.any(Function), actionText: 'Please try again', actionPayload: { @@ -155,7 +155,7 @@ describe('IDE store merge request actions', () => { .then(done.fail) .catch(() => { expect(dispatch).toHaveBeenCalledWith('setErrorMessage', { - text: 'An error occured whilst loading the merge request changes.', + text: 'An error occurred whilst loading the merge request changes.', action: jasmine.any(Function), actionText: 'Please try again', actionPayload: { @@ -225,7 +225,7 @@ describe('IDE store merge request actions', () => { .then(done.fail) .catch(() => { expect(dispatch).toHaveBeenCalledWith('setErrorMessage', { - text: 'An error occured whilst loading the merge request version data.', + text: 'An error occurred whilst loading the merge request version data.', action: jasmine.any(Function), actionText: 'Please try again', actionPayload: { diff --git a/spec/javascripts/ide/stores/actions/tree_spec.js b/spec/javascripts/ide/stores/actions/tree_spec.js index d47c60dc581..bd41e87bf0e 100644 --- a/spec/javascripts/ide/stores/actions/tree_spec.js +++ b/spec/javascripts/ide/stores/actions/tree_spec.js @@ -143,7 +143,7 @@ describe('Multi-file store tree actions', () => { .then(done.fail) .catch(() => { expect(dispatch).toHaveBeenCalledWith('setErrorMessage', { - text: 'An error occured whilst loading all the files.', + text: 'An error occurred whilst loading all the files.', action: jasmine.any(Function), actionText: 'Please try again', actionPayload: { projectId: 'abc/def', branchId: 'master-testing' }, diff --git a/spec/javascripts/ide/stores/modules/pipelines/actions_spec.js b/spec/javascripts/ide/stores/modules/pipelines/actions_spec.js index c9c09ee9afe..0937ee38390 100644 --- a/spec/javascripts/ide/stores/modules/pipelines/actions_spec.js +++ b/spec/javascripts/ide/stores/modules/pipelines/actions_spec.js @@ -77,7 +77,7 @@ describe('IDE pipelines actions', () => { { type: 'setErrorMessage', payload: { - text: 'An error occured whilst fetching the latest pipeline.', + text: 'An error occurred whilst fetching the latest pipeline.', action: jasmine.any(Function), actionText: 'Please try again', actionPayload: null, @@ -223,7 +223,7 @@ describe('IDE pipelines actions', () => { { type: 'setErrorMessage', payload: { - text: 'An error occured whilst loading the pipelines jobs.', + text: 'An error occurred whilst loading the pipelines jobs.', action: jasmine.anything(), actionText: 'Please try again', actionPayload: { id: 1 }, @@ -360,7 +360,7 @@ describe('IDE pipelines actions', () => { { type: 'setErrorMessage', payload: { - text: 'An error occured whilst fetching the job trace.', + text: 'An error occurred whilst fetching the job trace.', action: jasmine.any(Function), actionText: 'Please try again', actionPayload: null, |