Commit 870cc632 authored by Michael Kozono's avatar Michael Kozono

Merge branch '196073-sentence-case-settings-ops' into 'master'

Fixed Ops-Settings page titles capitalization

See merge request gitlab-org/gitlab!37259
parents c7e4cc68 9b53da87
...@@ -56,7 +56,7 @@ export default { ...@@ -56,7 +56,7 @@ export default {
<section id="grafana" class="settings no-animate js-grafana-integration"> <section id="grafana" class="settings no-animate js-grafana-integration">
<div class="settings-header"> <div class="settings-header">
<h3 class="js-section-header h4"> <h3 class="js-section-header h4">
{{ s__('GrafanaIntegration|Grafana Authentication') }} {{ s__('GrafanaIntegration|Grafana authentication') }}
</h3> </h3>
<gl-deprecated-button class="js-settings-toggle">{{ __('Expand') }}</gl-deprecated-button> <gl-deprecated-button class="js-settings-toggle">{{ __('Expand') }}</gl-deprecated-button>
<p class="js-section-sub-header"> <p class="js-section-sub-header">
......
...@@ -32,7 +32,7 @@ export default { ...@@ -32,7 +32,7 @@ export default {
<section class="settings no-animate"> <section class="settings no-animate">
<div class="settings-header"> <div class="settings-header">
<h3 class="js-section-header h4"> <h3 class="js-section-header h4">
{{ s__('MetricsSettings|Metrics Dashboard') }} {{ s__('MetricsSettings|Metrics dashboard') }}
</h3> </h3>
<gl-deprecated-button class="js-settings-toggle">{{ __('Expand') }}</gl-deprecated-button> <gl-deprecated-button class="js-settings-toggle">{{ __('Expand') }}</gl-deprecated-button>
<p class="js-section-sub-header"> <p class="js-section-sub-header">
......
...@@ -5,7 +5,7 @@ ...@@ -5,7 +5,7 @@
%section.settings.no-animate.js-error-tracking-settings %section.settings.no-animate.js-error-tracking-settings
.settings-header .settings-header
%h3{ :class => "h4" } %h3{ :class => "h4" }
= _('Error Tracking') = _('Error tracking')
%button.btn.js-settings-toggle{ type: 'button' } %button.btn.js-settings-toggle{ type: 'button' }
= _('Expand') = _('Expand')
%p %p
......
---
title: "Fixed ops settings titles"
merge_request: 37259
author:
type: fixed
...@@ -9535,6 +9535,9 @@ msgstr "" ...@@ -9535,6 +9535,9 @@ msgstr ""
msgid "Error setting up editor. Please try again." msgid "Error setting up editor. Please try again."
msgstr "" msgstr ""
msgid "Error tracking"
msgstr ""
msgid "Error updating %{issuableType}" msgid "Error updating %{issuableType}"
msgstr "" msgstr ""
...@@ -11530,10 +11533,10 @@ msgstr "" ...@@ -11530,10 +11533,10 @@ msgstr ""
msgid "GrafanaIntegration|Enter the base URL of the Grafana instance." msgid "GrafanaIntegration|Enter the base URL of the Grafana instance."
msgstr "" msgstr ""
msgid "GrafanaIntegration|Grafana Authentication" msgid "GrafanaIntegration|Grafana URL"
msgstr "" msgstr ""
msgid "GrafanaIntegration|Grafana URL" msgid "GrafanaIntegration|Grafana authentication"
msgstr "" msgstr ""
msgid "Grant access" msgid "Grant access"
...@@ -14864,7 +14867,7 @@ msgstr "" ...@@ -14864,7 +14867,7 @@ msgstr ""
msgid "MetricsSettings|Manage Metrics Dashboard settings." msgid "MetricsSettings|Manage Metrics Dashboard settings."
msgstr "" msgstr ""
msgid "MetricsSettings|Metrics Dashboard" msgid "MetricsSettings|Metrics dashboard"
msgstr "" msgstr ""
msgid "MetricsSettings|UTC (Coordinated Universal Time)" msgid "MetricsSettings|UTC (Coordinated Universal Time)"
......
...@@ -12,7 +12,7 @@ exports[`grafana integration component default state to match the default snapsh ...@@ -12,7 +12,7 @@ exports[`grafana integration component default state to match the default snapsh
class="js-section-header h4" class="js-section-header h4"
> >
Grafana Authentication Grafana authentication
</h3> </h3>
......
...@@ -44,7 +44,7 @@ describe('grafana integration component', () => { ...@@ -44,7 +44,7 @@ describe('grafana integration component', () => {
it('renders header text', () => { it('renders header text', () => {
wrapper = shallowMount(GrafanaIntegration, { store }); wrapper = shallowMount(GrafanaIntegration, { store });
expect(wrapper.find('.js-section-header').text()).toBe('Grafana Authentication'); expect(wrapper.find('.js-section-header').text()).toBe('Grafana authentication');
}); });
describe('expand/collapse button', () => { describe('expand/collapse button', () => {
......
...@@ -56,7 +56,7 @@ describe('operation settings external dashboard component', () => { ...@@ -56,7 +56,7 @@ describe('operation settings external dashboard component', () => {
it('renders header text', () => { it('renders header text', () => {
mountComponent(); mountComponent();
expect(wrapper.find('.js-section-header').text()).toBe('Metrics Dashboard'); expect(wrapper.find('.js-section-header').text()).toBe('Metrics dashboard');
}); });
describe('expand/collapse button', () => { describe('expand/collapse button', () => {
......
...@@ -35,7 +35,7 @@ RSpec.describe 'projects/settings/operations/show' do ...@@ -35,7 +35,7 @@ RSpec.describe 'projects/settings/operations/show' do
it 'renders the Operations Settings page' do it 'renders the Operations Settings page' do
render template: 'projects/settings/operations/show', locals: operations_show_locals render template: 'projects/settings/operations/show', locals: operations_show_locals
expect(rendered).to have_content _('Error Tracking') expect(rendered).to have_content _('Error tracking')
expect(rendered).to have_content _('To link Sentry to GitLab, enter your Sentry URL and Auth Token') expect(rendered).to have_content _('To link Sentry to GitLab, enter your Sentry URL and Auth Token')
end end
end end
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment