diff options
4 files changed, 19 insertions, 35 deletions
diff --git a/app/assets/javascripts/error_tracking_settings/components/error_tracking_form.vue b/app/assets/javascripts/error_tracking_settings/components/error_tracking_form.vue index 51de7808152..073f3936c83 100644 --- a/app/assets/javascripts/error_tracking_settings/components/error_tracking_form.vue +++ b/app/assets/javascripts/error_tracking_settings/components/error_tracking_form.vue @@ -65,9 +65,7 @@ export default { }}</label> </div> <div class="form-group"> - <label class="label-bold" for="error-tracking-api-host">{{ - s__('ErrorTracking|Sentry API URL') - }}</label> + <label class="label-bold" for="error-tracking-api-host">{{ __('Sentry API URL') }}</label> <div class="row"> <div class="col-8 col-md-9 gl-pr-0"> <input @@ -100,7 +98,7 @@ export default { data-qa-id="error-tracking-connect" @click="handleConnectClick" > - {{ s__('ErrorTracking|Connect') }} + {{ __('Connect') }} </button> <icon v-show="showCheck" @@ -115,7 +113,11 @@ export default { {{ s__('ErrorTracking|Connection has failed. Re-check Auth Token and try again.') }} </p> <p v-else class="form-text text-muted"> - {{ __("After adding your Auth Token, use the 'Connect' button to load projects") }} + {{ + s__( + "ErrorTracking|After adding your Auth Token, use the 'Connect' button to load projects", + ) + }} </p> </div> </div> diff --git a/app/assets/javascripts/error_tracking_settings/components/project_dropdown.vue b/app/assets/javascripts/error_tracking_settings/components/project_dropdown.vue index 440c633b065..0bf3ff089d1 100644 --- a/app/assets/javascripts/error_tracking_settings/components/project_dropdown.vue +++ b/app/assets/javascripts/error_tracking_settings/components/project_dropdown.vue @@ -71,7 +71,7 @@ export default { <template> <div :class="{ 'gl-show-field-errors': isProjectInvalid }"> - <label class="label-bold" for="project-dropdown">{{ s__('ErrorTracking|Project') }}</label> + <label class="label-bold" for="project-dropdown">{{ __('Project') }}</label> <div class="row"> <gl-dropdown id="project-dropdown" diff --git a/app/views/projects/settings/operations/_error_tracking.html.haml b/app/views/projects/settings/operations/_error_tracking.html.haml index 846da1451a7..634ff395377 100644 --- a/app/views/projects/settings/operations/_error_tracking.html.haml +++ b/app/views/projects/settings/operations/_error_tracking.html.haml @@ -10,6 +10,6 @@ = _('To link Sentry to GitLab, enter your Sentry URL and Auth Token.') = link_to _('More information'), help_page_path('user/project/operations/error_tracking'), target: '_blank' .settings-content - .js_error-tracking-form{ data: { api_host: setting.api_host, enabled: setting.enabled, token: setting.token, project_name: setting.project_name, project_slug: setting.project_slug, project_organization_name: setting.organization_name, project_organization_slug: setting.organization_slug, list_projects_endpoint: namespace_project_list_projects_url(project_id: @project, namespace_id: @project.namespace), operations_settings_endpoint: project_settings_operations_path(@project) } } + .js_error-tracking-form{ data: { api_host: setting.api_host, enabled: setting.enabled, token: setting.token, project_name: setting.project_name, project_slug: setting.project_slug, project_organization_name: setting.organization_name, project_organization_slug: setting.organization_slug, list_projects_endpoint: list_projects_project_error_tracking_index_path(@project), operations_settings_endpoint: project_settings_operations_path(@project) } } .loading-container.text-center = icon('spinner spin 2x', class: 'loading-animation prepend-top-20') diff --git a/locale/gitlab.pot b/locale/gitlab.pot index f858d84714d..9f9649423f7 100644 --- a/locale/gitlab.pot +++ b/locale/gitlab.pot @@ -543,9 +543,6 @@ msgstr "" msgid "Advanced settings" msgstr "" -msgid "After adding your Auth Token, use the 'Connect' button to load projects" -msgstr "" - msgid "All" msgstr "" @@ -858,9 +855,6 @@ msgstr "" msgid "August" msgstr "" -msgid "Auth Token" -msgstr "" - msgid "Authentication Log" msgstr "" @@ -1521,9 +1515,6 @@ msgstr "" msgid "Clear search input" msgstr "" -msgid "Click 'Connect' to re-establish the connection to Sentry and activate the dropdown." -msgstr "" - msgid "Click any <strong>project name</strong> in the project list below to navigate to the project milestone." msgstr "" @@ -2171,9 +2162,6 @@ msgstr "" msgid "Connect repositories from GitHub" msgstr "" -msgid "Connection has failed. Re-check Auth Token and try again." -msgstr "" - msgid "Container Registry" msgstr "" @@ -3136,22 +3124,28 @@ msgstr "" msgid "ErrorTracking|Active" msgstr "" +msgid "ErrorTracking|After adding your Auth Token, use the 'Connect' button to load projects" +msgstr "" + msgid "ErrorTracking|Auth Token" msgstr "" -msgid "ErrorTracking|Connect" +msgid "ErrorTracking|Click 'Connect' to re-establish the connection to Sentry and activate the dropdown." msgstr "" -msgid "ErrorTracking|No projects available" +msgid "ErrorTracking|Connection has failed. Re-check Auth Token and try again." msgstr "" -msgid "ErrorTracking|Project" +msgid "ErrorTracking|Find your hostname in your Sentry account settings page" +msgstr "" + +msgid "ErrorTracking|No projects available" msgstr "" msgid "ErrorTracking|Select project" msgstr "" -msgid "ErrorTracking|Sentry API URL" +msgid "ErrorTracking|To enable project selection, enter a valid Auth Token" msgstr "" msgid "Errors" @@ -3370,9 +3364,6 @@ msgstr "" msgid "Find the newly extracted <code>Takeout/Google Code Project Hosting/GoogleCodeProjectHosting.json</code> file." msgstr "" -msgid "Find your hostname in your Sentry account settings page" -msgstr "" - msgid "Fingerprints" msgstr "" @@ -4863,9 +4854,6 @@ msgstr "" msgid "No prioritised labels with such name or description" msgstr "" -msgid "No projects available" -msgstr "" - msgid "No public groups" msgstr "" @@ -7629,9 +7617,6 @@ msgstr "" msgid "To enable it and see User Cohorts, visit %{application_settings_link_start}application settings%{application_settings_link_end}." msgstr "" -msgid "To enable project selection, enter a valid Auth Token" -msgstr "" - msgid "To get started you enter your FogBugz URL and login information below. In the next steps, you'll be able to map users and select the projects you want to import." msgstr "" @@ -8587,9 +8572,6 @@ msgstr "" msgid "here" msgstr "" -msgid "https://mysentryserver.com" -msgstr "" - msgid "https://your-bitbucket-server" msgstr "" |