From be5e96f62825fdd37e2844de73b911b6a650def3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Torkel=20=C3=96degaard?= <torkel@grafana.com>
Date: Sat, 23 Jul 2022 17:49:58 +0200
Subject: [PATCH] Timezone: Consistency in how we write time zone (#52679)

* Timezone: Consistency in how we write time zone

* Updated
---
 .../DateTimePickers/TimeRangePicker/TimePickerFooter.tsx        | 2 +-
 public/app/core/components/OptionsUI/registry.tsx               | 2 +-
 .../components/DashboardSettings/TimePickerSettings.tsx         | 2 +-
 public/app/plugins/panel/timeseries/module.tsx                  | 2 +-
 4 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker/TimePickerFooter.tsx b/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker/TimePickerFooter.tsx
index d93fdbb6f80..4fec8509c07 100644
--- a/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker/TimePickerFooter.tsx
+++ b/packages/grafana-ui/src/components/DateTimePickers/TimeRangePicker/TimePickerFooter.tsx
@@ -78,7 +78,7 @@ export const TimePickerFooter: FC<Props> = (props) => {
             <RadioButtonGroup
               value={editMode}
               options={[
-                { label: 'Time Zone', value: 'tz' },
+                { label: 'Time zone', value: 'tz' },
                 { label: 'Fiscal year', value: 'fy' },
               ]}
               onChange={setEditMode}
diff --git a/public/app/core/components/OptionsUI/registry.tsx b/public/app/core/components/OptionsUI/registry.tsx
index 2e1213a7983..d9ece7c8451 100644
--- a/public/app/core/components/OptionsUI/registry.tsx
+++ b/public/app/core/components/OptionsUI/registry.tsx
@@ -147,7 +147,7 @@ export const getAllOptionEditors = () => {
 
   const timeZone: StandardEditorsRegistryItem<TimeZone> = {
     id: 'timezone',
-    name: 'Time Zone',
+    name: 'Time zone',
     description: 'Time zone selection',
     editor: TimeZonePicker as any,
   };
diff --git a/public/app/features/dashboard/components/DashboardSettings/TimePickerSettings.tsx b/public/app/features/dashboard/components/DashboardSettings/TimePickerSettings.tsx
index e52c92cd2e3..2fd38d15c7a 100644
--- a/public/app/features/dashboard/components/DashboardSettings/TimePickerSettings.tsx
+++ b/public/app/features/dashboard/components/DashboardSettings/TimePickerSettings.tsx
@@ -67,7 +67,7 @@ export class TimePickerSettings extends PureComponent<Props, State> {
   render() {
     return (
       <CollapsableSection label="Time options" isOpen={true}>
-        <Field label="Timezone" data-testid={selectors.components.TimeZonePicker.containerV2}>
+        <Field label="Time zone" data-testid={selectors.components.TimeZonePicker.containerV2}>
           <TimeZonePicker
             inputId="time-options-input"
             includeInternal={true}
diff --git a/public/app/plugins/panel/timeseries/module.tsx b/public/app/plugins/panel/timeseries/module.tsx
index 1ded66cd86b..498af5d7c2a 100644
--- a/public/app/plugins/panel/timeseries/module.tsx
+++ b/public/app/plugins/panel/timeseries/module.tsx
@@ -18,7 +18,7 @@ export const plugin = new PanelPlugin<TimeSeriesOptions, GraphFieldConfig>(TimeS
 
     builder.addCustomEditor({
       id: 'timezones',
-      name: 'Timezone',
+      name: 'Time zone',
       path: 'timezones',
       category: ['Axis'],
       editor: TimezonesEditor,