Merge branch 'fix-typos-occured' into 'master'
Fix typos occured to occurred See merge request gitlab-org/gitlab-ce!23105
This commit is contained in:
commit
7002752d47
|
@ -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'));
|
||||
});
|
||||
}
|
||||
|
||||
|
|
|
@ -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'),
|
||||
|
|
|
@ -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),
|
||||
|
|
|
@ -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,
|
||||
|
|
|
@ -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'),
|
||||
|
|
|
@ -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'),
|
||||
|
|
|
@ -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 },
|
||||
);
|
||||
|
|
|
@ -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 },
|
||||
);
|
||||
},
|
||||
|
|
|
@ -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,15 +1397,15 @@ 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}"
|
||||
msgstr ""
|
||||
|
||||
msgid "ClusterIntegration|An error occured while trying to fetch zone machine types: %{error}"
|
||||
msgstr ""
|
||||
|
||||
msgid "ClusterIntegration|An error occurred when trying to contact the Google Cloud API. Please try again later."
|
||||
msgstr ""
|
||||
|
||||
msgid "ClusterIntegration|An error occurred while trying to fetch your projects: %{error}"
|
||||
msgstr ""
|
||||
|
||||
msgid "ClusterIntegration|An error occurred while trying to fetch zone machine types: %{error}"
|
||||
msgstr ""
|
||||
|
||||
msgid "ClusterIntegration|Applications"
|
||||
msgstr ""
|
||||
|
||||
|
|
|
@ -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);
|
||||
});
|
||||
|
|
|
@ -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: {
|
||||
|
|
|
@ -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: {
|
||||
|
|
|
@ -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' },
|
||||
|
|
|
@ -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,
|
||||
|
|
Loading…
Reference in New Issue