Resolve more discussionsmw-i18n-app-helpers-services

- Rename namespaces in services
- Update PO file

10 files changed, 118 insertions, 118 deletions

diff --git a/app/services/issues/move_service.rb b/app/services/issues/move_service.rb
index b1b462f31ba..334fadadb6f 100644
--- a/app/services/issues/move_service.rb
+++ b/app/services/issues/move_service.rb
@@ -8,11 +8,11 @@ module Issues
       @target_project = target_project
 
       unless issue.can_move?(current_user, @target_project)
-        raise MoveError, s_('IssueMoveService|Cannot move issue due to insufficient permissions!')
+        raise MoveError, s_('MoveIssue|Cannot move issue due to insufficient permissions!')
       end
 
       if @project == @target_project
-        raise MoveError, s_('IssueMoveService|Cannot move issue to project it originates from!')
+        raise MoveError, s_('MoveIssue|Cannot move issue to project it originates from!')
       end
 
       super
diff --git a/app/services/members/create_service.rb b/app/services/members/create_service.rb
index f03ae1b9a8a..f6bad74736c 100644
--- a/app/services/members/create_service.rb
+++ b/app/services/members/create_service.rb
@@ -5,11 +5,11 @@ module Members
     DEFAULT_LIMIT = 100
 
     def execute(source)
-      return error(s_('MemberCreateService|No users specified.')) if params[:user_ids].blank?
+      return error(s_('AddMember|No users specified.')) if params[:user_ids].blank?
 
       user_ids = params[:user_ids].split(',').uniq
 
-      return error(s_("MemberCreateService|Too many users specified (limit is %{user_limit})") % { user_limit: user_limit }) if
+      return error(s_("AddMember|Too many users specified (limit is %{user_limit})") % { user_limit: user_limit }) if
         user_limit && user_ids.size > user_limit
 
       members = source.add_users(
diff --git a/app/services/merge_requests/squash_service.rb b/app/services/merge_requests/squash_service.rb
index 27e491ada04..88ca3b4f5a8 100644
--- a/app/services/merge_requests/squash_service.rb
+++ b/app/services/merge_requests/squash_service.rb
@@ -10,10 +10,10 @@ module MergeRequests
       end
 
       if merge_request.squash_in_progress?
-        return error(s_('SquashService|Squash task canceled: another squash is already in progress.'))
+        return error(s_('MergeRequests|Squash task canceled: another squash is already in progress.'))
       end
 
-      squash! || error(s_('SquashService|Failed to squash. Should be done manually.'))
+      squash! || error(s_('MergeRequests|Failed to squash. Should be done manually.'))
     end
 
     private
diff --git a/app/services/milestones/promote_service.rb b/app/services/milestones/promote_service.rb
index 9b87a8ec516..0fe67067eb5 100644
--- a/app/services/milestones/promote_service.rb
+++ b/app/services/milestones/promote_service.rb
@@ -43,7 +43,7 @@ module Milestones
     end
 
     def check_project_milestone!(milestone)
-      raise_error(s_('PromoteService|Only project milestones can be promoted.')) unless milestone.project_milestone?
+      raise_error(s_('PromoteMilestone|Only project milestones can be promoted.')) unless milestone.project_milestone?
     end
 
     def clone_project_milestone(milestone)
@@ -71,7 +71,7 @@ module Milestones
     # rubocop: enable CodeReuse/ActiveRecord
 
     def group
-      @group ||= parent.group || raise_error(s_('PromoteService|Project does not belong to a group.'))
+      @group ||= parent.group || raise_error(s_('PromoteMilestone|Project does not belong to a group.'))
     end
 
     # rubocop: disable CodeReuse/ActiveRecord
@@ -85,7 +85,7 @@ module Milestones
     end
 
     def raise_error(message)
-      raise PromoteMilestoneError, s_("PromoteService|Promotion failed - %{message}") % { message: message }
+      raise PromoteMilestoneError, s_("PromoteMilestone|Promotion failed - %{message}") % { message: message }
     end
   end
 end
diff --git a/app/services/projects/destroy_service.rb b/app/services/projects/destroy_service.rb
index 8958a4c6e45..d8e670e40ce 100644
--- a/app/services/projects/destroy_service.rb
+++ b/app/services/projects/destroy_service.rb
@@ -61,11 +61,11 @@ module Projects
       flush_caches(@project)
 
       unless rollback_repository(removal_path(repo_path), repo_path)
-        raise_error(s_('ProjectDestroyService|Failed to restore project repository. Please contact the administrator.'))
+        raise_error(s_('DeleteProject|Failed to restore project repository. Please contact the administrator.'))
       end
 
       unless rollback_repository(removal_path(wiki_path), wiki_path)
-        raise_error(s_('ProjectDestroyService|Failed to restore wiki repository. Please contact the administrator.'))
+        raise_error(s_('DeleteProject|Failed to restore wiki repository. Please contact the administrator.'))
       end
     end
 
@@ -81,11 +81,11 @@ module Projects
 
     def trash_repositories!
       unless remove_repository(repo_path)
-        raise_error(s_('ProjectDestroyService|Failed to remove project repository. Please try again or contact administrator.'))
+        raise_error(s_('DeleteProject|Failed to remove project repository. Please try again or contact administrator.'))
       end
 
       unless remove_repository(wiki_path)
-        raise_error(s_('ProjectDestroyService|Failed to remove wiki repository. Please try again or contact administrator.'))
+        raise_error(s_('DeleteProject|Failed to remove wiki repository. Please try again or contact administrator.'))
       end
     end
 
@@ -148,7 +148,7 @@ module Projects
 
     def attempt_destroy_transaction(project)
       unless remove_registry_tags
-        raise_error(s_('ProjectDestroyService|Failed to remove some tags in project container registry. Please try again or contact administrator.'))
+        raise_error(s_('DeleteProject|Failed to remove some tags in project container registry. Please try again or contact administrator.'))
       end
 
       project.leave_pool_repository
diff --git a/app/services/projects/transfer_service.rb b/app/services/projects/transfer_service.rb
index 575c8b3d155..9458bd6e1f7 100644
--- a/app/services/projects/transfer_service.rb
+++ b/app/services/projects/transfer_service.rb
@@ -17,11 +17,11 @@ module Projects
       @new_namespace = new_namespace
 
       if @new_namespace.blank?
-        raise TransferError, s_('ProjectTransferService|Please select a new namespace for your project.')
+        raise TransferError, s_('TransferProject|Please select a new namespace for your project.')
       end
 
       unless allowed_transfer?(current_user, project)
-        raise TransferError, s_('ProjectTransferService|Transfer failed, please contact an admin.')
+        raise TransferError, s_('TransferProject|Transfer failed, please contact an admin.')
       end
 
       transfer(project)
@@ -45,12 +45,12 @@ module Projects
       @old_namespace = project.namespace
 
       if Project.where(namespace_id: @new_namespace.try(:id)).where('path = ? or name = ?', project.path, project.name).exists?
-        raise TransferError.new(s_("ProjectTransferService|Project with same name or path in target namespace already exists"))
+        raise TransferError.new(s_("TransferProject|Project with same name or path in target namespace already exists"))
       end
 
       if project.has_container_registry_tags?
         # We currently don't support renaming repository if it contains tags in container registry
-        raise TransferError.new(s_('ProjectTransferService|Project cannot be transferred, because tags are present in its container registry'))
+        raise TransferError.new(s_('TransferProject|Project cannot be transferred, because tags are present in its container registry'))
       end
 
       attempt_transfer_transaction
@@ -145,7 +145,7 @@ module Projects
 
       # Move main repository
       unless move_repo_folder(@old_path, @new_path)
-        raise TransferError.new(s_("ProjectTransferService|Cannot move project"))
+        raise TransferError.new(s_("TransferProject|Cannot move project"))
       end
 
       # Disk path is changed; we need to ensure we reload it
diff --git a/app/services/projects/update_service.rb b/app/services/projects/update_service.rb
index 4509918cb1a..864ce4fa9f5 100644
--- a/app/services/projects/update_service.rb
+++ b/app/services/projects/update_service.rb
@@ -42,15 +42,15 @@ module Projects
 
     def validate!
       unless valid_visibility_level_change?(project, params[:visibility_level])
-        raise ValidationError.new(s_('ProjectUpdateService|New visibility level not allowed!'))
+        raise ValidationError.new(s_('UpdateProject|New visibility level not allowed!'))
       end
 
       if renaming_project_with_container_registry_tags?
-        raise ValidationError.new(s_('ProjectUpdateService|Cannot rename project because it contains container registry tags!'))
+        raise ValidationError.new(s_('UpdateProject|Cannot rename project because it contains container registry tags!'))
       end
 
       if changing_default_branch?
-        raise ValidationError.new(s_("ProjectUpdateService|Could not set the default branch")) unless project.change_head(params[:default_branch])
+        raise ValidationError.new(s_("UpdateProject|Could not set the default branch")) unless project.change_head(params[:default_branch])
       end
     end
 
@@ -91,7 +91,7 @@ module Projects
 
     def update_failed!
       model_errors = project.errors.full_messages.to_sentence
-      error_message = model_errors.presence || s_('ProjectUpdateService|Project could not be updated!')
+      error_message = model_errors.presence || s_('UpdateProject|Project could not be updated!')
 
       error(error_message)
     end
diff --git a/app/services/test_hooks/project_service.rb b/app/services/test_hooks/project_service.rb
index eb73e6eff94..6607f5b2418 100644
--- a/app/services/test_hooks/project_service.rb
+++ b/app/services/test_hooks/project_service.rb
@@ -11,7 +11,7 @@ module TestHooks
     private
 
     def push_events_data
-      throw(:validation_error, s_('ProjectService|Ensure the project has at least one commit.')) if project.empty_repo?
+      throw(:validation_error, s_('TestHooks|Ensure the project has at least one commit.')) if project.empty_repo?
 
       Gitlab::DataBuilder::Push.build_sample(project, current_user)
     end
@@ -20,14 +20,14 @@ module TestHooks
 
     def note_events_data
       note = project.notes.first
-      throw(:validation_error, s_('ProjectService|Ensure the project has notes.')) unless note.present?
+      throw(:validation_error, s_('TestHooks|Ensure the project has notes.')) unless note.present?
 
       Gitlab::DataBuilder::Note.build(note, current_user)
     end
 
     def issues_events_data
       issue = project.issues.first
-      throw(:validation_error, s_('ProjectService|Ensure the project has issues.')) unless issue.present?
+      throw(:validation_error, s_('TestHooks|Ensure the project has issues.')) unless issue.present?
 
       issue.to_hook_data(current_user)
     end
@@ -36,21 +36,21 @@ module TestHooks
 
     def merge_requests_events_data
       merge_request = project.merge_requests.first
-      throw(:validation_error, s_('ProjectService|Ensure the project has merge requests.')) unless merge_request.present?
+      throw(:validation_error, s_('TestHooks|Ensure the project has merge requests.')) unless merge_request.present?
 
       merge_request.to_hook_data(current_user)
     end
 
     def job_events_data
       build = project.builds.first
-      throw(:validation_error, s_('ProjectService|Ensure the project has CI jobs.')) unless build.present?
+      throw(:validation_error, s_('TestHooks|Ensure the project has CI jobs.')) unless build.present?
 
       Gitlab::DataBuilder::Build.build(build)
     end
 
     def pipeline_events_data
       pipeline = project.ci_pipelines.first
-      throw(:validation_error, s_('ProjectService|Ensure the project has CI pipelines.')) unless pipeline.present?
+      throw(:validation_error, s_('TestHooks|Ensure the project has CI pipelines.')) unless pipeline.present?
 
       Gitlab::DataBuilder::Pipeline.build(pipeline)
     end
@@ -58,7 +58,7 @@ module TestHooks
     def wiki_page_events_data
       page = project.wiki.pages.first
       if !project.wiki_enabled? || page.blank?
-        throw(:validation_error, s_('ProjectService|Ensure the wiki is enabled and has pages.'))
+        throw(:validation_error, s_('TestHooks|Ensure the wiki is enabled and has pages.'))
       end
 
       Gitlab::DataBuilder::WikiPage.build(page, current_user, 'create')
diff --git a/app/services/test_hooks/system_service.rb b/app/services/test_hooks/system_service.rb
index d19299999a9..fedf9c6799b 100644
--- a/app/services/test_hooks/system_service.rb
+++ b/app/services/test_hooks/system_service.rb
@@ -18,7 +18,7 @@ module TestHooks
 
     def merge_requests_events_data
       merge_request = MergeRequest.of_projects(current_user.projects.select(:id)).first
-      throw(:validation_error, s_('SystemService|Ensure one of your projects has merge requests.')) unless merge_request.present?
+      throw(:validation_error, s_('TestHooks|Ensure one of your projects has merge requests.')) unless merge_request.present?
 
       merge_request.to_hook_data(current_user)
     end
diff --git a/locale/gitlab.pot b/locale/gitlab.pot
index e89ed853fe0..99e18d8072b 100644
--- a/locale/gitlab.pot
+++ b/locale/gitlab.pot
@@ -513,6 +513,12 @@ msgstr ""
 msgid "Add users to group"
 msgstr ""
 
+msgid "AddMember|No users specified."
+msgstr ""
+
+msgid "AddMember|Too many users specified (limit is %{user_limit})"
+msgstr ""
+
 msgid "Added at"
 msgstr ""
 
@@ -2894,6 +2900,21 @@ msgstr ""
 msgid "Delete this attachment"
 msgstr ""
 
+msgid "DeleteProject|Failed to remove project repository. Please try again or contact administrator."
+msgstr ""
+
+msgid "DeleteProject|Failed to remove some tags in project container registry. Please try again or contact administrator."
+msgstr ""
+
+msgid "DeleteProject|Failed to remove wiki repository. Please try again or contact administrator."
+msgstr ""
+
+msgid "DeleteProject|Failed to restore project repository. Please contact the administrator."
+msgstr ""
+
+msgid "DeleteProject|Failed to restore wiki repository. Please contact the administrator."
+msgstr ""
+
 msgid "Deleted"
 msgstr ""
 
@@ -4745,12 +4766,6 @@ msgstr ""
 msgid "IssueBoards|Board"
 msgstr ""
 
-msgid "IssueMoveService|Cannot move issue due to insufficient permissions!"
-msgstr ""
-
-msgid "IssueMoveService|Cannot move issue to project it originates from!"
-msgstr ""
-
 msgid "Issues"
 msgstr ""
 
@@ -5223,12 +5238,6 @@ msgstr ""
 msgid "Member since %{date}"
 msgstr ""
 
-msgid "MemberCreateService|No users specified."
-msgstr ""
-
-msgid "MemberCreateService|Too many users specified (limit is %{user_limit})"
-msgstr ""
-
 msgid "Members"
 msgstr ""
 
@@ -5280,6 +5289,9 @@ msgstr ""
 msgid "MergeRequests|Add a reply"
 msgstr ""
 
+msgid "MergeRequests|Failed to squash. Should be done manually."
+msgstr ""
+
 msgid "MergeRequests|Jump to next unresolved discussion"
 msgstr ""
 
@@ -5292,6 +5304,9 @@ msgstr ""
 msgid "MergeRequests|Saving the comment failed"
 msgstr ""
 
+msgid "MergeRequests|Squash task canceled: another squash is already in progress."
+msgstr ""
+
 msgid "MergeRequests|Toggle comments for this file"
 msgstr ""
 
@@ -5499,6 +5514,12 @@ msgstr ""
 msgid "Move issue"
 msgstr ""
 
+msgid "MoveIssue|Cannot move issue due to insufficient permissions!"
+msgstr ""
+
+msgid "MoveIssue|Cannot move issue to project it originates from!"
+msgstr ""
+
 msgid "Multiple model types found: %{model_types}"
 msgstr ""
 
@@ -6760,21 +6781,6 @@ msgstr ""
 msgid "ProjectCreationLevel|No one"
 msgstr ""
 
-msgid "ProjectDestroyService|Failed to remove project repository. Please try again or contact administrator."
-msgstr ""
-
-msgid "ProjectDestroyService|Failed to remove some tags in project container registry. Please try again or contact administrator."
-msgstr ""
-
-msgid "ProjectDestroyService|Failed to remove wiki repository. Please try again or contact administrator."
-msgstr ""
-
-msgid "ProjectDestroyService|Failed to restore project repository. Please contact the administrator."
-msgstr ""
-
-msgid "ProjectDestroyService|Failed to restore wiki repository. Please contact the administrator."
-msgstr ""
-
 msgid "ProjectFileTree|Name"
 msgstr ""
 
@@ -6808,27 +6814,6 @@ msgstr ""
 msgid "ProjectPage|Project ID: %{project_id}"
 msgstr ""
 
-msgid "ProjectService|Ensure the project has CI jobs."
-msgstr ""
-
-msgid "ProjectService|Ensure the project has CI pipelines."
-msgstr ""
-
-msgid "ProjectService|Ensure the project has at least one commit."
-msgstr ""
-
-msgid "ProjectService|Ensure the project has issues."
-msgstr ""
-
-msgid "ProjectService|Ensure the project has merge requests."
-msgstr ""
-
-msgid "ProjectService|Ensure the project has notes."
-msgstr ""
-
-msgid "ProjectService|Ensure the wiki is enabled and has pages."
-msgstr ""
-
 msgid "ProjectSettings|Badges"
 msgstr ""
 
@@ -6838,33 +6823,6 @@ msgstr ""
 msgid "ProjectSettings|Learn more about badges."
 msgstr ""
 
-msgid "ProjectTransferService|Cannot move project"
-msgstr ""
-
-msgid "ProjectTransferService|Please select a new namespace for your project."
-msgstr ""
-
-msgid "ProjectTransferService|Project cannot be transferred, because tags are present in its container registry"
-msgstr ""
-
-msgid "ProjectTransferService|Project with same name or path in target namespace already exists"
-msgstr ""
-
-msgid "ProjectTransferService|Transfer failed, please contact an admin."
-msgstr ""
-
-msgid "ProjectUpdateService|Cannot rename project because it contains container registry tags!"
-msgstr ""
-
-msgid "ProjectUpdateService|Could not set the default branch"
-msgstr ""
-
-msgid "ProjectUpdateService|New visibility level not allowed!"
-msgstr ""
-
-msgid "ProjectUpdateService|Project could not be updated!"
-msgstr ""
-
 msgid "Projects"
 msgstr ""
 
@@ -6973,13 +6931,13 @@ msgstr ""
 msgid "Promote to group label"
 msgstr ""
 
-msgid "PromoteService|Only project milestones can be promoted."
+msgid "PromoteMilestone|Only project milestones can be promoted."
 msgstr ""
 
-msgid "PromoteService|Project does not belong to a group."
+msgid "PromoteMilestone|Project does not belong to a group."
 msgstr ""
 
-msgid "PromoteService|Promotion failed - %{message}"
+msgid "PromoteMilestone|Promotion failed - %{message}"
 msgstr ""
 
 msgid "Prompt users to upload SSH keys"
@@ -8101,12 +8059,6 @@ msgstr ""
 msgid "Squash commits"
 msgstr ""
 
-msgid "SquashService|Failed to squash. Should be done manually."
-msgstr ""
-
-msgid "SquashService|Squash task canceled: another squash is already in progress."
-msgstr ""
-
 msgid "Stage"
 msgstr ""
 
@@ -8314,9 +8266,6 @@ msgstr ""
 msgid "System metrics (Kubernetes)"
 msgstr ""
 
-msgid "SystemService|Ensure one of your projects has merge requests."
-msgstr ""
-
 msgid "Tag"
 msgstr ""
 
@@ -8431,6 +8380,30 @@ msgstr ""
 msgid "Test failed."
 msgstr ""
 
+msgid "TestHooks|Ensure one of your projects has merge requests."
+msgstr ""
+
+msgid "TestHooks|Ensure the project has CI jobs."
+msgstr ""
+
+msgid "TestHooks|Ensure the project has CI pipelines."
+msgstr ""
+
+msgid "TestHooks|Ensure the project has at least one commit."
+msgstr ""
+
+msgid "TestHooks|Ensure the project has issues."
+msgstr ""
+
+msgid "TestHooks|Ensure the project has merge requests."
+msgstr ""
+
+msgid "TestHooks|Ensure the project has notes."
+msgstr ""
+
+msgid "TestHooks|Ensure the wiki is enabled and has pages."
+msgstr ""
+
 msgid "Thank you for your report. A GitLab administrator will look into it shortly."
 msgstr ""
 
@@ -9250,6 +9223,21 @@ msgstr ""
 msgid "TransferGroup|You don't have enough permissions."
 msgstr ""
 
+msgid "TransferProject|Cannot move project"
+msgstr ""
+
+msgid "TransferProject|Please select a new namespace for your project."
+msgstr ""
+
+msgid "TransferProject|Project cannot be transferred, because tags are present in its container registry"
+msgstr ""
+
+msgid "TransferProject|Project with same name or path in target namespace already exists"
+msgstr ""
+
+msgid "TransferProject|Transfer failed, please contact an admin."
+msgstr ""
+
 msgid "Tree view"
 msgstr ""
 
@@ -9400,6 +9388,18 @@ msgstr ""
 msgid "Update your project name, topics, description and avatar."
 msgstr ""
 
+msgid "UpdateProject|Cannot rename project because it contains container registry tags!"
+msgstr ""
+
+msgid "UpdateProject|Could not set the default branch"
+msgstr ""
+
+msgid "UpdateProject|New visibility level not allowed!"
+msgstr ""
+
+msgid "UpdateProject|Project could not be updated!"
+msgstr ""
+
 msgid "Updating"
 msgstr ""