fix i18n stuff

elastic · Mar 4, 2019 · e1f891f · e1f891f
1 parent 6a30689
commit e1f891f
Show file tree

Hide file tree

Showing 6 changed files with 25 additions and 12 deletions.
diff --git a/src/legacy/core_plugins/kibana/public/dashboard/top_nav/add_panel.js b/src/legacy/core_plugins/kibana/public/dashboard/top_nav/add_panel.js
@@ -48,11 +48,11 @@ export class DashboardAddPanel extends React.Component {
         {
           defaultMessage: '{savedObjectName} was added to your dashboard',
           values: {
-            selectedTabName: name,
+            savedObjectName: name,
           },
         }
       ),
-      'data-test-subj': this.state.selectedTab.toastDataTestSubj,
+      'data-test-subj': 'addObjectToDashboardSuccess',
     });
   };
 

diff --git a/src/legacy/core_plugins/kibana/public/discover/embeddable/search_embeddable_factory.ts b/src/legacy/core_plugins/kibana/public/discover/embeddable/search_embeddable_factory.ts
@@ -19,6 +19,7 @@
 
 import 'ui/doc_table';
 
+import { i18n } from '@kbn/i18n';
 import { EmbeddableFactory } from 'ui/embeddable';
 import {
   EmbeddableInstanceConfiguration,
@@ -36,7 +37,9 @@ export class SearchEmbeddableFactory extends EmbeddableFactory {
     super({
       name: 'search',
       savedObjectMetaData: {
-        name: 'Search',
+        name: i18n.translate('kbn.discover.savedSearch.savedObjectName', {
+          defaultMessage: 'Saved Search',
+        }),
         type: 'search',
         getIconForSavedObject: () => 'search',
         showSavedObject: () => true,

diff --git a/src/legacy/core_plugins/kibana/public/visualize/embeddable/visualize_embeddable_factory.ts b/src/legacy/core_plugins/kibana/public/visualize/embeddable/visualize_embeddable_factory.ts
@@ -17,6 +17,7 @@
  * under the License.
  */
 
+import { i18n } from '@kbn/i18n';
 import chrome from 'ui/chrome';
 import { EmbeddableFactory } from 'ui/embeddable';
 import { getVisualizeLoader } from 'ui/visualize/loader';
@@ -45,7 +46,7 @@ export class VisualizeEmbeddableFactory extends EmbeddableFactory<VisualizationA
     super({
       name: 'visualization',
       savedObjectMetaData: {
-        name: 'Visualization',
+        name: i18n.translate('kbn.visualize.savedObjectName', { defaultMessage: 'Visualization' }),
         type: 'visualization',
         getIconForSavedObject: savedObject => {
           return (

diff --git a/src/legacy/core_plugins/kibana/public/visualize/wizard/search_selection/search_selection.tsx b/src/legacy/core_plugins/kibana/public/visualize/wizard/search_selection/search_selection.tsx
@@ -66,13 +66,23 @@ export class SearchSelection extends React.Component<SearchSelectionProps> {
                 type: 'search',
                 showSavedObject: () => true,
                 getIconForSavedObject: () => 'search',
-                name: 'Search',
+                name: i18n.translate(
+                  'kbn.visualize.newVisWizard.searchSelection.savedObjectType.search',
+                  {
+                    defaultMessage: 'Saved Search',
+                  }
+                ),
               },
               {
                 type: 'index-pattern',
                 showSavedObject: () => true,
                 getIconForSavedObject: () => 'indexPatternApp',
-                name: 'Index Pattern',
+                name: i18n.translate(
+                  'kbn.visualize.newVisWizard.searchSelection.savedObjectType.indexPattern',
+                  {
+                    defaultMessage: 'Index Pattern',
+                  }
+                ),
               },
             ]}
             fixedPageSize={this.fixedPageSize}

diff --git a/src/legacy/ui/public/saved_objects/components/saved_object_finder.tsx b/src/legacy/ui/public/saved_objects/components/saved_object_finder.tsx
@@ -431,6 +431,7 @@ class SavedObjectFinder extends React.Component<SavedObjectFinderProps, SavedObj
               const currentSavedObjectMetaData = savedObjectMetaData.find(
                 metaData => metaData.type === item.type
               );
+              const fullName = `${item.title} (${currentSavedObjectMetaData!.name})`;
               const iconType = (
                 currentSavedObjectMetaData ||
                 ({
@@ -445,14 +446,11 @@ class SavedObjectFinder extends React.Component<SavedObjectFinderProps, SavedObj
                   onClick={
                     onChoose
                       ? () => {
-                          onChoose(
-                            item.id,
-                            item.type,
-                            currentSavedObjectMetaData ? currentSavedObjectMetaData.name : ''
-                          );
+                          onChoose(item.id, item.type, fullName);
                         }
                       : undefined
                   }
+                  title={fullName}
                   data-test-subj={`savedObjectTitle${(item.title || '').split(' ').join('-')}`}
                 />
               );

diff --git a/test/functional/services/dashboard/add_panel.js b/test/functional/services/dashboard/add_panel.js
@@ -151,7 +151,7 @@ export function DashboardAddPanelProvider({ getService, getPageObjects }) {
       await this.filterEmbeddableNames(searchName);
 
       await testSubjects.click(`savedObjectTitle${searchName.split(' ').join('-')}`);
-      await testSubjects.exists('addSavedSearchToDashboardSuccess');
+      await testSubjects.exists('addObjectToDashboardSuccess');
       await this.closeAddPanel();
     }
 
@@ -174,6 +174,7 @@ export function DashboardAddPanelProvider({ getService, getPageObjects }) {
       await this.toggleFilter('visualization');
       await this.filterEmbeddableNames(`"${vizName.replace('-', ' ')}"`);
       await testSubjects.click(`savedObjectTitle${vizName.split(' ').join('-')}`);
+      await testSubjects.exists('addObjectToDashboardSuccess');
       await this.closeAddPanel();
     }