diff options
| author | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2018-12-17 16:04:32 +0000 |
|---|---|---|
| committer | Douglas Barbosa Alexandre <dbalexandre@gmail.com> | 2018-12-17 16:04:32 +0000 |
| commit | d82b6d120eb54e389d775223b0c1615332143a42 (patch) | |
| tree | 1ef17bf0a25d2be932111348780450ab2122e83f | |
| parent | 574ae4c7aaf34347839c9a44648bfcfea5a1e434 (diff) | |
| parent | 4fc73988a07950ae854908373f7bd02d7a445bed (diff) | |
| download | gitlab-ce-d82b6d120eb54e389d775223b0c1615332143a42.tar.gz | |
Merge branch 'gt-add-externalized-strings-for-cluster-error-msg' into 'master'
Add externalized strings for clusters error messages
Closes #45310
See merge request gitlab-org/gitlab-ce!23753
| -rw-r--r-- | app/services/clusters/gcp/finalize_creation_service.rb | 6 | ||||
| -rw-r--r-- | 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 ef1c56a50ab..dcd5e3c1409 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -1542,6 +1542,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 "" |