Merge branch 'mw-i18n-app-misc' into 'master'

Externalize several strings in controllers/services/presenters

See merge request gitlab-org/gitlab-ce!27390

app/controllers/jwt_controller.rb

@@ -39,9 +39,9 @@ class JwtController < ApplicationController
     render json: {
       errors: [
         { code: 'UNAUTHORIZED',
-          message: "HTTP Basic: Access denied\n" \
-                   "You must use a personal access token with 'api' scope for Git over HTTP.\n" \
-                   "You can generate one at #{profile_personal_access_tokens_url}" }
+          message: _('HTTP Basic: Access denied\n' \
+                   'You must use a personal access token with \'api\' scope for Git over HTTP.\n' \
+                   'You can generate one at %{profile_personal_access_tokens_url}') % { profile_personal_access_tokens_url: profile_personal_access_tokens_url } }
       ]
     }, status: :unauthorized
   end

app/controllers/ldap/omniauth_callbacks_controller.rb

@@ -26,7 +26,7 @@ class Ldap::OmniauthCallbacksController < OmniauthCallbacksController
 
   override :fail_login
   def fail_login(user)
-    flash[:alert] = 'Access denied for your LDAP account.'
+    flash[:alert] = _('Access denied for your LDAP account.')
 
     redirect_to new_user_session_path
   end

app/presenters/merge_request_presenter.rb

@@ -50,7 +50,7 @@ class MergeRequestPresenter < Gitlab::View::Presenter::Delegated
     if user_can_fork_project? && cached_can_be_reverted?
       continue_params = {
         to: merge_request_path(merge_request),
-        notice: "#{edit_in_new_fork_notice} Try to cherry-pick this commit again.",
+        notice: _('%{edit_in_new_fork_notice} Try to cherry-pick this commit again.') % { edit_in_new_fork_notice: edit_in_new_fork_notice },
         notice_now: edit_in_new_fork_notice_now
       }
 
@@ -64,7 +64,7 @@ class MergeRequestPresenter < Gitlab::View::Presenter::Delegated
     if user_can_fork_project? && can_be_cherry_picked?
       continue_params = {
         to: merge_request_path(merge_request),
-        notice: "#{edit_in_new_fork_notice} Try to revert this commit again.",
+        notice: _('%{edit_in_new_fork_notice} Try to revert this commit again.') % { edit_in_new_fork_notice: edit_in_new_fork_notice },
         notice_now: edit_in_new_fork_notice_now
       }
 
@@ -156,8 +156,11 @@ class MergeRequestPresenter < Gitlab::View::Presenter::Delegated
                                                    ).assignable_issues
     path = assign_related_issues_project_merge_request_path(project, merge_request)
     if issues.present?
-      pluralize_this_issue = issues.count > 1 ? "these issues" : "this issue"
-      link_to "Assign yourself to #{pluralize_this_issue}", path, method: :post
+      if issues.count > 1
+        link_to _('Assign yourself to these issues'), path, method: :post
+      else
+        link_to _('Assign yourself to this issue'), path, method: :post
+      end
     end
     # rubocop: enable CodeReuse/ServiceClass
   end

app/services/clusters/applications/install_service.rb

@@ -22,10 +22,10 @@ module Clusters
           ClusterWaitForAppInstallationWorker::INTERVAL, app.name, app.id)
       rescue Kubeclient::HttpError => e
         log_error(e)
-        app.make_errored!("Kubernetes error: #{e.error_code}")
+        app.make_errored!(_('Kubernetes error: %{error_code}') % { error_code: e.error_code })
       rescue StandardError => e
         log_error(e)
-        app.make_errored!('Failed to install.')
+        app.make_errored!(_('Failed to install.'))
       end
     end
   end

app/services/clusters/applications/patch_service.rb

@@ -22,10 +22,10 @@ module Clusters
           ClusterWaitForAppInstallationWorker::INTERVAL, app.name, app.id)
       rescue Kubeclient::HttpError => e
         log_error(e)
-        app.make_errored!("Kubernetes error: #{e.error_code}")
+        app.make_errored!(_('Kubernetes error: %{error_code}') % { error_code: e.error_code })
       rescue StandardError => e
         log_error(e)
-        app.make_errored!('Failed to update.')
+        app.make_errored!(_('Failed to update.'))
       end
     end
   end

app/services/clusters/applications/upgrade_service.rb

@@ -24,10 +24,10 @@ module Clusters
           ClusterWaitForAppInstallationWorker::INTERVAL, app.name, app.id)
       rescue Kubeclient::HttpError => e
         log_error(e)
-        app.make_errored!("Kubernetes error: #{e.error_code}")
+        app.make_errored!(_('Kubernetes error: %{error_code}') % { error_code: e.error_code })
       rescue StandardError => e
         log_error(e)
-        app.make_errored!('Failed to upgrade.')
+        app.make_errored!(_('Failed to upgrade.'))
       end
     end
   end

app/services/files/update_service.rb

@@ -19,7 +19,7 @@ module Files
       super
 
       if file_has_changed?(@file_path, @last_commit_sha)
-        raise FileChangedError, "You are attempting to update a file that has changed since you started editing it."
+        raise FileChangedError, _('You are attempting to update a file that has changed since you started editing it.')
       end
     end
   end

locale/gitlab.pot

@@ -114,6 +114,12 @@ msgid_plural "%{count} participants"
 msgstr[0] ""
 msgstr[1] ""
 
+msgid "%{edit_in_new_fork_notice} Try to cherry-pick this commit again."
+msgstr ""
+
+msgid "%{edit_in_new_fork_notice} Try to revert this commit again."
+msgstr ""
+
 msgid "%{filePath} deleted"
 msgstr ""
 
@@ -1056,6 +1062,12 @@ msgstr ""
 msgid "Assign to"
 msgstr ""
 
+msgid "Assign yourself to these issues"
+msgstr ""
+
+msgid "Assign yourself to this issue"
+msgstr ""
+
 msgid "Assigned Issues"
 msgstr ""
 
@@ -3940,6 +3952,9 @@ msgstr ""
 msgid "Failed to deploy to"
 msgstr ""
 
+msgid "Failed to install."
+msgstr ""
+
 msgid "Failed to load emoji list."
 msgstr ""
 
@@ -3976,6 +3991,12 @@ msgstr ""
 msgid "Failed to update issues, please try again."
 msgstr ""
 
+msgid "Failed to update."
+msgstr ""
+
+msgid "Failed to upgrade."
+msgstr ""
+
 msgid "Failed to upload object map file"
 msgstr ""
 
@@ -4500,6 +4521,9 @@ msgstr ""
 msgid "GroupsTree|Search by name"
 msgstr ""
 
+msgid "HTTP Basic: Access denied\\nYou must use a personal access token with 'api' scope for Git over HTTP.\\nYou can generate one at %{profile_personal_access_tokens_url}"
+msgstr ""
+
 msgid "Header logo was successfully removed."
 msgstr ""
 
@@ -5117,6 +5141,9 @@ msgstr ""
 msgid "Kubernetes configured"
 msgstr ""
 
+msgid "Kubernetes error: %{error_code}"
+msgstr ""
+
 msgid "Kubernetes service integration has been deprecated. %{deprecated_message_content} your Kubernetes clusters using the new <a href=\"%{url}\"/>Kubernetes Clusters</a> page"
 msgstr ""
 
@@ -10341,6 +10368,9 @@ msgstr ""
 msgid "You are attempting to delete a file that has been previously updated."
 msgstr ""
 
+msgid "You are attempting to update a file that has changed since you started editing it."
+msgstr ""
+
 msgid "You are going to remove %{group_name}. Removed groups CANNOT be restored! Are you ABSOLUTELY sure?"
 msgstr ""