Przeglądaj źródła

HUE-6616 [home] Use global document type translations throughout

Johan Ahlen 8 lat temu
rodzic
commit
87d8858ee1

+ 2 - 9
desktop/core/src/desktop/templates/assist.mako

@@ -1115,7 +1115,6 @@ from notebook.conf import get_ordered_interpreters
        * @param {Object} options
        * @param {ApiHelper} options.apiHelper
        * @param {string} options.user
-       * @param {Object} options.i18n
        * @constructor
        **/
       function AssistDocumentsPanel (options) {
@@ -1462,12 +1461,7 @@ from notebook.conf import get_ordered_interpreters
         var self = this;
         var i18n = {
           errorLoadingDatabases: "${ _('There was a problem loading the databases') }",
-          errorLoadingTablePreview: "${ _('There was a problem loading the table preview.') }",
-          documentTypes: {
-            'query-hive': "${ _('Hive Query') }",
-            'query': "${ _('Query') }",
-            'notebook': "${ _('Notebook') }"
-          }
+          errorLoadingTablePreview: "${ _('There was a problem loading the table preview.') }"
         };
 
         self.apiHelper = ApiHelper.getInstance();
@@ -1571,8 +1565,7 @@ from notebook.conf import get_ordered_interpreters
               panels.push(new AssistInnerPanel({
                 panelData: new AssistDocumentsPanel({
                   user: params.user,
-                  apiHelper: self.apiHelper,
-                  i18n: i18n
+                  apiHelper: self.apiHelper
                 }),
                 apiHelper: self.apiHelper,
                 name: '${ _("Documents") }',

+ 16 - 8
desktop/core/src/desktop/templates/common_header_footer_components.mako

@@ -71,15 +71,23 @@ from metadata.conf import has_optimizer, OPTIMIZER
 
     DocumentTypeGlobals = {
       'all': '${_('All')}',
-      'link-pigscript': '${_('Pig')}',
-      'link-workflow': '${_('Workflow')}',
+      'directory': '${ _('Directory') }',
+      'link-pigscript': '${_('Pig Script')}',
+      'link-workflow': '${_('Job Design')}',
       'notebook': '${_('Notebook')}',
-      'oozie-bundle2': '${_('Bundle')}',
-      'oozie-coordinator2': '${_('Coordinator')}',
-      'oozie-workflow2': '${_('Workflow')}',
-      'query-hive': '${_('Hive')}',
-      'query-impala': '${_('Impala')}',
-      'search-dashboard': '${_('Dashboard')}'
+      'oozie-bundle2': '${_('Oozie Bundle')}',
+      'oozie-coordinator2': '${_('Oozie Coordinator')}',
+      'oozie-workflow2': '${_('Oozie Workflow')}',
+      'query-hive': '${_('Hive Query')}',
+      'query-impala': '${_('Impala Query')}',
+      'search-dashboard': '${_('Search Dashboard')}',
+      'query-mapreduce': '${_('MapReduce Job')}',
+      'query-sqoop1': '${_('Import Job')}',
+      'query-spark2': '${_('Spark Job')}',
+      'query-java': '${_('Java Job')}',
+      'query-pig': '${_('Pig Script')}',
+      'query-shell': '${_('Shell Script')}',
+      'query-distcp': '${_('DistCp Job')}',
     };
 
     // jHue plugins global configuration

+ 1 - 24
desktop/core/src/desktop/templates/document_browser.mako

@@ -487,30 +487,7 @@ from desktop.views import _ko
               <div class="doc-browser-attr-group">
                 <!-- ko with: definition -->
                 <div class="doc-browser-attr-col doc-browser-description" data-bind="text: description, attr: { 'title': description }"></div>
-                <div class="doc-browser-attr-col doc-browser-type">
-                  <!-- ko switch: type -->
-                  <!-- ko case: 'directory' -->${ _('Directory') }<!-- /ko -->
-                  <!-- ko case: 'link-pigscript' -->${ _('Pig Script') }<!-- /ko -->
-                  <!-- ko case: 'link-workflow' -->${ _('Job Design') }<!-- /ko -->
-                  <!-- ko case: 'notebook' -->${ _('Notebook') }<!-- /ko -->
-                  <!-- ko case: 'oozie-bundle2' -->${ _('Oozie Bundle') }<!-- /ko -->
-                  <!-- ko case: 'oozie-coordinator2' -->${ _('Oozie Coordinator') }<!-- /ko -->
-                  <!-- ko case: 'oozie-workflow2' -->${ _('Oozie Workflow') }<!-- /ko -->
-                  <!-- ko case: 'query-hive' -->${ _('Hive Query') }<!-- /ko -->
-                  <!-- ko case: 'query-impala' -->${ _('Impala Query') }<!-- /ko -->
-                  <!-- ko case: 'search-dashboard' -->${ _('Search Dashboard') }<!-- /ko -->
-                  <!-- ko case: 'query-mapreduce' -->${ _('MapReduce Job') }<!-- /ko -->
-                  <!-- ko case: 'query-sqoop1' -->${ _('Import Job') }<!-- /ko -->
-                  <!-- ko case: 'query-spark2' -->${ _('Spark Job') }<!-- /ko -->
-                  <!-- ko case: 'query-java' -->${ _('Java Job') }<!-- /ko -->
-                  <!-- ko case: 'query-pig' -->${ _('Pig Script') }<!-- /ko -->
-                  <!-- ko case: 'query-shell' -->${ _('Shell Script') }<!-- /ko -->
-                  <!-- ko case: 'query-distcp' -->${ _('DistCp Job') }<!-- /ko -->
-                  <!-- ko case: $default -->
-                  <!-- ko text: $value --><!-- /ko -->
-                  <!-- /ko -->
-                  <!-- /ko -->
-                </div>
+                <div class="doc-browser-attr-col doc-browser-type" data-bind="text: DocumentTypeGlobals[type] || type"></div>
                 <div class="doc-browser-attr-col doc-browser-owner" data-bind="text: owner, attr: { 'title': owner }"></div>
                 <div class="doc-browser-attr-col doc-browser-modified" data-bind="text: localeFormat(last_modified)"></div>
                 <!-- /ko -->