Fixed translation not display issue on listing page

area17 · Mar 2, 2020 · d9c70aa · d9c70aa
1 parent 267c667
commit d9c70aa
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/frontend/js/components/dashboard/activityFeed.vue b/frontend/js/components/dashboard/activityFeed.vue
@@ -43,11 +43,11 @@
       return {
         navFilters: [
           {
-            name: 'All activity',
+            name: this.$trans('dashboard.all-activity', 'All activity'),
             slug: 'all'
           },
           {
-            name: 'My activity',
+            name: this.$trans('dashboard.all-activity', 'My activity'),
             slug: 'mine'
           }
         ],

diff --git a/src/Http/Controllers/Admin/ModuleController.php b/src/Http/Controllers/Admin/ModuleController.php
@@ -990,7 +990,7 @@ protected function getIndexTableColumns($items)
         if ($this->moduleHas('translations')) {
             array_push($tableColumns, [
                 'name' => 'languages',
-                'label' => __('twill::listing.languages'),
+                'label' => __('twill::lang.listing.languages'),
                 'visible' => $visibleColumns ? in_array('languages', $visibleColumns) : true,
                 'optional' => true,
                 'sortable' => false,