This commit is contained in:
2021-03-19 23:17:31 +00:00
parent f320bb6c7a
commit 2175e57c53
7 changed files with 35 additions and 33 deletions

View File

@@ -744,7 +744,8 @@ async function getUserOptions() {
l.timeZoneOverride = res.data.timeZoneOverride;
//No browser setting for this so meh
l.currencyName = res.data.currencyName || "USD";
l.currencyName = res.data.currencyName;
if (res.data.hour12 != null) {
l.hour12 = res.data.hour12;
}

View File

@@ -60,8 +60,14 @@ export default {
//////////////////////////////////////////////////
// Get the user's chosen currency name
//https://en.wikipedia.org/wiki/ISO_4217
//default to USD if nothing specified
getCurrencyName() {
return window.$gz.store.state.userOptions.currencyName;
let cur = window.$gz.store.state.userOptions.currencyName;
if (!window.$gz.util.stringIsNullOrEmpty(cur)) {
return cur;
} else {
return "USD";
}
},
//////////////////////////////////////////////////
// Get the user's chosen 12hr clock