File tree 3 files changed +7
-6
lines changed
3 files changed +7
-6
lines changed Original file line number Diff line number Diff line change @@ -284,6 +284,7 @@ export default {
284
284
showPassword: false ,
285
285
minLength: this .$config .get (" passwordLength" ),
286
286
maxLength: 72 ,
287
+ timeZone: this .$config .getTimeZone (),
287
288
rtl: this .$isRtl ,
288
289
action: " " ,
289
290
confirmAction: " " ,
@@ -365,25 +366,25 @@ export default {
365
366
}
366
367
367
368
if (! Number .isInteger (d)) {
368
- return DateTime .fromISO (d).toLocaleString (DateTime .DATE_SHORT );
369
+ return DateTime .fromISO (d, { zone : this . timeZone } ).toLocaleString (DateTime .DATE_SHORT );
369
370
} else if (d <= 0 ) {
370
371
return " –" ;
371
372
}
372
373
373
- return DateTime .fromSeconds (d).toLocaleString (DateTime .DATE_SHORT );
374
+ return DateTime .fromSeconds (d, { zone : this . timeZone } ).toLocaleString (DateTime .DATE_SHORT );
374
375
},
375
376
formatDateTime (d ) {
376
377
if (! d) {
377
378
return " –" ;
378
379
}
379
380
380
381
if (! Number .isInteger (d)) {
381
- return DateTime .fromISO (d).toLocaleString (DateTime .DATETIME_SHORT );
382
+ return DateTime .fromISO (d, { zone : this . timeZone } ).toLocaleString (DateTime .DATETIME_SHORT );
382
383
} else if (d <= 0 ) {
383
384
return " –" ;
384
385
}
385
386
386
- return DateTime .fromSeconds (d).toLocaleString (DateTime .DATETIME_SHORT );
387
+ return DateTime .fromSeconds (d, { zone : this . timeZone } ).toLocaleString (DateTime .DATETIME_SHORT );
387
388
},
388
389
scopeInfo (s ) {
389
390
let info = memoizeOne (auth .Scopes )()[s];
Original file line number Diff line number Diff line change @@ -151,7 +151,6 @@ import * as formats from "options/formats";
151
151
import PLoading from " component/loading.vue" ;
152
152
import PActionMenu from " component/action/menu.vue" ;
153
153
import PConfirmDialog from " component/confirm/dialog.vue" ;
154
- import { TIMESTAMP_LONG_TZ } from " options/formats" ;
155
154
156
155
export default {
157
156
name: " PPageErrors" ,
Original file line number Diff line number Diff line change @@ -165,6 +165,7 @@ export default {
165
165
isDemo: this .$config .get (" demo" ),
166
166
isPublic: this .$config .get (" public" ),
167
167
config: this .$config .values ,
168
+ timeZone: this .$config .getTimeZone (),
168
169
readonly: this .$config .get (" readonly" ),
169
170
settings: new Settings (this .$config .values .settings ),
170
171
model: {},
@@ -222,7 +223,7 @@ export default {
222
223
223
224
const time = d .Time ? d .Time : d;
224
225
225
- return DateTime .fromISO (time).toLocaleString (DateTime .DATE_FULL );
226
+ return DateTime .fromISO (time, { zone : this . timeZone } ).toLocaleString (DateTime .DATE_FULL );
226
227
},
227
228
load () {
228
229
Service .search ({ count: 2000 }).then ((r ) => (this .results = r .models ));
You can’t perform that action at this time.
0 commit comments