From 5770b6544d3476e27d77a0ab11f162c941aa0cae Mon Sep 17 00:00:00 2001 From: Martin Wortschack Date: Mon, 15 Apr 2019 12:25:48 +0000 Subject: Externalize strings detected by rubocop-i18n - Externalize strings in milestones_helper - Externalize strings in app/services - Update PO file --- app/services/files/delete_service.rb | 2 +- app/services/groups/create_service.rb | 4 ++-- app/services/groups/transfer_service.rb | 12 ++++++------ app/services/import/github_service.rb | 2 +- app/services/issues/move_service.rb | 4 ++-- app/services/members/create_service.rb | 4 ++-- app/services/merge_requests/squash_service.rb | 4 ++-- app/services/milestones/promote_service.rb | 6 +++--- app/services/projects/destroy_service.rb | 10 +++++----- app/services/projects/import_service.rb | 10 +++++----- app/services/projects/transfer_service.rb | 10 +++++----- app/services/projects/update_service.rb | 8 ++++---- app/services/test_hooks/project_service.rb | 14 +++++++------- app/services/test_hooks/system_service.rb | 2 +- 14 files changed, 46 insertions(+), 46 deletions(-) (limited to 'app/services') diff --git a/app/services/files/delete_service.rb b/app/services/files/delete_service.rb index 0ec1f79d396..f47eb4fccd4 100644 --- a/app/services/files/delete_service.rb +++ b/app/services/files/delete_service.rb @@ -20,7 +20,7 @@ module Files super if file_has_changed?(@file_path, @last_commit_sha) - raise FileChangedError, "You are attempting to delete a file that has been previously updated." + raise FileChangedError, _("You are attempting to delete a file that has been previously updated.") end end end diff --git a/app/services/groups/create_service.rb b/app/services/groups/create_service.rb index 8f1f25a7307..e9659f5489a 100644 --- a/app/services/groups/create_service.rb +++ b/app/services/groups/create_service.rb @@ -46,13 +46,13 @@ module Groups if @group.subgroup? unless can?(current_user, :create_subgroup, @group.parent) @group.parent = nil - @group.errors.add(:parent_id, 'You don’t have permission to create a subgroup in this group.') + @group.errors.add(:parent_id, s_('CreateGroup|You don’t have permission to create a subgroup in this group.')) return false end else unless can?(current_user, :create_group) - @group.errors.add(:base, 'You don’t have permission to create groups.') + @group.errors.add(:base, s_('CreateGroup|You don’t have permission to create groups.')) return false end diff --git a/app/services/groups/transfer_service.rb b/app/services/groups/transfer_service.rb index 94185605ab9..98e7c311572 100644 --- a/app/services/groups/transfer_service.rb +++ b/app/services/groups/transfer_service.rb @@ -3,11 +3,11 @@ module Groups class TransferService < Groups::BaseService ERROR_MESSAGES = { - database_not_supported: 'Database is not supported.', - namespace_with_same_path: 'The parent group already has a subgroup with the same path.', - group_is_already_root: 'Group is already a root group.', - same_parent_as_current: 'Group is already associated to the parent group.', - invalid_policies: "You don't have enough permissions." + database_not_supported: s_('TransferGroup|Database is not supported.'), + namespace_with_same_path: s_('TransferGroup|The parent group already has a subgroup with the same path.'), + group_is_already_root: s_('TransferGroup|Group is already a root group.'), + same_parent_as_current: s_('TransferGroup|Group is already associated to the parent group.'), + invalid_policies: s_("TransferGroup|You don't have enough permissions.") }.freeze TransferError = Class.new(StandardError) @@ -26,7 +26,7 @@ module Groups rescue TransferError, ActiveRecord::RecordInvalid, Gitlab::UpdatePathError => e @group.errors.clear - @error = "Transfer failed: " + e.message + @error = s_("TransferGroup|Transfer failed: %{error_message}") % { error_message: e.message } false end diff --git a/app/services/import/github_service.rb b/app/services/import/github_service.rb index a2533683da9..a322a306ba4 100644 --- a/app/services/import/github_service.rb +++ b/app/services/import/github_service.rb @@ -7,7 +7,7 @@ module Import def execute(access_params, provider) unless authorized? - return error('This namespace has already been taken! Please choose another one.', :unprocessable_entity) + return error(_('This namespace has already been taken! Please choose another one.'), :unprocessable_entity) end project = Gitlab::LegacyGithubImport::ProjectCreator diff --git a/app/services/issues/move_service.rb b/app/services/issues/move_service.rb index 41b6a96b005..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, '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, '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 cf710fef52b..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('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("Too many users specified (limit is #{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 9d1a5d5e6d4..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('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('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 f6c04a7bae2..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('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('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, "Promotion failed - #{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 b14b31302f5..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('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('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('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('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('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/import_service.rb b/app/services/projects/import_service.rb index 7214e9efaf6..642465551c9 100644 --- a/app/services/projects/import_service.rb +++ b/app/services/projects/import_service.rb @@ -27,13 +27,13 @@ module Projects rescue Gitlab::UrlBlocker::BlockedUrlError => e Gitlab::Sentry.track_acceptable_exception(e, extra: { project_path: project.full_path, importer: project.import_type }) - error("Error importing repository #{project.safe_import_url} into #{project.full_path} - #{e.message}") + error(s_("ImportProjects|Error importing repository %{project_safe_import_url} into %{project_full_path} - %{message}") % { project_safe_import_url: project.safe_import_url, project_full_path: project.full_path, message: e.message }) rescue => e message = Projects::ImportErrorFilter.filter_message(e.message) Gitlab::Sentry.track_acceptable_exception(e, extra: { project_path: project.full_path, importer: project.import_type }) - error("Error importing repository #{project.safe_import_url} into #{project.full_path} - #{message}") + error(s_("ImportProjects|Error importing repository %{project_safe_import_url} into %{project_full_path} - %{message}") % { project_safe_import_url: project.safe_import_url, project_full_path: project.full_path, message: message }) end private @@ -43,7 +43,7 @@ module Projects begin Gitlab::UrlBlocker.validate!(project.import_url, ports: Project::VALID_IMPORT_PORTS) rescue Gitlab::UrlBlocker::BlockedUrlError => e - raise e, "Blocked import URL: #{e.message}" + raise e, s_("ImportProjects|Blocked import URL: %{message}") % { message: e.message } end end @@ -61,7 +61,7 @@ module Projects def create_repository unless project.create_repository - raise Error, 'The repository could not be created.' + raise Error, s_('ImportProjects|The repository could not be created.') end end @@ -112,7 +112,7 @@ module Projects project.repository.expire_content_cache unless project.gitlab_project_import? unless importer.execute - raise Error, 'The remote data could not be imported.' + raise Error, s_('ImportProjects|The remote data could not be imported.') end end diff --git a/app/services/projects/transfer_service.rb b/app/services/projects/transfer_service.rb index 5da1e39a1fb..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, '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, '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("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('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("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 bc36bb8659d..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('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('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("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 || '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 7e14ddcd017..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, '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, '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, '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, '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, '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, '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, '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 082830c5538..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, '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 -- cgit v1.2.3