diff options
author | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-18 16:16:36 +0300 |
---|---|---|
committer | GitLab Bot <gitlab-bot@gitlab.com> | 2021-11-18 16:16:36 +0300 |
commit | 311b0269b4eb9839fa63f80c8d7a58f32b8138a0 (patch) | |
tree | 07e7870bca8aed6d61fdcc810731c50d2c40af47 /app/assets/javascripts/import_entities/import_groups/constants.js | |
parent | 27909cef6c4170ed9205afa7426b8d3de47cbb0c (diff) |
Add latest changes from gitlab-org/gitlab@14-5-stable-eev14.5.0-rc42
Diffstat (limited to 'app/assets/javascripts/import_entities/import_groups/constants.js')
-rw-r--r-- | app/assets/javascripts/import_entities/import_groups/constants.js | 15 |
1 files changed, 12 insertions, 3 deletions
diff --git a/app/assets/javascripts/import_entities/import_groups/constants.js b/app/assets/javascripts/import_entities/import_groups/constants.js index b2c3d85e280..aa9cf3897e6 100644 --- a/app/assets/javascripts/import_entities/import_groups/constants.js +++ b/app/assets/javascripts/import_entities/import_groups/constants.js @@ -1,7 +1,16 @@ -import { s__ } from '~/locale'; +import { __, s__ } from '~/locale'; export const i18n = { - NAME_ALREADY_EXISTS: s__('BulkImport|Name already exists.'), + ERROR_INVALID_FORMAT: s__( + 'GroupSettings|Please choose a group URL with no special characters or spaces.', + ), + ERROR_NAME_ALREADY_EXISTS: s__('BulkImport|Name already exists.'), + ERROR_REQUIRED: __('This field is required.'), + ERROR_NAME_ALREADY_USED_IN_SUGGESTION: s__( + 'BulkImport|Name already used as a target for another group.', + ), + ERROR_IMPORT: s__('BulkImport|Importing the group failed.'), + ERROR_IMPORT_COMPLETED: s__('BulkImport|Import is finished. Pick another name for re-import'), }; -export const NEW_NAME_FIELD = 'new_name'; +export const NEW_NAME_FIELD = 'newName'; |