Skip to content

Commit

Permalink
Sentence case copy changes (#43215)
Browse files Browse the repository at this point in the history
* Change casing for options and labels to be sentence case

* More sentence-case copy changes

* Fix min and max capitalization
  • Loading branch information
phillipb authored Aug 14, 2019
1 parent a892d58 commit b1fefc3
Show file tree
Hide file tree
Showing 8 changed files with 31 additions and 27 deletions.
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
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
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
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
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
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
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
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

0 comments on commit b1fefc3

Please sign in to comment.