From 4fc73988a07950ae854908373f7bd02d7a445bed Mon Sep 17 00:00:00 2001 From: George Tsiolis Date: Tue, 11 Dec 2018 23:21:05 +0200 Subject: [PATCH] Add externalized strings for clusters error messages --- app/services/clusters/gcp/finalize_creation_service.rb | 6 +++--- locale/gitlab.pot | 9 +++++++++ 2 files changed, 12 insertions(+), 3 deletions(-) diff --git a/app/services/clusters/gcp/finalize_creation_service.rb b/app/services/clusters/gcp/finalize_creation_service.rb index 301059f0326..a4e44d009c0 100644 --- a/app/services/clusters/gcp/finalize_creation_service.rb +++ b/app/services/clusters/gcp/finalize_creation_service.rb @@ -17,13 +17,13 @@ module Clusters rescue Google::Apis::ServerError, Google::Apis::ClientError, Google::Apis::AuthorizationError => e log_service_error(e.class.name, provider.id, e.message) - provider.make_errored!("Failed to request to CloudPlatform; #{e.message}") + provider.make_errored!(s_('ClusterIntegration|Failed to request to Google Cloud Platform: %{message}') % { message: e.message }) rescue Kubeclient::HttpError => e log_service_error(e.class.name, provider.id, e.message) - provider.make_errored!("Failed to run Kubeclient: #{e.message}") + provider.make_errored!(s_('ClusterIntegration|Failed to run Kubeclient: %{message}') % { message: e.message }) rescue ActiveRecord::RecordInvalid => e log_service_error(e.class.name, provider.id, e.message) - provider.make_errored!("Failed to configure Google Kubernetes Engine Cluster: #{e.message}") + provider.make_errored!(s_('ClusterIntegration|Failed to configure Google Kubernetes Engine Cluster: %{message}') % { message: e.message }) end private diff --git a/locale/gitlab.pot b/locale/gitlab.pot index 0584d2006f7..aac25906fda 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -1539,6 +1539,15 @@ msgstr "" msgid "ClusterIntegration|Every new Google Cloud Platform (GCP) account receives $300 in credit upon %{sign_up_link}. In partnership with Google, GitLab is able to offer an additional $200 for both new and existing GCP accounts to get started with GitLab's Google Kubernetes Engine Integration." msgstr "" +msgid "ClusterIntegration|Failed to configure Google Kubernetes Engine Cluster: %{message}" +msgstr "" + +msgid "ClusterIntegration|Failed to request to Google Cloud Platform: %{message}" +msgstr "" + +msgid "ClusterIntegration|Failed to run Kubeclient: %{message}" +msgstr "" + msgid "ClusterIntegration|Fetching machine types" msgstr ""