Эх сурвалжийг харах

HUE-2546 [hive] Localized date format for Hive/Impala

Upgraded and unified moment.js with locales
Changed on recent queries, my queries, saved queries and history
Enrico Berti 10 жил өмнө
parent
commit
27b2788

+ 4 - 1
apps/beeswax/src/beeswax/templates/execute.mako

@@ -743,6 +743,7 @@ ${ commonshare() | n,unicode }
 
 <link href="/static/ext/css/bootstrap-editable.css" rel="stylesheet">
 <script src="/static/ext/js/bootstrap-editable.min.js"></script>
+<script src="/static/ext/js/moment-with-locales.min.js"></script>
 
 <style type="text/css">
   h1 {
@@ -1089,12 +1090,14 @@ $(document).ready(function () {
     $("#recentLoader").show();
     $("#recentQueries").hide();
     recentQueries.fnClearTable();
+    var locale = window.navigator.userLanguage || window.navigator.language;
+    moment.locale(locale);
     $.getJSON("${ url(app_name + ':list_query_history') }?format=json", function(data) {
       if (data && data.queries) {
         var _rows = [];
         $(data.queries).each(function(cnt, item){
           _rows.push([
-            '<span data-sort-value="' + item.timeInMs + '">' + item.timeFormatted + '</span>',
+            '<span data-sort-value="' + item.timeInMs + '">' + moment(item.timeInMs*1000).format("L LTS") + '</span>',
             '<code style="cursor:pointer">' + hue.htmlEncode(item.query) + '</code>',
             (item.resultsUrl != "" ? '<a href="' + item.resultsUrl + '" data-row-selector-exclude="true">${_('See results...')}</a>': ''),
             (item.designUrl != "" ? '<a href="' + item.designUrl + '" data-row-selector="true">&nbsp;</a>': '')

+ 8 - 1
apps/beeswax/src/beeswax/templates/list_designs.mako

@@ -110,7 +110,7 @@ ${ layout.menubar(section='saved queries') }
         % endif
         </td>
         <td>${ design.owner.username }</td>
-        <td data-sort-value="${time.mktime(design.mtime.timetuple())}">${ timesince(design.mtime) } ${ _('ago') }</td>
+        <td data-sort-value="${time.mktime(design.mtime.timetuple())}"></td>
       </tr>
       % endfor
     </tbody>
@@ -142,6 +142,7 @@ ${ layout.menubar(section='saved queries') }
 </div>
 
 <script src="/static/ext/js/knockout-min.js" type="text/javascript" charset="utf-8"></script>
+<script src="/static/ext/js/moment-with-locales.min.js"></script>
 
 <script type="text/javascript" charset="utf-8">
   $(document).ready(function () {
@@ -152,6 +153,12 @@ ${ layout.menubar(section='saved queries') }
 
     ko.applyBindings(viewModel);
 
+    var locale = window.navigator.userLanguage || window.navigator.language;
+    moment.locale(locale);
+    $("[data-sort-value]").each(function(){
+      $(this).text(moment($(this).attr("data-sort-value")*1000).format("L LTS"));
+    });
+
     var savedQueries = $(".datatables").dataTable({
       "sDom":"<'row'r>t<'row'<'span8'i><''p>>",
       "bPaginate":false,

+ 10 - 1
apps/beeswax/src/beeswax/templates/list_history.mako

@@ -125,7 +125,7 @@ ${ layout.menubar(section='history') }
             <tbody>
             % for query in page.object_list:
               <tr class="histRow">
-                <td data-sort-value="${time.mktime(query.submission_date.timetuple())}">${query.submission_date.strftime("%x %X")}</td>
+                <td data-sort-value="${time.mktime(query.submission_date.timetuple())}"></td>
                 <td>${show_saved_query(query.design, query)}</td>
                 <td>
                   % if len(query.query) > 100:
@@ -156,8 +156,17 @@ ${ layout.menubar(section='history') }
     </div>
 </div>
 
+<script src="/static/ext/js/moment-with-locales.min.js"></script>
+
 <script type="text/javascript" charset="utf-8">
   $(document).ready(function () {
+
+    var locale = window.navigator.userLanguage || window.navigator.language;
+    moment.locale(locale);
+    $("[data-sort-value]").each(function(){
+      $(this).text(moment($(this).attr("data-sort-value")*1000).format("L LTS"));
+    });
+
     $(".datatables").dataTable({
       "bPaginate": false,
       "bLengthChange": false,

+ 9 - 2
apps/beeswax/src/beeswax/templates/my_queries.mako

@@ -105,7 +105,7 @@ ${layout.menubar(section='my queries')}
                 ${ design.desc }
               % endif
             </td>
-            <td data-sort-value="${time.mktime(design.mtime.timetuple())}">${ timesince(design.mtime) } ${_('ago')}</td>
+            <td data-sort-value="${time.mktime(design.mtime.timetuple())}"></td>
           </tr>
         % endfor
         </tbody>
@@ -140,7 +140,7 @@ ${layout.menubar(section='my queries')}
                 % endif
                 data-row-selector-exclude="true"></div>
             </td>
-            <td width="10%" data-sort-value="${time.mktime(query.submission_date.timetuple())}">${ query.submission_date.strftime("%x %X") }</td>
+            <td width="10%" data-sort-value="${time.mktime(query.submission_date.timetuple())}" class="nowrap"></td>
             <td width="20%"><a href="${ url(app_name + ':execute_design', design_id=query.design.id) }" data-row-selector="true">${ query.design.name }</a></td>
             <td width="60%">
               % if len(query.query) > 100:
@@ -181,6 +181,7 @@ ${layout.menubar(section='my queries')}
 </div>
 
 <script src="/static/ext/js/knockout-min.js" type="text/javascript" charset="utf-8"></script>
+<script src="/static/ext/js/moment-with-locales.min.js"></script>
 
 <script type="text/javascript" charset="utf-8">
   $(document).ready(function () {
@@ -193,6 +194,12 @@ ${layout.menubar(section='my queries')}
 
     updateQueryCounters();
 
+    var locale = window.navigator.userLanguage || window.navigator.language;
+    moment.locale(locale);
+    $("[data-sort-value]").each(function(){
+      $(this).text(moment($(this).attr("data-sort-value")*1000).format("L LTS"));
+    });
+
     var recentSavedQueries = $("#recentSavedQueriesTable").dataTable({
       "sDom":"<'row'r>t<'row'<'span8'i><''p>>",
       "bPaginate":false,

+ 1 - 1
apps/impala/src/impala/templates/dashboard.mako

@@ -444,7 +444,7 @@ ${ dashboard.layout_skeleton() }
 <link rel="stylesheet" href="/static/ext/css/hue-charts.css">
 <link rel="stylesheet" href="/static/ext/chosen/chosen.min.css">
 
-<script src="/static/ext/js/moment-with-langs.min.js" type="text/javascript" charset="utf-8"></script>
+<script src="/static/ext/js/moment-with-locales.min.js" type="text/javascript" charset="utf-8"></script>
 
 ${ dashboard.import_layout() }
 

+ 1 - 1
apps/jobsub/src/jobsub/templates/designs.mako

@@ -32,7 +32,7 @@ ${ commonheader(None, "jobsub", user) | n,unicode }
 <script src="/static/ext/js/datatables-paging-0.1.js" type="text/javascript" charset="utf-8"></script>
 <script src="/static/ext/js/knockout-min.js" type="text/javascript" charset="utf-8"></script>
 <script src="/static/ext/js/knockout.mapping-2.3.2.js" type="text/javascript" charset="utf-8"></script>
-<script src="/static/ext/js/moment.min.js" type="text/javascript" charset="utf-8"></script>
+<script src="/static/ext/js/moment-with-locales.min.js" type="text/javascript" charset="utf-8"></script>
 <script src="/oozie/static/js/workflow.models.js" type="text/javascript" charset="utf-8"></script>
 <script src="/oozie/static/js/workflow.node-fields.js" type="text/javascript" charset="utf-8"></script>
 <script src="/jobsub/static/js/jobsub.templates.js" type="text/javascript" charset="utf-8"></script>

+ 1 - 1
apps/jobsub/src/jobsub/templates/jasmine.mako

@@ -6,7 +6,7 @@
     <script src="/static/ext/js/routie-0.3.0.min.js" type="text/javascript" charset="utf-8"></script>
     <script src="/static/ext/js/knockout-min.js" type="text/javascript" charset="utf-8"></script>
     <script src="/static/ext/js/knockout.mapping-2.3.2.js" type="text/javascript" charset="utf-8"></script>
-    <script src="/static/ext/js/moment.min.js" type="text/javascript" charset="utf-8"></script>
+    <script src="/static/ext/js/moment-with-locales.min.js" type="text/javascript" charset="utf-8"></script>
     <script src="/oozie/static/js/workflow.models.js" type="text/javascript" charset="utf-8"></script>
     <script src="/oozie/static/js/workflow.node-fields.js" type="text/javascript" charset="utf-8"></script>
     <script src="/jobsub/static/js/jobsub.templates.js" type="text/javascript" charset="utf-8"></script>

+ 1 - 1
apps/oozie/src/oozie/templates/dashboard/list_oozie_coordinator.mako

@@ -395,7 +395,7 @@ ${ layout.menubar(section='coordinators', dashboard=True) }
 <script src="/static/ext/js/codemirror-3.11.js"></script>
 <link rel="stylesheet" href="/static/ext/css/codemirror.css">
 <script src="/static/ext/js/codemirror-xml.js"></script>
-<script src="/static/ext/js/moment.min.js" type="text/javascript" charset="utf-8"></script>
+<script src="/static/ext/js/moment-with-locales.min.js" type="text/javascript" charset="utf-8"></script>
 
 % if oozie_coordinator.has_sla:
 <script src="/oozie/static/js/sla.utils.js" type="text/javascript" charset="utf-8"></script>

+ 1 - 1
apps/oozie/src/oozie/templates/dashboard/list_oozie_workflow.mako

@@ -353,7 +353,7 @@ ${ layout.menubar(section='workflows', dashboard=True) }
 <script src="/static/ext/js/codemirror-xml.js"></script>
 
 % if oozie_workflow.has_sla:
-<script src="/static/ext/js/moment.min.js" type="text/javascript" charset="utf-8"></script>
+<script src="/static/ext/js/moment-with-locales.min.js" type="text/javascript" charset="utf-8"></script>
 <script src="/oozie/static/js/sla.utils.js" type="text/javascript" charset="utf-8"></script>
 <script src="/static/ext/js/jquery/plugins/jquery.flot.min.js" type="text/javascript" charset="utf-8"></script>
 <script src="/static/ext/js/jquery/plugins/jquery.flot.selection.min.js" type="text/javascript" charset="utf-8"></script>

+ 1 - 1
apps/oozie/src/oozie/templates/editor/jasmine.mako

@@ -2,7 +2,7 @@
 
 <%block name="specs">
   <script src="/static/ext/js/knockout.mapping-2.3.2.js" type="text/javascript" charset="utf-8"></script>
-  <script src="/static/ext/js/moment.min.js" type="text/javascript" charset="utf-8"></script>
+  <script src="/static/ext/js/moment-with-locales.min.js" type="text/javascript" charset="utf-8"></script>
   <script src="/static/ext/js/bootstrap.min.js" type="text/javascript" charset="utf-8"></script>
   <script type="text/javascript" src="static/js/workflow.utils.js"></script>
   <script type="text/javascript" src="static/js/workflow.registry.js"></script>

+ 1 - 1
apps/oozie/src/oozie/templates/editor2/coordinator_editor.mako

@@ -492,7 +492,7 @@ ${ commonheader(_("Coordinator Editor"), "Oozie", user) | n,unicode }
 <link href="/static/css/jqCron.css" rel="stylesheet" type="text/css" />
 <script src="/static/js/jqCron.js" type="text/javascript"></script>
 
-<script src="/static/ext/js/moment.min.js" type="text/javascript" charset="utf-8"></script>
+<script src="/static/ext/js/moment-with-locales.min.js" type="text/javascript" charset="utf-8"></script>
 
 <link rel="stylesheet" href="/static/ext/select2/select2.css">
 <script src="/static/ext/select2/select2.min.js" type="text/javascript" charset="utf-8"></script>

+ 1 - 1
apps/oozie/src/oozie/templates/editor2/submit_job_popup.mako

@@ -110,7 +110,7 @@
 }
 </style>
 
-<script src="/static/ext/js/moment.min.js" type="text/javascript" charset="utf-8"></script>
+<script src="/static/ext/js/moment-with-locales.min.js" type="text/javascript" charset="utf-8"></script>
 <script src="/static/ext/js/bootstrap-datepicker.min.js" type="text/javascript" charset="utf-8"></script>
 <script src="/static/ext/js/bootstrap-timepicker.min.js" type="text/javascript" charset="utf-8"></script>
 

+ 1 - 1
apps/oozie/src/oozie/templates/utils.inc.mako

@@ -421,7 +421,7 @@
     }
   </style>
 
-  <script src="/static/ext/js/moment.min.js" type="text/javascript" charset="utf-8"></script>
+  <script src="/static/ext/js/moment-with-locales.min.js" type="text/javascript" charset="utf-8"></script>
   <script src="/static/ext/js/bootstrap-datepicker.min.js" type="text/javascript" charset="utf-8"></script>
   <script src="/static/ext/js/bootstrap-timepicker.min.js" type="text/javascript" charset="utf-8"></script>
 

+ 1 - 1
apps/search/src/search/templates/search.mako

@@ -1296,7 +1296,7 @@ ${ dashboard.layout_skeleton() }
 <link rel="stylesheet" href="/static/ext/css/hue-charts.css">
 <link rel="stylesheet" href="/static/ext/chosen/chosen.min.css">
 
-<script src="/static/ext/js/moment-with-langs.min.js" type="text/javascript" charset="utf-8"></script>
+<script src="/static/ext/js/moment-with-locales.min.js" type="text/javascript" charset="utf-8"></script>
 
 ${ dashboard.import_layout() }
 

+ 1 - 1
apps/security/src/security/templates/hive.mako

@@ -535,7 +535,7 @@ ${ tree.import_templates(itemClick='$root.assist.setPath', iconClick='$root.assi
 <script src="/static/js/ko.hue-bindings.js" type="text/javascript" charset="utf-8"></script>
 <script src="/security/static/js/hive.ko.js" type="text/javascript" charset="utf-8"></script>
 
-<script src="/static/ext/js/moment.min.js" type="text/javascript" charset="utf-8"></script>
+<script src="/static/ext/js/moment-with-locales.min.js" type="text/javascript" charset="utf-8"></script>
 <script src="/static/js/jquery.hiveautocomplete.js" type="text/javascript" charset="utf-8"></script>
 <script src="/static/js/jquery.filechooser.js" type="text/javascript" charset="utf-8"></script>
 

+ 1 - 1
apps/sqoop/src/sqoop/templates/app.mako

@@ -667,7 +667,7 @@ ${ commonheader(None, "sqoop", user) | n,unicode }
 
 <script src="/static/ext/js/datatables-paging-0.1.js" type="text/javascript" charset="utf-8"></script>
 <script src="/static/ext/js/routie-0.3.0.min.js" type="text/javascript" charset="utf-8"></script>
-<script src="/static/ext/js/moment.min.js" type="text/javascript" charset="utf-8"></script>
+<script src="/static/ext/js/moment-with-locales.min.js" type="text/javascript" charset="utf-8"></script>
 <script src="/static/ext/js/knockout-min.js" type="text/javascript" charset="utf-8"></script>
 <script src="/static/ext/js/knockout.mapping-2.3.2.js" type="text/javascript" charset="utf-8"></script>
 <script src="/static/ext/js/bootstrap-editable.min.js"></script>

Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 5
desktop/core/static/ext/js/moment-with-langs.min.js


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 5 - 0
desktop/core/static/ext/js/moment-with-locales.min.js


Файлын зөрүү хэтэрхий том тул дарагдсан байна
+ 0 - 5
desktop/core/static/ext/js/moment.min.js


Энэ ялгаанд хэт олон файл өөрчлөгдсөн тул зарим файлыг харуулаагүй болно