root
/
gitlab-ce
mirror of https://gitlab.com/free-releases/gitlab-ce.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

Externalize strings in projects controllers 

- concerns
- dashboard
- groups
- import
This commit is contained in:
Martin Wortschack 2019-03-27 16:52:52 +00:00 committed by Rémy Coutable
parent 98824f3e97
commit 5660690787
36 changed files with 374 additions and 108 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
app/controllers/concerns/authenticates_with_two_factor.rb
View File

@ -36,7 +36,7 @@ module AuthenticatesWithTwoFactor
end
def locked_user_redirect(user)
flash.now[:alert] = 'Invalid Login or password'
flash.now[:alert] = _('Invalid Login or password')
render 'devise/sessions/new'
end
@ -66,7 +66,7 @@ module AuthenticatesWithTwoFactor
else
user.increment_failed_attempts!
Gitlab::AppLogger.info("Failed Login: user=#{user.username} ip=#{request.remote_ip} method=OTP")
flash.now[:alert] = 'Invalid two-factor code.'
flash.now[:alert] = _('Invalid two-factor code.')
prompt_for_two_factor(user)
end
end
@ -83,7 +83,7 @@ module AuthenticatesWithTwoFactor
else
user.increment_failed_attempts!
Gitlab::AppLogger.info("Failed Login: user=#{user.username} ip=#{request.remote_ip} method=U2F")
flash.now[:alert] = 'Authentication via U2F device failed.'
flash.now[:alert] = _('Authentication via U2F device failed.')
prompt_for_two_factor(user)
end
end

25
app/controllers/concerns/creates_commit.rb
View File

@ -31,7 +31,7 @@ module CreatesCommit
respond_to do |format|
format.html { redirect_to success_path }
format.json { render json: { message: "success", filePath: success_path } }
format.json { render json: { message: _("success"), filePath: success_path } }
end
else
flash[:alert] = result[:message]
@ -45,7 +45,7 @@ module CreatesCommit
redirect_to failure_path
end
end
format.json { render json: { message: "failed", filePath: failure_path } }
format.json { render json: { message: _("failed"), filePath: failure_path } }
end
end
end
@ -60,15 +60,22 @@ module CreatesCommit
private
def update_flash_notice(success_notice)
flash[:notice] = success_notice || "Your changes have been successfully committed."
flash[:notice] = success_notice || _("Your changes have been successfully committed.")
if create_merge_request?
if merge_request_exists?
flash[:notice] = nil
else
target = different_project? ? "project" : "branch"
flash[:notice] = flash[:notice] + " You can now submit a merge request to get this change into the original #{target}."
end
flash[:notice] =
if merge_request_exists?
nil
else
mr_message =
if different_project?
_("You can now submit a merge request to get this change into the original project.")
else
_("You can now submit a merge request to get this change into the original branch.")
end
flash[:notice] += " " + mr_message
end
end
end

6
app/controllers/concerns/lfs_request.rb
View File

@ -26,7 +26,7 @@ module LfsRequest
render(
json: {
message: 'Git LFS is not enabled on this GitLab server, contact your admin.',
message: _('Git LFS is not enabled on this GitLab server, contact your admin.'),
documentation_url: help_url
},
status: :not_implemented
@ -51,7 +51,7 @@ module LfsRequest
def render_lfs_forbidden
render(
json: {
message: 'Access forbidden. Check your access level.',
message: _('Access forbidden. Check your access level.'),
documentation_url: help_url
},
content_type: CONTENT_TYPE,
@ -62,7 +62,7 @@ module LfsRequest
def render_lfs_not_found
render(
json: {
message: 'Not found.',
message: _('Not found.'),
documentation_url: help_url
},
content_type: CONTENT_TYPE,

35
app/controllers/concerns/membership_actions.rb
View File

@ -9,7 +9,7 @@ module MembershipActions
result = Members::CreateService.new(current_user, create_params).execute(membershipable)
if result[:status] == :success
redirect_to members_page_url, notice: 'Users were successfully added.'
redirect_to members_page_url, notice: _('Users were successfully added.')
else
redirect_to members_page_url, alert: result[:message]
end
@ -35,9 +35,16 @@ module MembershipActions
respond_to do |format|
format.html do
source = source_type == 'group' ? 'group and any subresources' : source_type
message =
begin
case membershipable
when Namespace
_("User was successfully removed from group and any subresources.")
else
_("User was successfully removed from project.")
end
end
message = "User was successfully removed from #{source}."
redirect_to members_page_url, notice: message
end
@ -49,7 +56,7 @@ module MembershipActions
membershipable.request_access(current_user)
redirect_to polymorphic_path(membershipable),
notice: 'Your request for access has been queued for review.'
notice: _('Your request for access has been queued for review.')
end
def approve_access_request
@ -68,9 +75,9 @@ module MembershipActions
notice =
if member.request?
"Your access request to the #{source_type} has been withdrawn."
_("Your access request to the %{source_type} has been withdrawn.") % { source_type: source_type }
else
"You left the \"#{membershipable.human_name}\" #{source_type}."
_("You left the \"%{membershipable_human_name}\" %{source_type}.") % { membershipable_human_name: membershipable.human_name, source_type: source_type }
end
respond_to do |format|
@ -90,9 +97,9 @@ module MembershipActions
if member.invite?
member.resend_invite
redirect_to members_page_url, notice: 'The invitation was successfully resent.'
redirect_to members_page_url, notice: _('The invitation was successfully resent.')
else
redirect_to members_page_url, alert: 'The invitation has already been accepted.'
redirect_to members_page_url, alert: _('The invitation has already been accepted.')
end
end
@ -125,6 +132,16 @@ module MembershipActions
end
def source_type
@source_type ||= membershipable.class.to_s.humanize(capitalize: false)
@source_type ||=
begin
case membershipable
when Namespace
_("group")
when Project
_("project")
else
raise "Unknown membershipable type: #{membershipable}!"
end
end
end
end

6
app/controllers/concerns/spammable_actions.rb
View File

@ -12,9 +12,9 @@ module SpammableActions
def mark_as_spam
if SpamService.new(spammable).mark_as_spam!
redirect_to spammable_path, notice: "#{spammable.spammable_entity_type.titlecase} was submitted to Akismet successfully."
redirect_to spammable_path, notice: _("%{spammable_titlecase} was submitted to Akismet successfully.") % { spammable_titlecase: spammable.spammable_entity_type.titlecase }
else
redirect_to spammable_path, alert: 'Error with Akismet. Please check the logs for more info.'
redirect_to spammable_path, alert: _('Error with Akismet. Please check the logs for more info.')
end
end
@ -33,7 +33,7 @@ module SpammableActions
ensure_spam_config_loaded!
if params[:recaptcha_verification]
flash[:alert] = 'There was an error with the reCAPTCHA. Please solve the reCAPTCHA again.'
flash[:alert] = _('There was an error with the reCAPTCHA. Please solve the reCAPTCHA again.')
end
respond_to do |format|

4
app/controllers/concerns/uploads_actions.rb
View File

@ -16,7 +16,7 @@ module UploadsActions
end
else
format.json do
render json: 'Invalid file.', status: :unprocessable_entity
render json: _('Invalid file.'), status: :unprocessable_entity
end
end
end
@ -57,7 +57,7 @@ module UploadsActions
render json: authorized
rescue SocketError
render json: "Error uploading file", status: :internal_server_error
render json: _("Error uploading file"), status: :internal_server_error
end
private

4
app/controllers/dashboard/todos_controller.rb
View File

@ -21,7 +21,7 @@ class Dashboard::TodosController < Dashboard::ApplicationController
format.html do
redirect_to dashboard_todos_path,
status: 302,
notice: 'Todo was successfully marked as done.'
notice: _('Todo was successfully marked as done.')
end
format.js { head :ok }
format.json { render json: todos_counts }
@ -32,7 +32,7 @@ class Dashboard::TodosController < Dashboard::ApplicationController
updated_ids = TodoService.new.mark_todos_as_done(@todos, current_user)
respond_to do |format|
format.html { redirect_to dashboard_todos_path, status: 302, notice: 'All todos were marked as done.' }
format.html { redirect_to dashboard_todos_path, status: 302, notice: _('All todos were marked as done.') }
format.js { head :ok }
format.json { render json: todos_counts.merge(updated_ids: updated_ids) }
end

10
app/controllers/groups/runners_controller.rb
View File

@ -16,7 +16,7 @@ class Groups::RunnersController < Groups::ApplicationController
def update
if Ci::UpdateRunnerService.new(@runner).update(runner_params)
redirect_to group_runner_path(@group, @runner), notice: 'Runner was successfully updated.'
redirect_to group_runner_path(@group, @runner), notice: _('Runner was successfully updated.')
else
render 'edit'
end
@ -30,17 +30,17 @@ class Groups::RunnersController < Groups::ApplicationController
def resume
if Ci::UpdateRunnerService.new(@runner).update(active: true)
redirect_to group_settings_ci_cd_path(@group, anchor: 'runners-settings'), notice: 'Runner was successfully updated.'
redirect_to group_settings_ci_cd_path(@group, anchor: 'runners-settings'), notice: _('Runner was successfully updated.')
else
redirect_to group_settings_ci_cd_path(@group, anchor: 'runners-settings'), alert: 'Runner was not updated.'
redirect_to group_settings_ci_cd_path(@group, anchor: 'runners-settings'), alert: _('Runner was not updated.')
end
end
def pause
if Ci::UpdateRunnerService.new(@runner).update(active: false)
redirect_to group_settings_ci_cd_path(@group, anchor: 'runners-settings'), notice: 'Runner was successfully updated.'
redirect_to group_settings_ci_cd_path(@group, anchor: 'runners-settings'), notice: _('Runner was successfully updated.')
else
redirect_to group_settings_ci_cd_path(@group, anchor: 'runners-settings'), alert: 'Runner was not updated.'
redirect_to group_settings_ci_cd_path(@group, anchor: 'runners-settings'), alert: _('Runner was not updated.')
end
end

2
app/controllers/groups/settings/ci_cd_controller.rb
View File

@ -13,7 +13,7 @@ module Groups
def reset_registration_token
@group.reset_runners_token!
flash[:notice] = 'New runners registration token has been generated!'
flash[:notice] = _('GroupSettings|New runners registration token has been generated!')
redirect_to group_settings_ci_cd_path
end

2
app/controllers/import/bitbucket_controller.rb
View File

@ -62,7 +62,7 @@ class Import::BitbucketController < Import::BaseController
render json: { errors: project_save_error(project) }, status: :unprocessable_entity
end
else
render json: { errors: 'This namespace has already been taken! Please choose another one.' }, status: :unprocessable_entity
render json: { errors: _('This namespace has already been taken! Please choose another one.') }, status: :unprocessable_entity
end
end

12
app/controllers/import/bitbucket_server_controller.rb
View File

@ -25,7 +25,7 @@ class Import::BitbucketServerController < Import::BaseController
repo = bitbucket_client.repo(@project_key, @repo_slug)
unless repo
return render json: { errors: "Project #{@project_key}/#{@repo_slug} could not be found" }, status: :unprocessable_entity
return render json: { errors: _("Project %{project_repo} could not be found") % { project_repo: "#{@project_key}/#{@repo_slug}" } }, status: :unprocessable_entity
end
project_name = params[:new_name].presence || repo.name
@ -41,10 +41,10 @@ class Import::BitbucketServerController < Import::BaseController
render json: { errors: project_save_error(project) }, status: :unprocessable_entity
end
else
render json: { errors: 'This namespace has already been taken! Please choose another one.' }, status: :unprocessable_entity
render json: { errors: _('This namespace has already been taken! Please choose another one.') }, status: :unprocessable_entity
end
rescue BitbucketServer::Connection::ConnectionError => e
render json: { errors: "Unable to connect to server: #{e}" }, status: :unprocessable_entity
rescue BitbucketServer::Connection::ConnectionError => error
render json: { errors: _("Unable to connect to server: %{error}") % { error: error } }, status: :unprocessable_entity
end
def configure
@ -65,8 +65,8 @@ class Import::BitbucketServerController < Import::BaseController
already_added_projects_names = @already_added_projects.pluck(:import_source)
@repos.reject! { |repo| already_added_projects_names.include?(repo.browse_url) }
rescue BitbucketServer::Connection::ConnectionError => e
flash[:alert] = "Unable to connect to server: #{e}"
rescue BitbucketServer::Connection::ConnectionError => error
flash[:alert] = _("Unable to connect to server: %{error}") % { error: error }
clear_session_data
redirect_to new_import_bitbucket_server_path
end

6
app/controllers/import/fogbugz_controller.rb
View File

@ -14,7 +14,7 @@ class Import::FogbugzController < Import::BaseController
res = Gitlab::FogbugzImport::Client.new(import_params.symbolize_keys)
rescue
# If the URI is invalid various errors can occur
return redirect_to new_import_fogbugz_path, alert: 'Could not connect to FogBugz, check your URL'
return redirect_to new_import_fogbugz_path, alert: _('Could not connect to FogBugz, check your URL')
end
session[:fogbugz_token] = res.get_token
session[:fogbugz_uri] = params[:uri]
@ -29,14 +29,14 @@ class Import::FogbugzController < Import::BaseController
user_map = params[:users]
unless user_map.is_a?(Hash) && user_map.all? { |k, v| !v[:name].blank? }
flash.now[:alert] = 'All users must have a name.'
flash.now[:alert] = _('All users must have a name.')
return render 'new_user_map'
end
session[:fogbugz_user_map] = user_map
flash[:notice] = 'The user map has been saved. Continue by selecting the projects you want to import.'
flash[:notice] = _('The user map has been saved. Continue by selecting the projects you want to import.')
redirect_to status_import_fogbugz_path
end

2
app/controllers/import/gitea_controller.rb
View File

@ -46,7 +46,7 @@ class Import::GiteaController < Import::GithubController
def provider_auth
if session[access_token_key].blank? || provider_url.blank?
redirect_to new_import_gitea_url,
alert: 'You need to specify both an Access Token and a Host URL.'
alert: _('You need to specify both an Access Token and a Host URL.')
end
end

2
app/controllers/import/gitlab_controller.rb
View File

@ -42,7 +42,7 @@ class Import::GitlabController < Import::BaseController
render json: { errors: project_save_error(project) }, status: :unprocessable_entity
end
else
render json: { errors: 'This namespace has already been taken! Please choose another one.' }, status: :unprocessable_entity
render json: { errors: _('This namespace has already been taken! Please choose another one.') }, status: :unprocessable_entity
end
end

4
app/controllers/import/gitlab_projects_controller.rb
View File

@ -13,7 +13,7 @@ class Import::GitlabProjectsController < Import::BaseController
def create
unless file_is_valid?
return redirect_back_or_default(options: { alert: "You need to upload a GitLab project export archive (ending in .gz)." })
return redirect_back_or_default(options: { alert: _("You need to upload a GitLab project export archive (ending in .gz).") })
end
@project = ::Projects::GitlabProjectsImportService.new(current_user, project_params).execute
@ -21,7 +21,7 @@ class Import::GitlabProjectsController < Import::BaseController
if @project.saved?
redirect_to(
project_path(@project),
notice: "Project '#{@project.name}' is being imported."
notice: _("Project '%{project_name}' is being imported.") % { project_name: @project.name }
)
else
redirect_back_or_default(options: { alert: "Project could not be imported: #{@project.errors.full_messages.join(', ')}" })

12
app/controllers/import/google_code_controller.rb
View File

@ -11,18 +11,18 @@ class Import::GoogleCodeController < Import::BaseController
dump_file = params[:dump_file]
unless dump_file.respond_to?(:read)
return redirect_back_or_default(options: { alert: "You need to upload a Google Takeout archive." })
return redirect_back_or_default(options: { alert: _("You need to upload a Google Takeout archive.") })
end
begin
dump = JSON.parse(dump_file.read)
rescue
return redirect_back_or_default(options: { alert: "The uploaded file is not a valid Google Takeout archive." })
return redirect_back_or_default(options: { alert: _("The uploaded file is not a valid Google Takeout archive.") })
end
client = Gitlab::GoogleCodeImport::Client.new(dump)
unless client.valid?
return redirect_back_or_default(options: { alert: "The uploaded file is not a valid Google Takeout archive." })
return redirect_back_or_default(options: { alert: _("The uploaded file is not a valid Google Takeout archive.") })
end
session[:google_code_dump] = dump
@ -44,13 +44,13 @@ class Import::GoogleCodeController < Import::BaseController
begin
user_map = JSON.parse(user_map_json)
rescue
flash.now[:alert] = "The entered user map is not a valid JSON user map."
flash.now[:alert] = _("The entered user map is not a valid JSON user map.")
return render "new_user_map"
end
unless user_map.is_a?(Hash) && user_map.all? { |k, v| k.is_a?(String) && v.is_a?(String) }
flash.now[:alert] = "The entered user map is not a valid JSON user map."
flash.now[:alert] = _("The entered user map is not a valid JSON user map.")
return render "new_user_map"
end
@ -62,7 +62,7 @@ class Import::GoogleCodeController < Import::BaseController
session[:google_code_user_map] = user_map
flash[:notice] = "The user map has been saved. Continue by selecting the projects you want to import."
flash[:notice] = _("The user map has been saved. Continue by selecting the projects you want to import.")
redirect_to status_import_google_code_path
end

4
app/controllers/projects/blob_controller.rb
View File

@ -29,7 +29,7 @@ class Projects::BlobController < Projects::ApplicationController
end
def create
create_commit(Files::CreateService, success_notice: "The file has been successfully created.",
create_commit(Files::CreateService, success_notice: _("The file has been successfully created."),
success_path: -> { project_blob_path(@project, File.join(@branch_name, @file_path)) },
failure_view: :new,
failure_path: project_new_blob_path(@project, @ref))
@ -81,7 +81,7 @@ class Projects::BlobController < Projects::ApplicationController
end
def destroy
create_commit(Files::DeleteService, success_notice: "The file has been successfully deleted.",
create_commit(Files::DeleteService, success_notice: _("The file has been successfully deleted."),
success_path: -> { after_delete_path },
failure_view: :show,
failure_path: project_blob_path(@project, @id))

4
app/controllers/projects/branches_controller.rb
View File

@ -115,7 +115,7 @@ class Projects::BranchesController < Projects::ApplicationController
DeleteMergedBranchesService.new(@project, current_user).async_execute
redirect_to project_branches_path(@project),
notice: 'Merged branches are being deleted. This can take some time depending on the number of branches. Please refresh the page to see changes.'
notice: _('Merged branches are being deleted. This can take some time depending on the number of branches. Please refresh the page to see changes.')
end
private
@ -143,7 +143,7 @@ class Projects::BranchesController < Projects::ApplicationController
def redirect_for_legacy_index_sort_or_search
# Normalize a legacy URL with redirect
if request.format != :json && !params[:state].presence && [:sort, :search, :page].any? { |key| params[key].presence }
redirect_to project_branches_filtered_path(@project, state: 'all'), notice: 'Update your bookmarked URLs as filtered/sorted branches URL has been changed.'
redirect_to project_branches_filtered_path(@project, state: 'all'), notice: _('Update your bookmarked URLs as filtered/sorted branches URL has been changed.')
end
end

2
app/controllers/projects/deploy_keys_controller.rb
View File

@ -38,7 +38,7 @@ class Projects::DeployKeysController < Projects::ApplicationController
def update
if deploy_key.update(update_params)
flash[:notice] = 'Deploy key was successfully updated.'
flash[:notice] = _('Deploy key was successfully updated.')
redirect_to_repository_settings(@project, anchor: 'js-deploy-keys-settings')
else
render 'edit'

2
app/controllers/projects/group_links_controller.rb
View File

@ -18,7 +18,7 @@ class Projects::GroupLinksController < Projects::ApplicationController
flash[:alert] = result[:message] if result[:http_status] == 409
else
flash[:alert] = 'Please select a group.'
flash[:alert] = _('Please select a group.')
end
redirect_to project_project_members_path(project)

2
app/controllers/projects/hooks_controller.rb
View File

@ -32,7 +32,7 @@ class Projects::HooksController < Projects::ApplicationController
def update
if hook.update(hook_params)
flash[:notice] = 'Hook was successfully updated.'
flash[:notice] = _('Hook was successfully updated.')
redirect_to project_settings_integrations_path(@project)
else
render 'edit'

4
app/controllers/projects/imports_controller.rb
View File

@ -42,9 +42,9 @@ class Projects::ImportsController < Projects::ApplicationController
def finished_notice
if @project.forked?
'The project was successfully forked.'
_('The project was successfully forked.')
else
'The project was successfully imported.'
_('The project was successfully imported.')
end
end

4
app/controllers/projects/issues_controller.rb
View File

@ -95,9 +95,9 @@ class Projects::IssuesController < Projects::ApplicationController
if service.discussions_to_resolve.count(&:resolved?) > 0
flash[:notice] = if service.discussion_to_resolve_id
"Resolved 1 discussion."
_("Resolved 1 discussion.")
else
"Resolved all discussions."
_("Resolved all discussions.")
end
end

2
app/controllers/projects/jobs_controller.rb
View File

@ -122,7 +122,7 @@ class Projects::JobsController < Projects::ApplicationController
def erase
if @build.erase(erased_by: current_user)
redirect_to project_job_path(project, @build),
notice: "Job has been successfully erased!"
notice: _("Job has been successfully erased!")
else
respond_422
end

2
app/controllers/projects/labels_controller.rb
View File

@ -132,7 +132,7 @@ class Projects::LabelsController < Projects::ApplicationController
respond_to do |format|
format.html do
redirect_to(project_labels_path(@project),
notice: 'Failed to promote label due to internal error. Please contact administrators.')
notice: _('Failed to promote label due to internal error. Please contact administrators.'))
end
format.js
end

4
app/controllers/projects/lfs_api_controller.rb
View File

@ -26,7 +26,7 @@ class Projects::LfsApiController < Projects::GitHttpClientController
def deprecated
render(
json: {
message: 'Server supports batch API only, please update your Git LFS client to version 1.0.1 and up.',
message: _('Server supports batch API only, please update your Git LFS client to version 1.0.1 and up.'),
documentation_url: "#{Gitlab.config.gitlab.url}/help"
},
status: :not_implemented
@ -62,7 +62,7 @@ class Projects::LfsApiController < Projects::GitHttpClientController
else
object[:error] = {
code: 404,
message: "Object does not exist on the server or you don't have permissions to access it"
message: _("Object does not exist on the server or you don't have permissions to access it")
}
end
end

8
app/controllers/projects/merge_requests/conflicts_controller.rb
View File

@ -16,12 +16,12 @@ class Projects::MergeRequests::ConflictsController < Projects::MergeRequests::Ap
render json: @conflicts_list
elsif @merge_request.can_be_merged?
render json: {
message: 'The merge conflicts for this merge request have already been resolved. Please return to the merge request.',
message: _('The merge conflicts for this merge request have already been resolved. Please return to the merge request.'),
type: 'error'
}
else
render json: {
message: 'The merge conflicts for this merge request cannot be resolved through GitLab. Please try to resolve them locally.',
message: _('The merge conflicts for this merge request cannot be resolved through GitLab. Please try to resolve them locally.'),
type: 'error'
}
end
@ -43,7 +43,7 @@ class Projects::MergeRequests::ConflictsController < Projects::MergeRequests::Ap
return render_404 unless @conflicts_list.can_be_resolved_in_ui?
if @merge_request.can_be_merged?
render status: :bad_request, json: { message: 'The merge conflicts for this merge request have already been resolved.' }
render status: :bad_request, json: { message: _('The merge conflicts for this merge request have already been resolved.') }
return
end
@ -52,7 +52,7 @@ class Projects::MergeRequests::ConflictsController < Projects::MergeRequests::Ap
.new(merge_request)
.execute(current_user, params)
flash[:notice] = 'All merge conflicts were resolved. The merge request can now be merged.'
flash[:notice] = _('All merge conflicts were resolved. The merge request can now be merged.')
render json: { redirect_to: project_merge_request_url(@project, @merge_request, resolved_conflicts: true) }
rescue Gitlab::Git::Conflict::Resolver::ResolutionError => e

4
app/controllers/projects/mirrors_controller.rb
View File

@ -18,7 +18,7 @@ class Projects::MirrorsController < Projects::ApplicationController
result = ::Projects::UpdateService.new(project, current_user, mirror_params).execute
if result[:status] == :success
flash[:notice] = 'Mirroring settings were successfully updated.'
flash[:notice] = _('Mirroring settings were successfully updated.')
else
flash[:alert] = project.errors.full_messages.join(', ').html_safe
end
@ -38,7 +38,7 @@ class Projects::MirrorsController < Projects::ApplicationController
def update_now
if params[:sync_remote]
project.update_remote_mirrors
flash[:notice] = "The remote repository is being updated..."
flash[:notice] = _("The remote repository is being updated...")
end
redirect_to_repository_settings(project, anchor: 'js-push-remote-settings')

8
app/controllers/projects/pipeline_schedules_controller.rb
View File

@ -50,9 +50,11 @@ class Projects::PipelineSchedulesController < Projects::ApplicationController
job_id = RunPipelineScheduleWorker.perform_async(schedule.id, current_user.id)
if job_id
flash[:notice] = "Successfully scheduled a pipeline to run. Go to the <a href=\"#{project_pipelines_path(@project)}\">Pipelines page</a> for details.".html_safe
link_to_pipelines = view_context.link_to(_('Pipelines page'), project_pipelines_path(@project))
message = _("Successfully scheduled a pipeline to run. Go to the %{link_to_pipelines} for details.").html_safe % { link_to_pipelines: link_to_pipelines }
flash[:notice] = message.html_safe
else
flash[:alert] = 'Unable to schedule a pipeline to run immediately'
flash[:alert] = _('Unable to schedule a pipeline to run immediately')
end
redirect_to pipeline_schedules_path(@project)
@ -85,7 +87,7 @@ class Projects::PipelineSchedulesController < Projects::ApplicationController
return unless limiter.throttled?([current_user, schedule], 1)
flash[:alert] = 'You cannot play this scheduled pipeline at the moment. Please wait a minute.'
flash[:alert] = _('You cannot play this scheduled pipeline at the moment. Please wait a minute.')
redirect_to pipeline_schedules_path(@project)
end

10
app/controllers/projects/runners_controller.rb
View File

@ -15,7 +15,7 @@ class Projects::RunnersController < Projects::ApplicationController
def update
if Ci::UpdateRunnerService.new(@runner).update(runner_params)
redirect_to project_runner_path(@project, @runner), notice: 'Runner was successfully updated.'
redirect_to project_runner_path(@project, @runner), notice: _('Runner was successfully updated.')
else
render 'edit'
end
@ -31,17 +31,17 @@ class Projects::RunnersController < Projects::ApplicationController
def resume
if Ci::UpdateRunnerService.new(@runner).update(active: true)
redirect_to project_runners_path(@project), notice: 'Runner was successfully updated.'
redirect_to project_runners_path(@project), notice: _('Runner was successfully updated.')
else
redirect_to project_runners_path(@project), alert: 'Runner was not updated.'
redirect_to project_runners_path(@project), alert: _('Runner was not updated.')
end
end
def pause
if Ci::UpdateRunnerService.new(@runner).update(active: false)
redirect_to project_runners_path(@project), notice: 'Runner was successfully updated.'
redirect_to project_runners_path(@project), notice: _('Runner was successfully updated.')
else
redirect_to project_runners_path(@project), alert: 'Runner was not updated.'
redirect_to project_runners_path(@project), alert: _('Runner was not updated.')
end
end

10
app/controllers/projects/services_controller.rb
View File

@ -43,20 +43,20 @@ class Projects::ServicesController < Projects::ApplicationController
if outcome[:success]
{}
else
{ error: true, message: 'Test failed.', service_response: outcome[:result].to_s, test_failed: true }
{ error: true, message: _('Test failed.'), service_response: outcome[:result].to_s, test_failed: true }
end
else
{ error: true, message: 'Validations failed.', service_response: @service.errors.full_messages.join(','), test_failed: false }
{ error: true, message: _('Validations failed.'), service_response: @service.errors.full_messages.join(','), test_failed: false }
end
rescue Gitlab::HTTP::BlockedUrlError => e
{ error: true, message: 'Test failed.', service_response: e.message, test_failed: true }
{ error: true, message: _('Test failed.'), service_response: e.message, test_failed: true }
end
def success_message
if @service.active?
"#{@service.title} activated."
_("%{service_title} activated.") % { service_title: @service.title }
else
"#{@service.title} settings saved, but not activated."
_("%{service_title} settings saved, but not activated.") % { service_title: @service.title }
end
end

6
app/controllers/projects/settings/ci_cd_controller.rb
View File

@ -13,7 +13,7 @@ module Projects
Projects::UpdateService.new(project, current_user, update_params).tap do |service|
result = service.execute
if result[:status] == :success
flash[:notice] = "Pipelines settings for '#{@project.name}' were successfully updated."
flash[:notice] = _("Pipelines settings for '%{project_name}' were successfully updated.") % { project_name: @project.name }
run_autodevops_pipeline(service)
@ -39,7 +39,7 @@ module Projects
def reset_registration_token
@project.reset_runners_token!
flash[:notice] = 'New runners registration token has been generated!'
flash[:notice] = _('New runners registration token has been generated!')
redirect_to namespace_project_settings_ci_cd_path
end
@ -58,7 +58,7 @@ module Projects
return unless service.run_auto_devops_pipeline?
if @project.empty_repo?
flash[:warning] = "This repository is currently empty. A new Auto DevOps pipeline will be created after a new file has been pushed to a branch."
flash[:warning] = _("This repository is currently empty. A new Auto DevOps pipeline will be created after a new file has been pushed to a branch.")
return
end

2
app/controllers/projects/tree_controller.rb
View File

@ -37,7 +37,7 @@ class Projects::TreeController < Projects::ApplicationController
def create_dir
return render_404 unless @commit_params.values.all?
create_commit(Files::CreateDirService, success_notice: "The directory has been successfully created.",
create_commit(Files::CreateDirService, success_notice: _("The directory has been successfully created."),
success_path: project_tree_path(@project, File.join(@branch_name, @dir_name)),
failure_path: project_tree_path(@project, @ref))
end

14
app/controllers/projects/triggers_controller.rb
View File

@ -16,9 +16,9 @@ class Projects::TriggersController < Projects::ApplicationController
@trigger = project.triggers.create(trigger_params.merge(owner: current_user))
if @trigger.valid?
flash[:notice] = 'Trigger was created successfully.'
flash[:notice] = _('Trigger was created successfully.')
else
flash[:alert] = 'You could not create a new trigger.'
flash[:alert] = _('You could not create a new trigger.')
end
redirect_to project_settings_ci_cd_path(@project, anchor: 'js-pipeline-triggers')
@ -26,9 +26,9 @@ class Projects::TriggersController < Projects::ApplicationController
def take_ownership
if trigger.update(owner: current_user)
flash[:notice] = 'Trigger was re-assigned.'
flash[:notice] = _('Trigger was re-assigned.')
else
flash[:alert] = 'You could not take ownership of trigger.'
flash[:alert] = _('You could not take ownership of trigger.')
end
redirect_to project_settings_ci_cd_path(@project, anchor: 'js-pipeline-triggers')
@ -39,7 +39,7 @@ class Projects::TriggersController < Projects::ApplicationController
def update
if trigger.update(trigger_params)
redirect_to project_settings_ci_cd_path(@project, anchor: 'js-pipeline-triggers'), notice: 'Trigger was successfully updated.'
redirect_to project_settings_ci_cd_path(@project, anchor: 'js-pipeline-triggers'), notice: _('Trigger was successfully updated.')
else
render action: "edit"
end
@ -47,9 +47,9 @@ class Projects::TriggersController < Projects::ApplicationController
def destroy
if trigger.destroy
flash[:notice] = "Trigger removed."
flash[:notice] = _("Trigger removed.")
else
flash[:alert] = "Could not remove the trigger."
flash[:alert] = _("Could not remove the trigger.")
end
redirect_to project_settings_ci_cd_path(@project, anchor: 'js-pipeline-triggers'), status: :found

12
app/controllers/projects/wikis_controller.rb
View File

@ -49,7 +49,7 @@ class Projects::WikisController < Projects::ApplicationController
if @page.valid?
redirect_to(
project_wiki_path(@project, @page),
notice: 'Wiki was successfully updated.'
notice: _('Wiki was successfully updated.')
)
else
render 'edit'
@ -65,7 +65,7 @@ class Projects::WikisController < Projects::ApplicationController
if @page.persisted?
redirect_to(
project_wiki_path(@project, @page),
notice: 'Wiki was successfully updated.'
notice: _('Wiki was successfully updated.')
)
else
render action: "edit"
@ -85,7 +85,7 @@ class Projects::WikisController < Projects::ApplicationController
else
redirect_to(
project_wiki_path(@project, :home),
notice: "Page not found"
notice: _("Page not found")
)
end
end
@ -95,7 +95,7 @@ class Projects::WikisController < Projects::ApplicationController
redirect_to project_wiki_path(@project, :home),
status: 302,
notice: "Page was successfully deleted"
notice: _("Page was successfully deleted")
rescue Gitlab::Git::Wiki::OperationError => e
@error = e
render 'edit'
@ -118,7 +118,7 @@ class Projects::WikisController < Projects::ApplicationController
@sidebar_wiki_entries = WikiPage.group_by_directory(@project_wiki.pages(limit: 15))
end
rescue ProjectWiki::CouldNotCreateWikiError
flash[:notice] = "Could not create Wiki Repository at this time. Please try again later."
flash[:notice] = _("Could not create Wiki Repository at this time. Please try again later.")
redirect_to project_path(@project)
false
end
@ -155,7 +155,7 @@ class Projects::WikisController < Projects::ApplicationController
end
def set_encoding_error
flash.now[:notice] = "The content of this page is not encoded in UTF-8. Edits can only be made via the Git repository."
flash.now[:notice] = _("The content of this page is not encoded in UTF-8. Edits can only be made via the Git repository.")
end
def file_blob

240
locale/gitlab.pot
View File

@ -144,6 +144,15 @@ msgstr ""
msgid "%{percent}%% complete"
msgstr ""
msgid "%{service_title} activated."
msgstr ""
msgid "%{service_title} settings saved, but not activated."
msgstr ""
msgid "%{spammable_titlecase} was submitted to Akismet successfully."
msgstr ""
msgid "%{strong_start}%{branch_count}%{strong_end} Branch"
msgid_plural "%{strong_start}%{branch_count}%{strong_end} Branches"
msgstr[0] ""
@ -372,6 +381,9 @@ msgstr ""
msgid "Access expiration date"
msgstr ""
msgid "Access forbidden. Check your access level."
msgstr ""
msgid "Account"
msgstr ""
@ -609,9 +621,18 @@ msgstr ""
msgid "All issues for this milestone are closed. You may close this milestone now."
msgstr ""
msgid "All merge conflicts were resolved. The merge request can now be merged."
msgstr ""
msgid "All todos were marked as done."
msgstr ""
msgid "All users"
msgstr ""
msgid "All users must have a name."
msgstr ""
msgid "Allow commits from members who can merge to the target branch."
msgstr ""
@ -954,6 +975,9 @@ msgstr ""
msgid "Authentication method"
msgstr ""
msgid "Authentication via U2F device failed."
msgstr ""
msgid "Author"
msgstr ""
@ -2447,6 +2471,15 @@ msgstr ""
msgid "Copy token to clipboard"
msgstr ""
msgid "Could not connect to FogBugz, check your URL"
msgstr ""
msgid "Could not create Wiki Repository at this time. Please try again later."
msgstr ""
msgid "Could not remove the trigger."
msgstr ""
msgid "Could not retrieve the pipeline status. For troubleshooting steps, read the %{linkStart}documentation.%{linkEnd}"
msgstr ""
@ -3370,6 +3403,9 @@ msgstr ""
msgid "Error updating todo status."
msgstr ""
msgid "Error uploading file"
msgstr ""
msgid "Error while loading the merge request. Please try again."
msgstr ""
@ -3541,6 +3577,9 @@ msgstr ""
msgid "Failed to load errors from Sentry. Error message: %{errorMessage}"
msgstr ""
msgid "Failed to promote label due to internal error. Please contact administrators."
msgstr ""
msgid "Failed to remove issue from board, please try again."
msgstr ""
@ -3786,6 +3825,9 @@ msgstr ""
msgid "Git"
msgstr ""
msgid "Git LFS is not enabled on this GitLab server, contact your admin."
msgstr ""
msgid "Git global setup"
msgstr ""
@ -3966,6 +4008,9 @@ msgstr ""
msgid "GroupSettings|Learn more about badges."
msgstr ""
msgid "GroupSettings|New runners registration token has been generated!"
msgstr ""
msgid "GroupSettings|Prevent sharing a project within %{group} with other groups"
msgstr ""
@ -4130,6 +4175,9 @@ msgstr ""
msgid "Hook was successfully created."
msgstr ""
msgid "Hook was successfully updated."
msgstr ""
msgid "Housekeeping successfully started"
msgstr ""
@ -4409,12 +4457,21 @@ msgstr ""
msgid "Introducing Your Conversational Development Index"
msgstr ""
msgid "Invalid Login or password"
msgstr ""
msgid "Invalid file."
msgstr ""
msgid "Invalid input, please avoid emojis"
msgstr ""
msgid "Invalid pin code"
msgstr ""
msgid "Invalid two-factor code."
msgstr ""
msgid "Invitation"
msgstr ""
@ -4478,6 +4535,9 @@ msgstr ""
msgid "Job has been erased"
msgstr ""
msgid "Job has been successfully erased!"
msgstr ""
msgid "Job is stuck. Check runners."
msgstr ""
@ -4986,6 +5046,9 @@ msgstr ""
msgid "Merged"
msgstr ""
msgid "Merged branches are being deleted. This can take some time depending on the number of branches. Please refresh the page to see changes."
msgstr ""
msgid "Messages"
msgstr ""
@ -5079,6 +5142,9 @@ msgstr ""
msgid "Mirroring repositories"
msgstr ""
msgid "Mirroring settings were successfully updated."
msgstr ""
msgid "MissingSSHKeyWarningLink|add an SSH key"
msgstr ""
@ -5384,6 +5450,9 @@ msgstr ""
msgid "Not enough data"
msgstr ""
msgid "Not found."
msgstr ""
msgid "Not now"
msgstr ""
@ -5489,6 +5558,9 @@ msgstr ""
msgid "November"
msgstr ""
msgid "Object does not exist on the server or you don't have permissions to access it"
msgstr ""
msgid "Oct"
msgstr ""
@ -5590,6 +5662,12 @@ msgstr ""
msgid "Owner"
msgstr ""
msgid "Page not found"
msgstr ""
msgid "Page was successfully deleted"
msgstr ""
msgid "Pages"
msgstr ""
@ -5752,6 +5830,12 @@ msgstr ""
msgid "Pipelines for last year"
msgstr ""
msgid "Pipelines page"
msgstr ""
msgid "Pipelines settings for '%{project_name}' were successfully updated."
msgstr ""
msgid "Pipelines|Build with confidence"
msgstr ""
@ -5896,6 +5980,9 @@ msgstr ""
msgid "Please note that this application is not provided by GitLab and you should verify its authenticity before allowing access."
msgstr ""
msgid "Please select a group."
msgstr ""
msgid "Please select at least one filter to see results"
msgstr ""
@ -6217,6 +6304,12 @@ msgstr ""
msgid "Project \"%{name}\" is no longer available. Select another project to continue."
msgstr ""
msgid "Project %{project_repo} could not be found"
msgstr ""
msgid "Project '%{project_name}' is being imported."
msgstr ""
msgid "Project '%{project_name}' is in the process of being deleted."
msgstr ""
@ -6696,6 +6789,12 @@ msgstr ""
msgid "Resolved"
msgstr ""
msgid "Resolved 1 discussion."
msgstr ""
msgid "Resolved all discussions."
msgstr ""
msgid "Response metrics (AWS ELB)"
msgstr ""
@ -7019,6 +7118,9 @@ msgstr ""
msgid "September"
msgstr ""
msgid "Server supports batch API only, please update your Git LFS client to version 1.0.1 and up."
msgstr ""
msgid "Server version"
msgstr ""
@ -7603,6 +7705,9 @@ msgstr ""
msgid "Successfully removed email."
msgstr ""
msgid "Successfully scheduled a pipeline to run. Go to the %{link_to_pipelines} for details."
msgstr ""
msgid "Successfully unblocked"
msgstr ""
@ -7756,6 +7861,9 @@ msgstr ""
msgid "Test coverage parsing"
msgstr ""
msgid "Test failed."
msgstr ""
msgid "The Git LFS objects will <strong>not</strong> be synced."
msgstr ""
@ -7774,9 +7882,24 @@ msgstr ""
msgid "The collection of events added to the data gathered for that stage."
msgstr ""
msgid "The content of this page is not encoded in UTF-8. Edits can only be made via the Git repository."
msgstr ""
msgid "The deployment of this job to %{environmentLink} did not succeed."
msgstr ""
msgid "The directory has been successfully created."
msgstr ""
msgid "The entered user map is not a valid JSON user map."
msgstr ""
msgid "The file has been successfully created."
msgstr ""
msgid "The file has been successfully deleted."
msgstr ""
msgid "The fork relationship has been removed."
msgstr ""
@ -7789,6 +7912,12 @@ msgstr ""
msgid "The import will time out after %{timeout}. For repositories that take longer, use a clone/push combination."
msgstr ""
msgid "The invitation has already been accepted."
msgstr ""
msgid "The invitation was successfully resent."
msgstr ""
msgid "The issue stage shows the time it takes from creating an issue to assigning the issue to a milestone, or add the issue to a list on your Issue Board. Begin creating issues to see data for this stage."
msgstr ""
@ -7798,6 +7927,15 @@ msgstr ""
msgid "The maximum file size allowed is 200KB."
msgstr ""
msgid "The merge conflicts for this merge request cannot be resolved through GitLab. Please try to resolve them locally."
msgstr ""
msgid "The merge conflicts for this merge request have already been resolved."
msgstr ""
msgid "The merge conflicts for this merge request have already been resolved. Please return to the merge request."
msgstr ""
msgid "The name %{entryName} is already taken in this directory."
msgstr ""
@ -7822,6 +7960,15 @@ msgstr ""
msgid "The project can be accessed without any authentication."
msgstr ""
msgid "The project was successfully forked."
msgstr ""
msgid "The project was successfully imported."
msgstr ""
msgid "The remote repository is being updated..."
msgstr ""
msgid "The repository for this project does not exist."
msgstr ""
@ -7852,12 +7999,18 @@ msgstr ""
msgid "The update action will time out after %{number_of_minutes} minutes. For big repositories, use a clone/push combination."
msgstr ""
msgid "The uploaded file is not a valid Google Takeout archive."
msgstr ""
msgid "The usage ping is disabled, and cannot be configured through this form."
msgstr ""
msgid "The user is being deleted."
msgstr ""
msgid "The user map has been saved. Continue by selecting the projects you want to import."
msgstr ""
msgid "The user map is a JSON document mapping the Google Code users that participated on your projects to the way their email addresses and usernames will be imported into GitLab. You can change this by changing the value on the right hand side of <code>:</code>. Be sure to preserve the surrounding double quotes, other punctuation and the email address or username on the left hand side."
msgstr ""
@ -7921,6 +8074,9 @@ msgstr ""
msgid "There was an error when unsubscribing from this label."
msgstr ""
msgid "There was an error with the reCAPTCHA. Please solve the reCAPTCHA again."
msgstr ""
msgid "These existing issues have a similar title. It might be better to comment there instead of creating another similar issue."
msgstr ""
@ -8071,6 +8227,9 @@ msgstr ""
msgid "This merge request is locked."
msgstr ""
msgid "This namespace has already been taken! Please choose another one."
msgstr ""
msgid "This option is disabled as you don't have write permissions for the current branch"
msgstr ""
@ -8107,6 +8266,9 @@ msgstr ""
msgid "This repository"
msgstr ""
msgid "This repository is currently empty. A new Auto DevOps pipeline will be created after a new file has been pushed to a branch."
msgstr ""
msgid "This runner will only run on pipelines triggered on protected branches"
msgstr ""
@ -8393,6 +8555,9 @@ msgstr ""
msgid "Todo"
msgstr ""
msgid "Todo was successfully marked as done."
msgstr ""
msgid "Todos"
msgstr ""
@ -8450,6 +8615,9 @@ msgstr ""
msgid "Trending"
msgstr ""
msgid "Trigger removed."
msgstr ""
msgid "Trigger this manual action"
msgstr ""
@ -8459,6 +8627,15 @@ msgstr ""
msgid "Trigger variables:"
msgstr ""
msgid "Trigger was created successfully."
msgstr ""
msgid "Trigger was re-assigned."
msgstr ""
msgid "Trigger was successfully updated."
msgstr ""
msgid "Triggers can force a specific branch or tag to get rebuilt with an API call. These tokens will impersonate their associated user including their access to projects and their project permissions."
msgstr ""
@ -8483,9 +8660,15 @@ msgstr ""
msgid "Type"
msgstr ""
msgid "Unable to connect to server: %{error}"
msgstr ""
msgid "Unable to load the diff. %{button_try_again}"
msgstr ""
msgid "Unable to schedule a pipeline to run immediately"
msgstr ""
msgid "Unblock"
msgstr ""
@ -8561,6 +8744,9 @@ msgstr ""
msgid "Update now"
msgstr ""
msgid "Update your bookmarked URLs as filtered/sorted branches URL has been changed."
msgstr ""
msgid "Update your group name, description, avatar, and visibility."
msgstr ""
@ -8657,6 +8843,12 @@ msgstr ""
msgid "User was successfully created."
msgstr ""
msgid "User was successfully removed from group and any subresources."
msgstr ""
msgid "User was successfully removed from project."
msgstr ""
msgid "User was successfully updated."
msgstr ""
@ -8750,6 +8942,9 @@ msgstr ""
msgid "Validate your GitLab CI configuration file"
msgstr ""
msgid "Validations failed."
msgstr ""
msgid "Value"
msgstr ""
@ -8888,6 +9083,9 @@ msgstr ""
msgid "Wiki"
msgstr ""
msgid "Wiki was successfully updated."
msgstr ""
msgid "WikiClone|Clone your wiki"
msgstr ""
@ -9107,6 +9305,12 @@ msgstr ""
msgid "You can move around the graph by using the arrow keys."
msgstr ""
msgid "You can now submit a merge request to get this change into the original branch."
msgstr ""
msgid "You can now submit a merge request to get this change into the original project."
msgstr ""
msgid "You can only add files when you are on a branch"
msgstr ""
@ -9134,9 +9338,18 @@ msgstr ""
msgid "You cannot impersonate an internal user"
msgstr ""
msgid "You cannot play this scheduled pipeline at the moment. Please wait a minute."
msgstr ""
msgid "You cannot write to this read-only GitLab instance."
msgstr ""
msgid "You could not create a new trigger."
msgstr ""
msgid "You could not take ownership of trigger."
msgstr ""
msgid "You do not have any subscriptions yet"
msgstr ""
@ -9155,6 +9368,9 @@ msgstr ""
msgid "You have reached your project limit"
msgstr ""
msgid "You left the \"%{membershipable_human_name}\" %{source_type}."
msgstr ""
msgid "You may also add variables that are made available to the running application by prepending the variable key with <code>K8S_SECRET_</code>."
msgstr ""
@ -9170,6 +9386,15 @@ msgstr ""
msgid "You need to register a two-factor authentication app before you can set up a U2F device."
msgstr ""
msgid "You need to specify both an Access Token and a Host URL."
msgstr ""
msgid "You need to upload a GitLab project export archive (ending in .gz)."
msgstr ""
msgid "You need to upload a Google Takeout archive."
msgstr ""
msgid "You will lose all changes you've made to this file. This action cannot be undone."
msgstr ""
@ -9242,6 +9467,9 @@ msgstr ""
msgid "Your U2F device was registered!"
msgstr ""
msgid "Your access request to the %{source_type} has been withdrawn."
msgstr ""
msgid "Your account uses dedicated credentials for the \"%{group_name}\" group and can only be updated through SSO."
msgstr ""
@ -9263,6 +9491,9 @@ msgstr ""
msgid "Your changes have been saved"
msgstr ""
msgid "Your changes have been successfully committed."
msgstr ""
msgid "Your comment will not be visible to the public."
msgstr ""
@ -9287,6 +9518,9 @@ msgstr ""
msgid "Your projects"
msgstr ""
msgid "Your request for access has been queued for review."
msgstr ""
msgid "a deleted user"
msgstr ""
@ -9366,6 +9600,9 @@ msgstr ""
msgid "estimateCommand|%{slash_command} will update the estimated time with the latest command."
msgstr ""
msgid "failed"
msgstr ""
msgid "for %{link_to_merge_request} with %{link_to_merge_request_source_branch}"
msgstr ""
@ -9743,6 +9980,9 @@ msgstr ""
msgid "stuck"
msgstr ""
msgid "success"
msgstr ""
msgid "syntax is correct"
msgstr ""