Merge pull request #1052 from prabhatkumaroc082/fix-translate

Fixed #845, #852 and #884
krayin · Aug 25, 2022 · 33cee6f · 33cee6f
2 parents 075d1ca + e2b1bdf
commit 33cee6f
Show file tree

Hide file tree

Showing 12 changed files with 21 additions and 15 deletions.
diff --git a/packages/Webkul/Admin/publishable/assets/css/admin.css b/packages/Webkul/Admin/publishable/assets/css/admin.css
diff --git a/packages/Webkul/Admin/publishable/assets/js/admin.js b/packages/Webkul/Admin/publishable/assets/js/admin.js
diff --git a/packages/Webkul/Admin/publishable/assets/js/admin.js.LICENSE.txt b/packages/Webkul/Admin/publishable/assets/js/admin.js.LICENSE.txt
@@ -10,8 +10,8 @@
  */
 
 /*!
- * Vue.js v2.6.14
- * (c) 2014-2021 Evan You
+ * Vue.js v2.7.10
+ * (c) 2014-2022 Evan You
  * Released under the MIT License.
  */
 

diff --git a/packages/Webkul/Admin/publishable/assets/mix-manifest.json b/packages/Webkul/Admin/publishable/assets/mix-manifest.json
@@ -57,8 +57,8 @@
     "/images/type-icon.svg": "/images/type-icon.svg?id=625cb6dfa3b39d72b65b172f09b16b2a",
     "/images/user-icon.svg": "/images/user-icon.svg?id=5504788e912ea441b4ae0cb23d145341",
     "/images/workflow-icon.svg": "/images/workflow-icon.svg?id=0a8721c15a54790d1e85f288b9c79981",
-    "/js/admin.js": "/js/admin.js?id=dbc0086499f93ad18e5972099b58b531",
-    "/css/admin.css": "/css/admin.css?id=37e943014644b6092c8de9eedac619fc",
+    "/js/admin.js": "/js/admin.js?id=7bc8faad85978489c230442ed34d11f8",
+    "/css/admin.css": "/css/admin.css?id=95959e79cf065dfca187f48b77a56fec",
     "/images/favicon/android-icon-144x144.png": "/images/favicon/android-icon-144x144.png?id=6faae4761ebf5164f34a9d3856a12f73",
     "/images/favicon/android-icon-192x192.png": "/images/favicon/android-icon-192x192.png?id=2c2ef56168f35218ab16f536a1f09beb",
     "/images/favicon/android-icon-36x36.png": "/images/favicon/android-icon-36x36.png?id=cb762fc1c3a4114a7322ff8e5ba01bdf",

diff --git a/packages/Webkul/Admin/src/Helpers/Dashboard.php b/packages/Webkul/Admin/src/Helpers/Dashboard.php
@@ -153,6 +153,10 @@ public function setCards()
      */
     public function getCards(): array
     {
+        if(! $this->cards) {
+            $this->setCards();
+        }
+
         return $this->cards;
     }
 
@@ -773,7 +777,7 @@ public function getFormattedCardData($requestData)
             'startDateFilter' => $startDateFilter,
         ) = $this->getDateRangeDetails($requestData);
 
-        foreach ($this->cards as $card) {
+        foreach ($this->getCards() as $card) {
             if (isset($card['card_id']) && $card['card_id'] == $cardId) {
                 if (isset($card['class_name'])) {
                     $class = app($card['class_name']);

diff --git a/packages/Webkul/Admin/src/Http/Controllers/Admin/DashboardController.php b/packages/Webkul/Admin/src/Http/Controllers/Admin/DashboardController.php
@@ -24,8 +24,6 @@ class DashboardController extends Controller
     public function __construct(DashboardHelper $dashboardHelper)
     {
         $this->dashboardHelper = $dashboardHelper;
-
-        $this->dashboardHelper->setCards();
     }
 
     /**

diff --git a/packages/Webkul/Admin/src/Resources/assets/js/app.js b/packages/Webkul/Admin/src/Resources/assets/js/app.js
@@ -21,6 +21,9 @@ import './bootstrap';
  import tr from 'vee-validate/dist/locale/tr';
  import hi_IN from 'vee-validate/dist/locale/hi';
  import zh_CN from 'vee-validate/dist/locale/zh_CN';
+
+ import 'vue-cal/dist/i18n/ar.js';
+ import 'vue-cal/dist/i18n/tr.js';
 
 
 window.moment = require('moment');

diff --git a/packages/Webkul/Admin/src/Resources/views/activities/index/calendar.blade.php b/packages/Webkul/Admin/src/Resources/views/activities/index/calendar.blade.php
@@ -48,6 +48,7 @@
                 @ready="getActivities"
                 @view-change="getActivities"
                 :on-event-click="onEventClick"
+                locale="{{ app()->getLocale() }}"
             />
 
         </div>

diff --git a/packages/Webkul/UI/publishable/assets/css/ui.css b/packages/Webkul/UI/publishable/assets/css/ui.css
diff --git a/packages/Webkul/UI/publishable/assets/js/ui.js b/packages/Webkul/UI/publishable/assets/js/ui.js
diff --git a/packages/Webkul/UI/publishable/assets/mix-manifest.json b/packages/Webkul/UI/publishable/assets/mix-manifest.json
@@ -1,6 +1,6 @@
 {
-    "/js/ui.js": "/js/ui.js?id=97bd9e58b465f6c08eda8ff949c9bf71",
-    "/css/ui.css": "/css/ui.css?id=b7b8ad024fa08b9a5d21cff37b6a59c3",
+    "/js/ui.js": "/js/ui.js?id=8ddc143b87d14539e1f75b808010d2fa",
+    "/css/ui.css": "/css/ui.css?id=1d993fe869e3455b14f0ed3f3a12f6b4",
     "/images/add-icon.svg": "/images/add-icon.svg?id=9135b4e0e1c239c36981c849a44a80e1",
     "/images/alert-danger-icon.svg": "/images/alert-danger-icon.svg?id=d77f6a8646ed23b5c3b7721e9e236299",
     "/images/align-justify-icon.svg": "/images/align-justify-icon.svg?id=ee8d48e636b80417a884ab54c8fc0056",

diff --git a/packages/Webkul/UI/src/Resources/assets/js/components/date-range-basic.vue b/packages/Webkul/UI/src/Resources/assets/js/components/date-range-basic.vue
@@ -5,7 +5,7 @@
                 ref="startDate"
                 type="text"
                 class="control half"
-                placeholder="Start Date"
+                :placeholder="__('ui.datagrid.filter.start_date')"
             />
         </div>
 
@@ -16,7 +16,7 @@
                 ref="endDate"
                 type="text"
                 class="control half"
-                placeholder="End Date"
+                :placeholder="__('ui.datagrid.filter.end_date')"
             />
         </div>
     </div>