diff options
| author | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-11-14 13:23:08 -0600 |
|---|---|---|
| committer | Jose Ivan Vargas <jvargas@gitlab.com> | 2017-11-14 13:23:08 -0600 |
| commit | fd2d8c38a43e88f82749463f779ba1fffb808831 (patch) | |
| tree | bba617cb593016326f42b31cbc7054f0fee63837 | |
| parent | 4bfbcb67db0fa9d9f50a968d34581cab17ecdf15 (diff) | |
| download | gitlab-ce-33338-internationalization-support-for-prometheus-service-configuration.tar.gz | |
address observations33338-internationalization-support-for-prometheus-service-configuration
| -rw-r--r-- | app/assets/javascripts/prometheus_metrics/constants.js | 8 | ||||
| -rw-r--r-- | app/views/projects/services/prometheus/_show.html.haml | 8 |
2 files changed, 5 insertions, 11 deletions
diff --git a/app/assets/javascripts/prometheus_metrics/constants.js b/app/assets/javascripts/prometheus_metrics/constants.js index c989175d5c2..50f1248456e 100644 --- a/app/assets/javascripts/prometheus_metrics/constants.js +++ b/app/assets/javascripts/prometheus_metrics/constants.js @@ -1,7 +1,5 @@ -import { s__ } from '../locale'; - export default { - EMPTY: s__('PrometheusService|empty'), - LOADING: s__('PrometheusService|loading'), - LIST: s__('PrometheusService|list'), + EMPTY: 'empty', + LOADING: 'loading', + LIST: 'list', }; diff --git a/app/views/projects/services/prometheus/_show.html.haml b/app/views/projects/services/prometheus/_show.html.haml index 03604568015..b0cb5ce5e8f 100644 --- a/app/views/projects/services/prometheus/_show.html.haml +++ b/app/views/projects/services/prometheus/_show.html.haml @@ -24,8 +24,7 @@ = custom_icon('icon_empty_metrics') %p = s_('PrometheusService|No metrics are being monitored. To start monitoring, deploy to an environment.') - = link_to project_environments_path(@project), title: s_('PrometheusService|View environments'), class: 'btn btn-success' do - = s_('PrometheusService|View environments') + = link_to s_('PrometheusService|View environments'), project_environments_path(@project), class: 'btn btn-success' %ul.list-unstyled.metrics-list.hidden.js-metrics-list .panel.panel-default.hidden.js-panel-missing-env-vars @@ -38,9 +37,6 @@ .flash-container .flash-notice .flash-text - = s_('PrometheusService|To set up automatic monitoring, add the environment variable') - %code - $CI_ENVIRONMENT_SLUG - = s_("PrometheusService|to exporter's queries.") + = s_("PrometheusService|To set up automatic monitoring, add the environment variable %{variable} to exporter's queries." % { variable: "<code>$CI_ENVIRONMENT_SLUG</code>" }).html_safe = link_to s_('PrometheusService|More information'), help_page_path('user/project/integrations/prometheus', anchor: 'metrics-and-labels') %ul.list-unstyled.metrics-list.js-missing-var-metrics-list |