This commit is contained in:
@@ -204,13 +204,19 @@ export default {
|
||||
// only how the user expects to see the page itself
|
||||
//
|
||||
// also for sake of future proofing and edge cases need to have it be manually settable as well
|
||||
// ############### TODO: modify both of these to put the user's manual override first in line (if there is one)
|
||||
// ############### TODO: modify all of these to put the user's manual override first in line (if there is one)
|
||||
getBrowserLanguages() {
|
||||
return window.navigator.languages;
|
||||
},
|
||||
getBrowserFirstLanguage() {
|
||||
return window.navigator.languages[0];
|
||||
},
|
||||
///////////////////////////////////////////
|
||||
// Get users default time zone
|
||||
//
|
||||
getTimeZoneName() {
|
||||
return Intl.DateTimeFormat().resolvedOptions().timeZone;
|
||||
},
|
||||
////////////////////////////////////////////////////////
|
||||
// dynamically set the vuetify language elements from
|
||||
// users localized text (am/pm etc)
|
||||
|
||||
@@ -157,35 +157,28 @@ Vue.filter(
|
||||
var parsedDate = new Date(value);
|
||||
//parsedDate now contains the correct value
|
||||
//but any attempt to get it back out that isn't a UTC function will automatically convert to local perceived time zone
|
||||
|
||||
var tzAdjustedDate = new Date();
|
||||
tzAdjustedDate.setTime(
|
||||
parsedDate.getTime() + locale.format().timeZoneOffset * 60 * 60 * 1000
|
||||
);
|
||||
|
||||
// var localizedDate = dayjs
|
||||
// .utc(value)
|
||||
// .add(locale.format().timeZoneOffset, "hour")
|
||||
// .toDate();
|
||||
// DATE.toLocaleString('en-GB', { timeZone: 'UTC', dateStyle: "short",timeStyle: "short", hour12: false })
|
||||
|
||||
var ret = tzAdjustedDate.toLocaleString(
|
||||
var ret = parsedDate.toLocaleString(
|
||||
window.$gz.locale.getBrowserLanguages(),
|
||||
{
|
||||
timeZone: locale.getTimeZoneName(),
|
||||
dateStyle: "short",
|
||||
timeStyle: "short",
|
||||
hour12: locale.format().hour12
|
||||
}
|
||||
);
|
||||
|
||||
console.log("value");
|
||||
console.log(value);
|
||||
console.log("parsedDate");
|
||||
console.log(parsedDate);
|
||||
console.log("tzAdjustedDate");
|
||||
console.log(tzAdjustedDate);
|
||||
console.log("presented as:");
|
||||
console.log(ret);
|
||||
console.log("-------");
|
||||
// console.log("value");
|
||||
// console.log(value);
|
||||
// console.log("parsedDate");
|
||||
// console.log(parsedDate);
|
||||
// console.log("tzAdjustedDate");
|
||||
// console.log(tzAdjustedDate);
|
||||
// console.log("presented as:");
|
||||
// console.log(ret);
|
||||
// console.log("-------");
|
||||
//debugger;
|
||||
|
||||
return ret;
|
||||
|
||||
Reference in New Issue
Block a user