This commit is contained in:
@@ -114,7 +114,16 @@ export default function initialize() {
|
||||
}
|
||||
|
||||
//Store offset in locale data
|
||||
locale.timeZoneOffset = res.data.timeZoneOffset;
|
||||
//TODO: also need the other locale settings such as number and date formats etc to be added at server
|
||||
store.commit("setLocale", {
|
||||
decimalSeparator: ".",
|
||||
currencySymbol: "$",
|
||||
shortDate: "YYYY-MM-DD",
|
||||
shortTime: "hh:mm:ss A",
|
||||
shortDateAndTime: "YYYY-MM-DD hh:mm:ss A",
|
||||
timeZoneOffset: res.data.timeZoneOffset
|
||||
});
|
||||
|
||||
resolve();
|
||||
}
|
||||
})
|
||||
|
||||
@@ -98,29 +98,23 @@ export default {
|
||||
"Copy"
|
||||
],
|
||||
decimalValidate(required) {
|
||||
return { required: required, decimal: [2, this.formats.decimalSeparator] };
|
||||
return { required: required, decimal: [2, this.format().decimalSeparator] };
|
||||
},
|
||||
decimalParse(v) {
|
||||
if (v) {
|
||||
if (
|
||||
this.decimalSeparator != "." &&
|
||||
v.includes(this.formats.decimalSeparator)
|
||||
v.includes(this.format().decimalSeparator)
|
||||
) {
|
||||
v = v.replace(this.formats.decimalSeparator, ".");
|
||||
v = v.replace(this.format().decimalSeparator, ".");
|
||||
}
|
||||
v = parseFloat(v);
|
||||
}
|
||||
return v;
|
||||
},
|
||||
formats: {
|
||||
DecimalSeparator: ".",
|
||||
currencySymbol: "$",
|
||||
shortDate: "YYYY-MM-DD",
|
||||
shortTime: "hh:mm:ss A",
|
||||
shortDateAndTime: "YYYY-MM-DD hh:mm:ss A"
|
||||
format() {
|
||||
return store.state.locale;
|
||||
},
|
||||
//timeZoneOffset is in decimal hours
|
||||
timeZoneOffset: -8.0,
|
||||
////////////////////////////////////////////////////////
|
||||
// Take in a string that contains one or more
|
||||
//locale keys between square brackets
|
||||
|
||||
Reference in New Issue
Block a user