Merge pull request 'dev' (#45) from dev into master
Reviewed-on: WillaEngine-Project/WillaEngine#45pull/87/head
commit
1e1e714c97
@ -1,10 +1,9 @@
|
|||||||
import moment from "jalali-moment";
|
import moment from "jalali-moment";
|
||||||
import Vue from "vue";
|
|
||||||
|
|
||||||
const convertToJalali = function (date = null, format = "jYYYY/jMM/jDD", defaultDate = 'مشخص نشده است.' ) {
|
const convertToJalali = function (date = null, format = "jYYYY/jMM/jDD", defaultDate = 'مشخص نشده است.' ) {
|
||||||
return date ? Vue.prototype.$moment(date).format(format) : defaultDate ;
|
return date ? moment(date).locale('fa').format(format) : defaultDate ;
|
||||||
};
|
};
|
||||||
const convertNowToJalali = function (date = null, format = "jYYYY/jMM/jDD" ) {
|
const convertNowToJalali = function (date = null, format = "jYYYY/jMM/jDD" ) {
|
||||||
return date ? Vue.prototype.$moment(date).format(format) : Vue.prototype.$moment(new Date()).format(format) ;
|
return date ? moment(date).locale('fa').format(format) : moment(new Date()).locale('fa').format(format) ;
|
||||||
};
|
};
|
||||||
export { convertToJalali, convertNowToJalali };
|
export { convertToJalali, convertNowToJalali };
|
||||||
|
Loading…
Reference in new issue