Merge pull request #60 from Jaspur/master

Also options view translatable
whitecube · Feb 28, 2020 · a5206e5 · a5206e5
2 parents 98d2f02 + e60a621
commit a5206e5
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 11 deletions.
diff --git a/src/Pages/OptionResource.php b/src/Pages/OptionResource.php
@@ -2,9 +2,9 @@
 
 namespace Whitecube\NovaPage\Pages;
 
+use Laravel\Nova\Fields\DateTime;
 use Laravel\Nova\Fields\Heading;
 use Laravel\Nova\Fields\Text;
-use Laravel\Nova\Fields\DateTime;
 
 class OptionResource extends StaticResource
 {
@@ -46,7 +46,7 @@ public static function singularLabel()
     protected function getFormIntroductionFields()
     {
         return [
-            Heading::make($this->getFormattedName())
+            Heading::make($this->getFormattedName()),
         ];
     }
 
@@ -58,24 +58,25 @@ protected function getFormIntroductionFields()
     protected function getIndexTableFields()
     {
         return [
-            Text::make('Name', function() {
+            Text::make(__('Name'), 'name', function () {
                 return $this->getFormattedName();
             })->sortable(),
 
-            DateTime::make('Last updated on', function() {
+            DateTime::make(__('Last updated on'), 'last_updated_on', function () {
                 $updated_at = $this->getDate('updated_at');
                 return $updated_at ? $updated_at->toDateTimeString() : null;
-            })->format(config('novapage.date_format'))->sortable()
+            })->format(config('novapage.date_format'))->sortable(),
         ];
     }
 
     /**
      * Format template class name for display
-     * 
+     *
      * @return string
      */
-    public function getFormattedName() {
+    public function getFormattedName()
+    {
         return ucfirst(preg_replace('/(?<!\ )[A-Z]/', ' $0', $this->getName()));
     }
 
-}
+}
diff --git a/src/Pages/PageResource.php b/src/Pages/PageResource.php
@@ -75,15 +75,15 @@ protected function getBaseAttributeFields()
     protected function getIndexTableFields()
     {
         return [
-            Text::make(__('Name'), function () {
+            Text::make(__('Name'), 'name', function () {
                 return $this->getName();
             })->sortable(),
 
-            Text::make(__('Title'), function () {
+            Text::make(__('Title'), 'title', function () {
                 return $this->getTitle();
             })->sortable(),
 
-            DateTime::make(__('Last updated on'), function () {
+            DateTime::make(__('Last updated on'), 'last_updated_on', function () {
                 $updated_at = $this->getDate('updated_at');
                 return $updated_at ? $updated_at->toDateTimeString() : null;
             })->format(config('novapage.date_format'))->sortable(),