mirror of
https://github.com/zotero/zotero.git
synced 2026-10-09 03:18:01 +00:00
Fixes #609, Date Added in middle column displays as GMT
Now displays Date Added and Date Modified as short date in proper locale order plus locale time (e.g. "4/4/07 14:27:23")
This commit is contained in:
parent
462ccf53d5
commit
ce0de34b00
2 changed files with 32 additions and 2 deletions
|
|
@ -492,7 +492,29 @@ Zotero.ItemTreeView.prototype.getCellText = function(row, column)
|
|||
|
||||
if(column.id == 'zotero-items-column-dateAdded' || column.id == 'zotero-items-column-dateModified') //this is not so much that we will use this format for date, but a simple template for later revisions.
|
||||
{
|
||||
val = new Date(Date.parse(val.replace(/-/g,"/"))).toLocaleString();
|
||||
// Format date as short date in proper locale order and locale time
|
||||
// (e.g. "4/4/07 14:27:23")
|
||||
var order = Zotero.Date.getLocaleDateOrder();
|
||||
var date = Zotero.Date.sqlToDate(val, true);
|
||||
var parts = [];
|
||||
for (var i=0; i<3; i++) {
|
||||
switch (order[i]) {
|
||||
case 'y':
|
||||
parts.push(date.getFullYear().toString().substr(2));
|
||||
break;
|
||||
|
||||
case 'm':
|
||||
parts.push((date.getMonth() + 1));
|
||||
break;
|
||||
|
||||
case 'd':
|
||||
parts.push(date.getDate());
|
||||
break;
|
||||
}
|
||||
|
||||
val = parts.join('/');
|
||||
val += ' ' + date.toLocaleTimeString();
|
||||
}
|
||||
}
|
||||
|
||||
return val;
|
||||
|
|
|
|||
|
|
@ -986,6 +986,8 @@ Zotero.Date = new function(){
|
|||
this.getFileTimeString = getFileTimeString;
|
||||
this.getLocaleDateOrder = getLocaleDateOrder;
|
||||
|
||||
var _localeDateOrder = null;
|
||||
|
||||
|
||||
/**
|
||||
* Convert an SQL date in the form '2006-06-13 11:03:05' into a JS Date object
|
||||
|
|
@ -1380,9 +1382,13 @@ Zotero.Date = new function(){
|
|||
* Returns a string with y, m, and d (e.g. 'ymd', 'mdy')
|
||||
*/
|
||||
function getLocaleDateOrder(){
|
||||
if (_localeDateOrder) {
|
||||
return _localeDateOrder;
|
||||
}
|
||||
|
||||
var date = new Date("October 5, 2006");
|
||||
var parts = date.toLocaleDateString().match(/([0-9]+)[^0-9]+([0-9]+)[^0-9]+([0-9]+)/);
|
||||
alert(parts);
|
||||
|
||||
switch (parseInt(parts[1])){
|
||||
case 2006:
|
||||
var order = 'y';
|
||||
|
|
@ -1417,6 +1423,8 @@ Zotero.Date = new function(){
|
|||
break;
|
||||
}
|
||||
|
||||
_localeDateOrder = order;
|
||||
|
||||
return order;
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue