Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Sentence case copy changes #43215

Merged
merged 3 commits into from
Aug 14, 2019
Merged

Sentence case copy changes #43215

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
5c0ae25
Change casing for options and labels to be sentence case
phillipb Aug 13, 2019
d7f78d5
More sentence-case copy changes
phillipb Aug 13, 2019
60a5e78
Fix min and max capitalization
phillipb Aug 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion x-pack/legacy/plugins/infra/public/components/metrics_explorer/aggregation.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@ export const MetricsExplorerAggregationPicker = injectI18n(({ intl, options, onC
}),
[MetricsExplorerAggregation.count]: intl.formatMessage({
id: 'xpack.infra.metricsExplorer.aggregationLables.count',
defaultMessage: 'Document Count',
defaultMessage: 'Document count',
}),
};

Expand Down
8 changes: 4 additions & 4 deletions x-pack/legacy/plugins/infra/public/components/metrics_explorer/chart_options.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,14 +51,14 @@ export const MetricsExplorerChartOptions = injectI18n(({ chartOptions, onChange,
id: MetricsExplorerYAxisMode.auto,
label: intl.formatMessage({
id: 'xpack.infra.metricsExplorer.chartOptions.autoLabel',
defaultMessage: 'Automatic (Min to Max)',
defaultMessage: 'Automatic (min to max)',
}),
},
{
id: MetricsExplorerYAxisMode.fromZero,
label: intl.formatMessage({
id: 'xpack.infra.metricsExplorer.chartOptions.fromZeroLabel',
defaultMessage: 'From Zero (0 to Max)',
defaultMessage: 'From zero (0 to max)',
}),
},
];
Expand Down Expand Up @@ -122,7 +122,7 @@ export const MetricsExplorerChartOptions = injectI18n(({ chartOptions, onChange,
compressed
label={intl.formatMessage({
id: 'xpack.infra.metricsExplorer.chartOptions.typeLabel',
defaultMessage: 'Chart Style',
defaultMessage: 'Chart style',
})}
>
<EuiRadioGroup
Expand All @@ -135,7 +135,7 @@ export const MetricsExplorerChartOptions = injectI18n(({ chartOptions, onChange,
compressed
label={intl.formatMessage({
id: 'xpack.infra.metricsExplorer.chartOptions.stackLabel',
defaultMessage: 'Stack Series',
defaultMessage: 'Stack series',
})}
>
<EuiSwitch
Expand Down
2 changes: 1 addition & 1 deletion ...ck/legacy/plugins/infra/public/components/source_configuration/add_log_column_popover.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ export const AddLogColumnButtonAndPopover: React.FunctionComponent<{
>
<FormattedMessage
id="xpack.infra.sourceConfiguration.addLogColumnButtonLabel"
defaultMessage="Add Column"
defaultMessage="Add column"
/>
</EuiButton>
}
Expand Down
4 changes: 2 additions & 2 deletions ...gacy/plugins/infra/public/components/source_configuration/indices_configuration_panel.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,7 +46,7 @@ export const IndicesConfigurationPanel = ({
title={
<FormattedMessage
id="xpack.infra.sourceConfiguration.metricIndicesTitle"
defaultMessage="Metric Indices"
defaultMessage="Metric indices"
/>
}
description={
Expand Down Expand Up @@ -92,7 +92,7 @@ export const IndicesConfigurationPanel = ({
title={
<FormattedMessage
id="xpack.infra.sourceConfiguration.logIndicesTitle"
defaultMessage="Log Indices"
defaultMessage="Log indices"
/>
}
description={
Expand Down
8 changes: 4 additions & 4 deletions x-pack/legacy/plugins/infra/public/components/waffle/lib/field_to_display_name.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,23 +26,23 @@ export const fieldToName = (field: string, intl: InjectedIntl) => {
}),
'cloud.availability_zone': intl.formatMessage({
id: 'xpack.infra.groupByDisplayNames.availabilityZone',
defaultMessage: 'Availability Zone',
defaultMessage: 'Availability zone',
}),
'cloud.machine.type': intl.formatMessage({
id: 'xpack.infra.groupByDisplayNames.machineType',
defaultMessage: 'Machine Type',
defaultMessage: 'Machine type',
}),
'cloud.project.id': intl.formatMessage({
id: 'xpack.infra.groupByDisplayNames.projectID',
defaultMessage: 'Project ID',
}),
'cloud.provider': intl.formatMessage({
id: 'xpack.infra.groupByDisplayNames.provider',
defaultMessage: 'Cloud Provider',
defaultMessage: 'Cloud provider',
}),
'service.type': intl.formatMessage({
id: 'xpack.infra.groupByDisplayNames.serviceType',
defaultMessage: 'Service Type',
defaultMessage: 'Service type',
}),
};
return LOOKUP[field] || field;
Expand Down
4 changes: 2 additions & 2 deletions x-pack/legacy/plugins/infra/public/components/waffle/view_switcher.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,15 +20,15 @@ export const ViewSwitcher = injectI18n(({ view, onChange, intl }: Props) => {
id: 'map',
label: intl.formatMessage({
id: 'xpack.infra.viewSwitcher.mapViewLabel',
defaultMessage: 'Map View',
defaultMessage: 'Map view',
}),
iconType: 'apps',
},
{
id: 'table',
label: intl.formatMessage({
id: 'xpack.infra.viewSwitcher.tableViewLabel',
defaultMessage: 'Table View',
defaultMessage: 'Table view',
}),
iconType: 'editorUnorderedList',
},
Expand Down
2 changes: 1 addition & 1 deletion x-pack/legacy/plugins/infra/public/components/waffle/waffle_group_by_controls.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -112,7 +112,7 @@ export const WaffleGroupByControls = injectI18n(
{
name: intl.formatMessage({
id: 'xpack.infra.waffle.customGroupByOptionName',
defaultMessage: 'Custom Field',
defaultMessage: 'Custom field',
}),
icon: 'empty',
panel: 'customPanel',
Expand Down
28 changes: 16 additions & 12 deletions x-pack/legacy/plugins/infra/public/components/waffle/waffle_metric_controls.tsx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,22 +35,32 @@ const getOptions = (
if (!OPTIONS) {
const CPUUsage = intl.formatMessage({
id: 'xpack.infra.waffle.metricOptions.cpuUsageText',
defaultMessage: 'CPU Usage',
defaultMessage: 'CPU usage',
});

const MemoryUsage = intl.formatMessage({
id: 'xpack.infra.waffle.metricOptions.memoryUsageText',
defaultMessage: 'Memory Usage',
defaultMessage: 'Memory usage',
});

const InboundTraffic = intl.formatMessage({
id: 'xpack.infra.waffle.metricOptions.inboundTrafficText',
defaultMessage: 'Inbound Traffic',
defaultMessage: 'Inbound traffic',
});

const OutboundTraffic = intl.formatMessage({
id: 'xpack.infra.waffle.metricOptions.outboundTrafficText',
defaultMessage: 'Outbound Traffic',
defaultMessage: 'Outbound traffic',
});

const LogRate = intl.formatMessage({
id: 'xpack.infra.waffle.metricOptions.hostLogRateText',
defaultMessage: 'Log rate',
});

const Load = intl.formatMessage({
id: 'xpack.infra.waffle.metricOptions.loadText',
defaultMessage: 'Load',
});

OPTIONS = {
Expand Down Expand Up @@ -100,10 +110,7 @@ const getOptions = (
value: InfraSnapshotMetricType.memory,
},
{
text: intl.formatMessage({
id: 'xpack.infra.waffle.metricOptions.loadText',
defaultMessage: 'Load',
}),
text: Load,
value: InfraSnapshotMetricType.load,
},
{
Expand All @@ -115,10 +122,7 @@ const getOptions = (
value: InfraSnapshotMetricType.tx,
},
{
text: intl.formatMessage({
id: 'xpack.infra.waffle.metricOptions.hostLogRateText',
defaultMessage: 'Log Rate',
}),
text: LogRate,
value: InfraSnapshotMetricType.logRate,
},
],
Expand Down