diff --git a/.betterer.results b/.betterer.results index 1d379783c7f..05523a153df 100644 --- a/.betterer.results +++ b/.betterer.results @@ -2252,8 +2252,7 @@ exports[`better eslint`] = { "public/app/features/alerting/unified/components/rules/CloudRules.tsx:5381": [ [0, 0, 0, "No untranslated strings. Wrap text with ", "0"], [0, 0, 0, "No untranslated strings. Wrap text with ", "1"], - [0, 0, 0, "No untranslated strings. Wrap text with ", "2"], - [0, 0, 0, "No untranslated strings. Wrap text with ", "3"] + [0, 0, 0, "No untranslated strings. Wrap text with ", "2"] ], "public/app/features/alerting/unified/components/rules/EditRuleGroupModal.tsx:5381": [ [0, 0, 0, "No untranslated strings. Wrap text with ", "0"], diff --git a/public/app/features/alerting/unified/components/rules/CloudRules.tsx b/public/app/features/alerting/unified/components/rules/CloudRules.tsx index 56157c689a3..0c624958b3e 100644 --- a/public/app/features/alerting/unified/components/rules/CloudRules.tsx +++ b/public/app/features/alerting/unified/components/rules/CloudRules.tsx @@ -5,6 +5,7 @@ import { useLocation } from 'react-router-dom-v5-compat'; import { GrafanaTheme2, urlUtil } from '@grafana/data'; import { LinkButton, LoadingPlaceholder, Pagination, Spinner, Text, useStyles2 } from '@grafana/ui'; +import { Trans } from 'app/core/internationalization'; import { CombinedRuleNamespace } from 'app/types/unified-alerting'; import { DEFAULT_PER_PAGE_PAGINATION } from '../../../../../core/constants'; @@ -56,7 +57,7 @@ export const CloudRules = ({ namespaces, expandAll }: Props) => {
- Mimir / Cortex / Loki + Data source-managed {dataSourcesLoading.length ? ( {
- Grafana + Grafana-managed {loading ? ( - + ) : (
)} @@ -81,7 +84,7 @@ export const GrafanaRules = ({ namespaces, expandAll }: Props) => { onClick={toggleShowExportDrawer} variant="secondary" > - Export rules + Export rules )} {grafanaRecordingRulesEnabled && ( @@ -94,7 +97,7 @@ export const GrafanaRules = ({ namespaces, expandAll }: Props) => { tooltip="Create new Grafana-managed recording rule" onClick={() => logInfo(LogMessages.grafanaRecording)} > - New recording rule + New recording rule )} diff --git a/public/app/features/alerting/unified/components/rules/RuleListGroupView.test.tsx b/public/app/features/alerting/unified/components/rules/RuleListGroupView.test.tsx index a2d07b1ec94..caec9525c26 100644 --- a/public/app/features/alerting/unified/components/rules/RuleListGroupView.test.tsx +++ b/public/app/features/alerting/unified/components/rules/RuleListGroupView.test.tsx @@ -16,8 +16,8 @@ import { RuleListGroupView } from './RuleListGroupView'; jest.spyOn(analytics, 'logInfo'); const ui = { - grafanaRulesHeading: byRole('heading', { name: 'Grafana' }), - cloudRulesHeading: byRole('heading', { name: 'Mimir / Cortex / Loki' }), + grafanaRulesHeading: byRole('heading', { name: 'Grafana-managed' }), + cloudRulesHeading: byRole('heading', { name: 'Data source-managed' }), }; setPluginExtensionsHook(() => ({ diff --git a/public/locales/en-US/grafana.json b/public/locales/en-US/grafana.json index 329bad25991..c162a553f37 100644 --- a/public/locales/en-US/grafana.json +++ b/public/locales/en-US/grafana.json @@ -123,11 +123,18 @@ "contactPointFilter": { "label": "Contact point" }, - "grafana-rules": { - "export-rules": "Export rules", - "loading": "Loading...", - "new-recording-rule": "New recording rule", - "title": "Grafana" + "list-view": { + "section": { + "dataSourceManaged": { + "title": "Data source-managed" + }, + "grafanaManaged": { + "export-rules": "Export rules", + "loading": "Loading...", + "new-recording-rule": "New recording rule", + "title": "Grafana-managed" + } + } }, "mute_timings": { "error-loading": { diff --git a/public/locales/pseudo-LOCALE/grafana.json b/public/locales/pseudo-LOCALE/grafana.json index d9706fbbd41..83d7c6a4e0b 100644 --- a/public/locales/pseudo-LOCALE/grafana.json +++ b/public/locales/pseudo-LOCALE/grafana.json @@ -123,11 +123,18 @@ "contactPointFilter": { "label": "Cőʼnŧäčŧ pőįʼnŧ" }, - "grafana-rules": { - "export-rules": "Ēχpőřŧ řūľęş", - "loading": "Ŀőäđįʼnģ...", - "new-recording-rule": "Ńęŵ řęčőřđįʼnģ řūľę", - "title": "Ğřäƒäʼnä" + "list-view": { + "section": { + "dataSourceManaged": { + "title": "Đäŧä şőūřčę-mäʼnäģęđ" + }, + "grafanaManaged": { + "export-rules": "Ēχpőřŧ řūľęş", + "loading": "Ŀőäđįʼnģ...", + "new-recording-rule": "Ńęŵ řęčőřđįʼnģ řūľę", + "title": "Ğřäƒäʼnä-mäʼnäģęđ" + } + } }, "mute_timings": { "error-loading": {