Skip to content

Commit

Permalink
Fix some strings after translator feedback (elastic#32501) (elastic#3…
Browse files Browse the repository at this point in the history
…2549)

* Fix some strings after translator feedback

* Fix jest tests

* Fix typo

* Fix Mocha tests

* Fix more mocha tests
  • Loading branch information
timroes authored Mar 6, 2019
1 parent efb6a8d commit 9807bea
Show file tree
Hide file tree
Showing 17 changed files with 28 additions and 59 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ exports[`renders OptionsTab 1`] = `
data-test-subj="inputControlEditorPinFiltersCheckbox"
label={
<FormattedMessage
defaultMessage="Pin filters to global state"
defaultMessage="Pin filters for all applications"
id="inputControl.editor.optionsTab.pinFiltersLabel"
values={Object {}}
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -86,7 +86,7 @@ export class OptionsTab extends Component {
<EuiSwitch
label={<FormattedMessage
id="inputControl.editor.optionsTab.pinFiltersLabel"
defaultMessage="Pin filters to global state"
defaultMessage="Pin filters for all applications"
/>}
checked={this.props.editorState.params.pinFilters}
onChange={this.handlePinFilters}
Expand Down
18 changes: 0 additions & 18 deletions src/legacy/core_plugins/kibana/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -69,9 +69,6 @@ export default function (kibana) {
id: 'kibana',
title: 'Kibana',
listed: false,
description: i18n.translate('kbn.kibanaDescription', {
defaultMessage: 'the kibana you know and love'
}),
main: 'plugins/kibana/kibana',
},
styleSheetPaths: resolve(__dirname, 'public/index.scss'),
Expand All @@ -83,9 +80,6 @@ export default function (kibana) {
}),
order: -1003,
url: `${kbnBaseUrl}#/discover`,
description: i18n.translate('kbn.discoverDescription', {
defaultMessage: 'interactively explore your data'
}),
icon: 'plugins/kibana/assets/discover.svg',
euiIconType: 'discoverApp',
}, {
Expand All @@ -95,9 +89,6 @@ export default function (kibana) {
}),
order: -1002,
url: `${kbnBaseUrl}#/visualize`,
description: i18n.translate('kbn.visualizeDescription', {
defaultMessage: 'design data visualizations'
}),
icon: 'plugins/kibana/assets/visualize.svg',
euiIconType: 'visualizeApp',
}, {
Expand All @@ -113,9 +104,6 @@ export default function (kibana) {
// the url above in order to preserve the original url for BWC. The subUrlBase helps the Chrome api nav
// to determine what url to use for the app link.
subUrlBase: `${kbnBaseUrl}#/dashboard`,
description: i18n.translate('kbn.dashboardDescription', {
defaultMessage: 'compose visualizations for much win'
}),
icon: 'plugins/kibana/assets/dashboard.svg',
euiIconType: 'dashboardApp',
}, {
Expand All @@ -125,9 +113,6 @@ export default function (kibana) {
}),
order: 9001,
url: '/app/kibana#/dev_tools',
description: i18n.translate('kbn.devToolsDescription', {
defaultMessage: 'development tools'
}),
icon: 'plugins/kibana/assets/wrench.svg',
euiIconType: 'devToolsApp',
}, {
Expand All @@ -137,9 +122,6 @@ export default function (kibana) {
}),
order: 9003,
url: `${kbnBaseUrl}#/management`,
description: i18n.translate('kbn.managementDescription', {
defaultMessage: 'define index patterns, change config, and more'
}),
icon: 'plugins/kibana/assets/settings.svg',
euiIconType: 'managementApp',
linkToLastSubUrl: false
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ class DashboardPanelUi extends React.Component<DashboardPanelUiProps, State> {
? null
: props.intl.formatMessage({
id: 'kbn.dashboard.panel.noEmbeddableFactoryErrorMessage',
defaultMessage: 'No factory found for embeddable',
defaultMessage: 'The feature to render this panel is missing.',
}),
};

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -136,6 +136,7 @@
for="outlineWeight"
i18n-id="regionMap.visParams.outlineWeightLabel"
i18n-default-message="Outline weight"
i18n-description="Describes the width of a line surrounding a country on a map."
></label>
<div class="visEditorSidebar__formControl">
<input
Expand Down
3 changes: 0 additions & 3 deletions src/legacy/core_plugins/timelion/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,6 @@ export default function (kibana) {
app: {
title: 'Timelion',
order: -1000,
description: i18n.translate('timelion.appDescription', {
defaultMessage: 'Time series expressions for everything'
}),
icon: 'plugins/timelion/icon.svg',
euiIconType: 'timelionApp',
main: 'plugins/timelion/app',
Expand Down
8 changes: 5 additions & 3 deletions src/legacy/ui/public/agg_types/buckets/terms.js
Original file line number Diff line number Diff line change
Expand Up @@ -41,9 +41,8 @@ const orderAggSchema = (new Schemas([
{
group: 'none',
name: 'orderAgg',
title: i18n.translate('common.ui.aggTypes.buckets.terms.orderAggTitle', {
defaultMessage: 'Order Agg',
}),
// This string is never visible to the user so it doesn't need to be translated
title: 'Order Agg',
hideCustomLabel: true,
aggFilter: aggFilter
}
Expand Down Expand Up @@ -304,6 +303,9 @@ export const termsBucketAgg = new BucketAggType({
name: 'missingBucketLabel',
default: i18n.translate('common.ui.aggTypes.buckets.terms.missingBucketLabel', {
defaultMessage: 'Missing',
description: `Default label used inside of charts for documents missing a specific field.
Can be seen when creating a chart with a terms aggregation and select the "Show missing values"
checkbox.`
}),
write: _.noop
},
Expand Down
2 changes: 2 additions & 0 deletions src/legacy/ui/public/agg_types/controls/date_ranges.html
Original file line number Diff line number Diff line change
Expand Up @@ -6,13 +6,15 @@
id="visEditorDateRangeFrom{{agg.id}}"
i18n-id="common.ui.aggTypes.dateRanges.fromColumnLabel"
i18n-default-message="From"
i18n-description="Describes the beginning of a date range, e.g. *From* 2018-02-26 To 2018-02-28"
></label>
</th>
<th scope="col" colspan="2">
<label
id="visEditorDateRangeTo{{agg.id}}"
i18n-id="common.ui.aggTypes.dateRanges.toColumnLabel"
i18n-default-message="To"
i18n-description="Describes the end of a date range, e.g. From 2018-02-26 *To* 2018-02-28"
></label>
</th>
</tr>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -9,6 +9,7 @@ exports[`ScriptingDisabledCallOut should render normally 1`] = `
title={
<FormattedMessage
defaultMessage="Scripting disabled"
description="Showing the status that scripting is disabled in Elasticsearch. Not an update message, that it JUST got disabled."
id="common.ui.fieldEditor.disabledCallOutHeader"
values={Object {}}
/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,13 @@ export const ScriptingDisabledCallOut = ({
return isVisible ? (
<Fragment>
<EuiCallOut
title={<FormattedMessage id="common.ui.fieldEditor.disabledCallOutHeader" defaultMessage="Scripting disabled" />}
title={
<FormattedMessage
id="common.ui.fieldEditor.disabledCallOutHeader"
defaultMessage="Scripting disabled"
description="Showing the status that scripting is disabled in Elasticsearch. Not an update message, that it JUST got disabled."
/>
}
color="danger"
iconType="alert"
>
Expand Down
9 changes: 8 additions & 1 deletion src/legacy/ui/public/field_editor/field_editor.js
Original file line number Diff line number Diff line change
Expand Up @@ -387,7 +387,14 @@ export class FieldEditorComponent extends PureComponent {
const { intl } = this.props;

return (
<EuiFormRow label={intl.formatMessage({ id: 'common.ui.fieldEditor.popularityLabel', defaultMessage: 'Popularity' })}>
<EuiFormRow label={
intl.formatMessage({
id: 'common.ui.fieldEditor.popularityLabel',
defaultMessage: 'Popularity',
description: '"Popularity" refers to Kibana\'s measurement how popular a field is (i.e. how commonly it is used).',
})
}
>
<EuiFieldNumber
value={field.count}
data-test-subj="editorFieldCount"
Expand Down
3 changes: 0 additions & 3 deletions src/legacy/ui/ui_apps/__tests__/ui_app.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ function createStubUiAppSpec(extraParams) {
main: 'main.js',
title: 'UIApp Test',
order: 9000,
description: 'Test of UI App Constructor',
icon: 'ui_app_test.svg',
linkToLastSubUrl: true,
hidden: false,
Expand Down Expand Up @@ -139,7 +138,6 @@ describe('ui apps / UiApp', () => {
expect(JSON.parse(JSON.stringify(app))).to.eql({
id: spec.id,
title: spec.title,
description: spec.description,
icon: spec.icon,
main: spec.main,
linkToLastSubUrl: spec.linkToLastSubUrl,
Expand All @@ -149,7 +147,6 @@ describe('ui apps / UiApp', () => {
order: 9000,
url: '/app/uiapp-test',
subUrlBase: '/app/uiapp-test',
description: 'Test of UI App Constructor',
icon: 'ui_app_test.svg',
linkToLastSubUrl: true,
hidden: false,
Expand Down
4 changes: 0 additions & 4 deletions src/legacy/ui/ui_apps/ui_app.js
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ export class UiApp {
main,
title,
order = 0,
description,
icon,
euiIconType,
hidden,
Expand All @@ -44,7 +43,6 @@ export class UiApp {
this._main = main;
this._title = title;
this._order = order;
this._description = description;
this._icon = icon;
this._euiIconType = euiIconType;
this._linkToLastSubUrl = linkToLastSubUrl;
Expand All @@ -66,7 +64,6 @@ export class UiApp {
id: this._id,
title: this._title,
order: this._order,
description: this._description,
icon: this._icon,
euiIconType: this._euiIconType,
url: this._url,
Expand Down Expand Up @@ -118,7 +115,6 @@ export class UiApp {
return {
id: this._id,
title: this._title,
description: this._description,
icon: this._icon,
euiIconType: this._euiIconType,
main: this._main,
Expand Down
8 changes: 0 additions & 8 deletions src/legacy/ui/ui_nav_links/__tests__/ui_nav_link.js
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ describe('UiNavLink', () => {
title: 'Discover',
order: -1003,
url: '/app/kibana#/discover',
description: 'interactively explore your data',
icon: 'plugins/kibana/assets/discover.svg',
euiIconType: 'discoverApp',
hidden: true,
Expand All @@ -43,7 +42,6 @@ describe('UiNavLink', () => {
order: spec.order,
url: spec.url,
subUrlBase: spec.url,
description: spec.description,
icon: spec.icon,
euiIconType: spec.euiIconType,
hidden: spec.hidden,
Expand All @@ -60,7 +58,6 @@ describe('UiNavLink', () => {
id: 'kibana:discover',
title: 'Discover',
url: '/app/kibana#/discover',
description: 'interactively explore your data',
icon: 'plugins/kibana/assets/discover.svg',
};
const link = new UiNavLink(spec);
Expand All @@ -74,7 +71,6 @@ describe('UiNavLink', () => {
title: 'Discover',
order: -1003,
url: '/app/kibana#/discover',
description: 'interactively explore your data',
icon: 'plugins/kibana/assets/discover.svg',
linkToLastSubUrl: false
};
Expand All @@ -89,7 +85,6 @@ describe('UiNavLink', () => {
title: 'Discover',
order: -1003,
url: '/app/kibana#/discover',
description: 'interactively explore your data',
icon: 'plugins/kibana/assets/discover.svg',
};
const link = new UiNavLink(spec);
Expand All @@ -103,7 +98,6 @@ describe('UiNavLink', () => {
title: 'Discover',
order: -1003,
url: '/app/kibana#/discover',
description: 'interactively explore your data',
icon: 'plugins/kibana/assets/discover.svg',
};
const link = new UiNavLink(spec);
Expand All @@ -117,7 +111,6 @@ describe('UiNavLink', () => {
title: 'Discover',
order: -1003,
url: '/app/kibana#/discover',
description: 'interactively explore your data',
icon: 'plugins/kibana/assets/discover.svg',
};
const link = new UiNavLink(spec);
Expand All @@ -131,7 +124,6 @@ describe('UiNavLink', () => {
title: 'Discover',
order: -1003,
url: '/app/kibana#/discover',
description: 'interactively explore your data',
icon: 'plugins/kibana/assets/discover.svg',
};
const link = new UiNavLink(spec);
Expand Down
3 changes: 0 additions & 3 deletions src/legacy/ui/ui_nav_links/ui_nav_link.js
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ export class UiNavLink {
order = 0,
url,
subUrlBase,
description,
icon,
euiIconType,
linkToLastSubUrl = true,
Expand All @@ -39,7 +38,6 @@ export class UiNavLink {
this._order = order;
this._url = url;
this._subUrlBase = subUrlBase || url;
this._description = description;
this._icon = icon;
this._euiIconType = euiIconType;
this._linkToLastSubUrl = linkToLastSubUrl;
Expand All @@ -59,7 +57,6 @@ export class UiNavLink {
order: this._order,
url: this._url,
subUrlBase: this._subUrlBase,
description: this._description,
icon: this._icon,
euiIconType: this._euiIconType,
linkToLastSubUrl: this._linkToLastSubUrl,
Expand Down
1 change: 0 additions & 1 deletion x-pack/plugins/graph/index.js
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ export function graph(kibana) {
order: 9000,
icon: 'plugins/graph/icon.png',
euiIconType: 'graphApp',
description: 'Graph exploration',
main: 'plugins/graph/app',
},
styleSheetPaths: resolve(__dirname, 'public/index.scss'),
Expand Down
Loading

0 comments on commit 9807bea

Please sign in to comment.