Feature/dashboard translations#24328

Merged

pavel06081991 merged 28 commits intoelastic:masterfrom

pavel06081991:feature/dashboard-translations

Nov 20, 2018

Contributor

pavel06081991 commented Oct 22, 2018 •

edited by maryia-lapata

Loading

dashboard translations

Fixes: #22648

pavel06081991 added 3 commits

September 19, 2018 16:50


          add dashboard translations

9e2f05f


          Merge branch 'master' into feature/dashboard-translations

b65254a


          refactoring

363f1d1

pavel06081991 added the blocked label

pavel06081991 requested a review from maryia-lapata

October 22, 2018 12:13

Contributor Author

pavel06081991 commented Oct 22, 2018

blocked by #23684

Contributor

elasticmachine commented Oct 22, 2018

💔 Build Failed

continuous-integration/kibana-ci/pull-request

maryia-lapata added Project:i18n v6.6.0 labels

Contributor Author

pavel06081991 commented Oct 24, 2018

retest

Contributor

elasticmachine commented Oct 24, 2018

💔 Build Failed

continuous-integration/kibana-ci/pull-request

maryia-lapata reviewed

View reviewed changes

src/core_plugins/kibana/public/dashboard/dashboard_app.js Outdated

+                          ),
                           defaultFocusedButton: ConfirmationButtonTypes.CANCEL,
-                          title: 'Discard changes to dashboard?'
+                          title: i18n('kbn.dashboard.app.changeViewModeConfirmModal.title',

Contributor

maryia-lapata Oct 24, 2018

Maybe .title -> .discardChangesTitle?

maryia-lapata reviewed

View reviewed changes

src/core_plugins/kibana/public/dashboard/dashboard_app.js Outdated

                       confirmModal(
-                        `Once you discard your changes, there's no getting them back.`,
+                        i18n('kbn.dashboard.app.changeViewModeConfirmModal.description',

Contributor

maryia-lapata Oct 24, 2018

Maybe .description -> .discardChangesDescription?

maryia-lapata reviewed

View reviewed changes

src/core_plugins/kibana/public/dashboard/dashboard_strings.js Outdated

-                const displayTitle = `${title}${unsavedSuffix}`;
-                return isEditMode ? 'Editing ' + displayTitle : displayTitle;
+                if (isEditMode && isDirty && isEditMode) {

Contributor

maryia-lapata Oct 24, 2018

Duplication of isEditMode in this condition.
I think it can be

if (isEditMode && isDirty) {
    displayTitle = i18n.translate('kbn.dashboard.strings.dashboardUnsavedEditTitle', {
      defaultMessage: 'Editing {title} (unsaved)',
      title,
    });
  } else if (isEditMode) {
      displayTitle = i18n.translate('kbn.dashboard.strings.dashboardEditTitle', {
        defaultMessage: 'Editing {title}',
        title,
      });
  } else {
    displayTitle = title;
  }

maryia-lapata reviewed

View reviewed changes

src/core_plugins/kibana/public/dashboard/grid/dashboard_grid.js Outdated



		export class DashboardGrid extends React.Component {
		export class DashboardGridUi extends React.Component {

Contributor

maryia-lapata Oct 24, 2018

Please remove export.

maryia-lapata reviewed

View reviewed changes

src/core_plugins/kibana/public/dashboard/grid/dashboard_grid.js Outdated



		export class DashboardGrid extends React.Component {
		export class DashboardGridUi extends React.Component {

Contributor

maryia-lapata Oct 24, 2018

Please remove export.

maryia-lapata reviewed

View reviewed changes

src/core_plugins/kibana/public/dashboard/index.js Outdated

                   id: 'dashboard',
-                  title: 'Dashboard',
-                  description: 'Display and share a collection of visualizations and saved searches.',
+                  title: i18n.translate('kbn.dashboard.featureCatalogue.dashboard.title', {

Contributor

maryia-lapata Oct 24, 2018

kbn.dashboard.featureCatalogue.dashboard.title -> kbn.dashboard.featureCatalogue.dashboardTitle

maryia-lapata reviewed

View reviewed changes

src/core_plugins/kibana/public/dashboard/index.js Outdated

+                  title: i18n.translate('kbn.dashboard.featureCatalogue.dashboard.title', {
+                    defaultMessage: 'Dashboard',
+                  }),
+                  description: i18n.translate('kbn.dashboard.featureCatalogue.dashboard.description', {

Contributor

maryia-lapata Oct 24, 2018

-> .dashboardDescription

maryia-lapata reviewed

View reviewed changes

src/core_plugins/kibana/public/dashboard/listing/dashboard_listing.js Outdated

                     <EuiOverlayMask>
                       <EuiConfirmModal
-                        title="Delete selected dashboards?"
+                        title={this.props.intl.formatMessage('kbn.dashboard.listing.deleteSelectedDashboardsConfirmModal.title', {

Contributor

maryia-lapata Oct 24, 2018

I believe it's worth to create a variable for this.props.intl.

maryia-lapata reviewed

View reviewed changes

src/core_plugins/kibana/public/dashboard/listing/dashboard_listing.js Outdated

                       <React.Fragment>
                         <EuiCallOut
-                          title="Listing limit exceeded"
+                          title={this.props.intl.formatMessage('kbn.dashboard.listing.listingLimitExceeded.title', {

Contributor

maryia-lapata Oct 24, 2018

the same as above

maryia-lapata reviewed

View reviewed changes

src/core_plugins/kibana/public/dashboard/listing/dashboard_listing.js Outdated

-                            but your <strong>listingLimit</strong> setting prevents the table below from displaying more than {this.props.listingLimit}.
-                            You can change this setting under <EuiLink href="#/management/kibana/settings">Advanced Settings</EuiLink>.
+                            {this.props.intl.formatMessage('kbn.dashboard.listing.listingLimitExceeded.description', {
+                              defaultMessage: 'You have {totalDashboards} dashboards, \

Contributor

maryia-lapata Oct 24, 2018

Please do not use \, because browsers behave different with multiline javascript strings by using \.
Moreover in jsx it's necessary to use \ for multiline string in template. This should work:

defaultMessage: 'You have {totalDashboards} dashboards, but your {listingLimitText} setting prevents the table below from displaying more than {listingLimitValue}. You can change this setting under {advancedSettingsLink}.'

maryia-lapata reviewed

View reviewed changes

src/core_plugins/kibana/public/dashboard/listing/dashboard_listing.js Outdated

@@ @@ -304,7 +375,9 @@ export class DashboardListing extends React.Component { @@
                       <EuiFlexItem grow={true}>
                         <EuiFieldSearch
                           aria-label="Filter dashboards"

Contributor

maryia-lapata Oct 24, 2018

This aria-label should be translated as well.

maryia-lapata reviewed

View reviewed changes

src/core_plugins/kibana/public/dashboard/listing/dashboard_listing.js Outdated

                         <EuiFieldSearch
                           aria-label="Filter dashboards"
-                          placeholder="Search..."
+                          placeholder={this.props.intl.formatMessage('kbn.dashboard.listing.searchBar.searchField.placeholder', {

Contributor

maryia-lapata Oct 24, 2018

-> .searchFieldPlaceholder

maryia-lapata reviewed

View reviewed changes

src/core_plugins/kibana/public/dashboard/listing/dashboard_listing.js Outdated

                           aria-label="Filter dashboards"
-                          placeholder="Search..."
+                          placeholder={this.props.intl.formatMessage('kbn.dashboard.listing.searchBar.searchField.placeholder', {
+                            defaultMessage: 'Search...',

Contributor

maryia-lapata Oct 24, 2018

Please use … instead of three dots.

maryia-lapata reviewed

View reviewed changes

src/core_plugins/kibana/public/dashboard/listing/dashboard_listing.js Outdated

                     {
                       field: 'title',
-                      name: 'Title',
+                      name: this.props.intl.formatMessage('kbn.dashboard.listing.table.titleColumn.title', {

Contributor

maryia-lapata Oct 24, 2018

-> .titleColumnTitle
and please fix the same in ids below

maryia-lapata reviewed

View reviewed changes

src/core_plugins/kibana/public/dashboard/panel/dashboard_panel.js Outdated

-                      {!this.props.initialized && 'loading...'}
+                      {!this.props.initialized && <FormattedMessage
+                        id="kbn.dashboard.panel.ebmeddableViewport.loadingLabel"
+                        defaultMessage="loading..."

Contributor

maryia-lapata Oct 24, 2018

Please use … instead of three dots.

maryia-lapata reviewed

View reviewed changes

src/core_plugins/kibana/public/dashboard/panel/panel_header/panel_options_menu.tsx Outdated

                     className={isViewMode && !isPopoverOpen ? 'dshPanel_optionsMenuButton' : ''}
-                    aria-label="Panel options"
+                    aria-label={intl.formatMessage({
+                      id: 'kbn.dashboard.panel.optionsMenu.panelOptionsButton.ariaLabel',

Contributor

maryia-lapata Oct 24, 2018

-> .panelOptionsButtonAriaLabel

maryia-lapata reviewed

View reviewed changes

src/core_plugins/kibana/public/dashboard/panel/panel_header/panel_options_menu_form.tsx Outdated

                         onKeyDown={onKeyDown}
-                        aria-label="Changes to this input are applied immediately. Press enter to exit."
+                        aria-label={intl.formatMessage({
+                          id: 'kbn.dashboard.panel.optionsMenuForm.titleInput.ariaLabel',

Contributor

maryia-lapata Oct 24, 2018

-> .panelTitleInputAriaLabel

maryia-lapata reviewed

View reviewed changes

src/core_plugins/kibana/public/dashboard/panel/panel_utils.js Outdated

                   if (versionSplit.length < 3) {
-                    throw new Error(`Invalid version, ${version}, expected <major>.<minor>.<patch>`);
+                    throw new Error(i18n.translate('kbn.dashboard.panel.invalidVersionErrorMessage', {
+                      defaultMessage: 'Invalid version, {version}, expected <major>.<minor>.<patch>',

Contributor

maryia-lapata Oct 24, 2018

I would put <major>.<minor>.<patch> in values.

maryia-lapata reviewed

View reviewed changes

src/core_plugins/kibana/public/dashboard/top_nav/add_panel.js Outdated

                   this.lastToast = toastNotifications.addSuccess({
-                    title: `${this.state.selectedTab.name} was added to your dashboard`,
+                    title: this.props.intl.formatMessage({
+                      id: 'kbn.dashboard.topNav.addPanel.toastNotifications.selectedTadAddedToDashboardSuccessMessageTitle',

Contributor

maryia-lapata Oct 24, 2018

typo -> .selectedTabAddedToDashboardSuccessMessageTitle

Contributor

elasticmachine commented Nov 6, 2018

💔 Build Failed

continuous-integration/kibana-ci/pull-request

maryia-lapata and others added 2 commits

November 8, 2018 17:36


          Update snapshots

e4ff280


          use enzyme helpers for react-intl components

3ea2234

Contributor

elasticmachine commented Nov 8, 2018

💔 Build Failed

continuous-integration/kibana-ci/pull-request


          Merge branch 'master' into feature/dashboard-translations

fe93462

Contributor

elasticmachine commented Nov 9, 2018

💔 Build Failed

continuous-integration/kibana-ci/pull-request

Member

tsullivan commented Nov 12, 2018

Check the elastic+kibana+pull-request+multijob-intake logs. It looks like there are multiple failures caused by the changes in this PR

Error: Uncaught [Invariant Violation: [React Intl] Could not find required `intl` object. <IntlProvider> needs to exist in the component ancestry.]

This functional test failure also looks like it could be related:

09:09:31    ? debg randomness seed: 1541754571191
09:09:31    ? info Starting tests
09:09:31    ? warn debug logs are being captured, only error logs will be written to the console
09:09:31    ?
09:09:31      ?-: phantom
09:09:31        ?-> "before all" hook
09:09:31        ?-> "before all" hook
09:09:52        ?-: BWC report generation into existing indexes
09:09:52          ?-> "before all" hook
09:09:52          ?-: existing 6_2 index
09:09:52            ?-> "before all" hook
09:09:52            ?-> "before all" hook: load data and add index alias
09:09:54            ?-> multiple jobs posted
09:09:54              ?-> "before each" hook: global before each
09:16:05              ?- ? fail: "phantom BWC report generation into existing indexes existing 6_2 index multiple jobs posted"
09:16:05              ?      Error: expected 500 to equal 200
09:16:05              ?       at Assertion.assert (node_modules/expect.js/index.js:96:13)
09:16:05              ?       at Assertion.be.Assertion.equal (node_modules/expect.js/index.js:216:10)
09:16:05              ?       at Assertion.(anonymous function) [as be] (node_modules/expect.js/index.js:69:24)
09:16:05              ?       at Object.waitForJobToFinish (test/reporting/services/reporting_api.js:39:29)
09:16:05              ?       at <anonymous>
09:16:05              ? 
09:16:05              ?

Contributor

maryia-lapata commented Nov 13, 2018

@tsullivan yes, this is because old phantom browser (Safari 7) doesn't support Internationalization API. We are working on this issue #25465.

Contributor

maryia-lapata commented Nov 13, 2018

Blocked by #25465.

maryia-lapata added 2 commits

November 13, 2018 11:26


          Merge branch 'master' into feature/dashboard-translations

4e0f97b


          Update unit tests

8ced6ff

Contributor

elasticmachine commented Nov 13, 2018

💔 Build Failed

continuous-integration/kibana-ci/pull-request


          Merge branch 'master' into feature/dashboard-translations

f3b1457

Contributor

elasticmachine commented Nov 16, 2018

💚 Build Succeeded

continuous-integration/kibana-ci/pull-request


          Translate topNavMenu

d5c02d4

LeanidShutau added the review label

Contributor

elasticmachine commented Nov 16, 2018

💔 Build Failed

continuous-integration/kibana-ci/pull-request

pavel06081991 added 2 commits

November 19, 2018 11:18


          Merge branch 'master' into feature/dashboard-translations

9b7eae0


          fix duplicated id

e806dd6

Contributor

elasticmachine commented Nov 19, 2018

💚 Build Succeeded

continuous-integration/kibana-ci/pull-request

tsullivan approved these changes

View reviewed changes

Member

tsullivan left a comment

LGTM

pavel06081991 merged commit 7baea1d into elastic:master

pavel06081991 deleted the feature/dashboard-translations branch

November 20, 2018 07:19

pavel06081991 mentioned this pull request

[6.x] Feature/dashboard translations (#24328) #25917

Merged

pavel06081991 added a commit to pavel06081991/kibana that referenced this pull request


          Feature/dashboard translations (elastic#24328)

add dashboard translations

pavel06081991 added a commit that referenced this pull request


          Feature/dashboard translations (#24328) (#25917)

e96f58d

add dashboard translations

maryia-lapata added backported and removed review labels

Contributor

elasticmachine commented Dec 21, 2018

💔 Build Failed

continuous-integration/kibana-ci/pull-request

Nox911 mentioned this pull request

[i18n] Dashboard Revert redundant translation #28925

Merged

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

backported Project:i18n Team:Visualizations v6.6.0