Skip to content

Commit

Permalink
Merge pull request #8376 from kyoto/monitoring-missing-i18n-stacked
Browse files Browse the repository at this point in the history
Monitoring: Add missing i18n for "Stacked"
  • Loading branch information
openshift-merge-robot committed Mar 16, 2021
2 parents 233cd5f + edfece3 commit 761cb74
Show file tree
Hide file tree
Showing 3 changed files with 5 additions and 2 deletions.
2 changes: 1 addition & 1 deletion frontend/public/components/monitoring/alerting.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -1184,7 +1184,7 @@ export const severityRowFilter: RowFilter = {
type: 'alert-severity',
};

export const alertsRowFilters: RowFilter[] = [
const alertsRowFilters: RowFilter[] = [
{
defaultSelected: [AlertStates.Firing],
filterGroupName: 'Alert State',
Expand Down
4 changes: 3 additions & 1 deletion frontend/public/components/monitoring/query-browser.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -555,6 +555,8 @@ const QueryBrowser_: React.FC<QueryBrowserProps> = ({
tickInterval,
timespan,
}) => {
const { t } = useTranslation();

// For the default time span, use the first of the suggested span options that is at least as long
// as defaultTimespan
const defaultSpanText = spans.find((s) => parsePrometheusDuration(s) >= defaultTimespan);
Expand Down Expand Up @@ -776,7 +778,7 @@ const QueryBrowser_: React.FC<QueryBrowserProps> = ({
<Checkbox
id="stacked"
isChecked={isStacked}
label="Stacked"
label={t('public~Stacked')}
onChange={(v) => setIsStacked(v)}
/>
)}
Expand Down
1 change: 1 addition & 0 deletions frontend/public/locales/en/public.json
Original file line number Diff line number Diff line change
Expand Up @@ -292,6 +292,7 @@
"{{count}} day_plural": "{{count}} days",
"Reset zoom": "Reset zoom",
"query browser chart": "query browser chart",
"Stacked": "Stacked",
"Your default receiver will automatically receive all alerts from this cluster that are not caught by other receivers first.": "Your default receiver will automatically receive all alerts from this cluster that are not caught by other receivers first.",
"The routing labels for this receiver are configured to capture critical alerts. Finish setting up this receiver by selecting a \"Receiver Type\" to choose a destination for these alerts. If this receiver is deleted, critical alerts will go to the default receiver instead.": "The routing labels for this receiver are configured to capture critical alerts. Finish setting up this receiver by selecting a \"Receiver Type\" to choose a destination for these alerts. If this receiver is deleted, critical alerts will go to the default receiver instead.",
"The Watchdog alert fires constantly to confirm that your alerting stack is functioning correctly. This receiver is configured to prevent it from creating unnecessary notifications. You can edit this receiver if you plan to use the information that Watchdog provides, otherwise this receiver should remain in its current state with no set receiver type.": "The Watchdog alert fires constantly to confirm that your alerting stack is functioning correctly. This receiver is configured to prevent it from creating unnecessary notifications. You can edit this receiver if you plan to use the information that Watchdog provides, otherwise this receiver should remain in its current state with no set receiver type.",
Expand Down

0 comments on commit 761cb74

Please sign in to comment.