From 3ec572b1064008b8347ec88fb859db49a7959408 Mon Sep 17 00:00:00 2001 From: Saeid Date: Tue, 22 Dec 2020 13:38:32 +0330 Subject: [PATCH 1/2] fix: moment --- resources/js/Global/utils/date/jalali-date.js | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/resources/js/Global/utils/date/jalali-date.js b/resources/js/Global/utils/date/jalali-date.js index 663f94f..af6380d 100644 --- a/resources/js/Global/utils/date/jalali-date.js +++ b/resources/js/Global/utils/date/jalali-date.js @@ -1,10 +1,9 @@ import moment from "jalali-moment"; -import Vue from "vue"; const convertToJalali = function (date = null, format = "jYYYY/jMM/jDD", defaultDate = 'مشخص نشده است.' ) { - return date ? Vue.prototype.$moment(date).format(format) : defaultDate ; + return date ? moment(date).format(format) : defaultDate ; }; 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).format(format) : moment(new Date()).format(format) ; }; export { convertToJalali, convertNowToJalali }; From a83b8bd1548fd1d3cff298f4af2070a55f55a61a Mon Sep 17 00:00:00 2001 From: Saeid Date: Tue, 22 Dec 2020 14:23:59 +0330 Subject: [PATCH 2/2] fix: date persian --- resources/js/Global/plugins/globalComponent.js | 7 +++---- resources/js/Global/utils/date/jalali-date.js | 4 ++-- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/resources/js/Global/plugins/globalComponent.js b/resources/js/Global/plugins/globalComponent.js index 898fc05..6976173 100644 --- a/resources/js/Global/plugins/globalComponent.js +++ b/resources/js/Global/plugins/globalComponent.js @@ -105,8 +105,7 @@ import store from "@Global/store/index"; store.dispatch('common/setCurrentTime'); //jalali => 0.6MB +import moment from "moment" +moment.locale('fa'); import jalaliMoment from "vue-jalali-moment" -import momment from "moment" -import Wireframe from "@Global/components/Blocks/Wireframe"; -momment.locale('fa'); -Vue.use(jalaliMoment); +Vue.use(jalaliMoment,{moment}); diff --git a/resources/js/Global/utils/date/jalali-date.js b/resources/js/Global/utils/date/jalali-date.js index af6380d..b4e74a4 100644 --- a/resources/js/Global/utils/date/jalali-date.js +++ b/resources/js/Global/utils/date/jalali-date.js @@ -1,9 +1,9 @@ import moment from "jalali-moment"; const convertToJalali = function (date = null, format = "jYYYY/jMM/jDD", defaultDate = 'مشخص نشده است.' ) { - return date ? moment(date).format(format) : defaultDate ; + return date ? moment(date).locale('fa').format(format) : defaultDate ; }; const convertNowToJalali = function (date = null, format = "jYYYY/jMM/jDD" ) { - return date ? moment(date).format(format) : moment(new Date()).format(format) ; + return date ? moment(date).locale('fa').format(format) : moment(new Date()).locale('fa').format(format) ; }; export { convertToJalali, convertNowToJalali };