X-Git-Url: https://git.arvados.org/arvados.git/blobdiff_plain/c446dd845656e944c2d3f91f8d00e320c37b66a1..b7f67c80916c2efa0c234ab5f4e92c24d47223c5:/apps/workbench/app/assets/javascripts/dates.js diff --git a/apps/workbench/app/assets/javascripts/dates.js b/apps/workbench/app/assets/javascripts/dates.js index b6eff83893..903fb01cb5 100644 --- a/apps/workbench/app/assets/javascripts/dates.js +++ b/apps/workbench/app/assets/javascripts/dates.js @@ -1,12 +1,15 @@ jQuery(function($){ $(document).on('ajax:complete arv:pane:loaded ready', function() { $('[data-utc-date]').each(function(i, elm) { + // Try matching the date using a couple of different formats. var v = $(elm).attr('data-utc-date').match(/(\d\d\d\d)-(\d\d)-(\d\d) (\d\d):(\d\d):(\d\d) UTC/); if (!v) { v = $(elm).attr('data-utc-date').match(/(\d\d\d\d)-(\d\d)-(\d\d)T(\d\d):(\d\d):(\d\d)Z/); } if (v) { + // Create a new date object from the timestamp so the browser can + // render the date based on the locale/timezone. var ts = new Date(Date.UTC(v[1], v[2]-1, v[3], v[4], v[5], v[6])); if ($(elm).attr('data-utc-date-opts') && $(elm).attr('data-utc-date-opts').match(/noseconds/)) { $(elm).text((ts.getHours() > 12 ? (ts.getHours()-12) : ts.getHours())