Merge pull request #531 from kamekun/3.0

Update Carbon Locale, remove body requirement on pages, minor update to language core en, and update language es.
AsgardCms · May 18, 2018 · 705d04d · 705d04d
2 parents f7c72d1 + 6988ae7
commit 705d04d
Show file tree

Hide file tree

Showing 8 changed files with 19 additions and 4 deletions.
diff --git a/Modules/Core/changelog.yml b/Modules/Core/changelog.yml
@@ -3,6 +3,7 @@ versions:
     "@unreleased":
         changed:
             - Updating Dutch translations
+            - Fix Carbon locale
     "3.5.3":
         changed:
             - Updating Polish translations

diff --git a/Modules/Page/Http/Requests/CreatePageRequest.php b/Modules/Page/Http/Requests/CreatePageRequest.php
@@ -19,8 +19,7 @@ public function translationRules()
     {
         return [
             'title' => 'required',
-            'slug' => 'required',
-            'body' => 'required',
+            'slug' => 'required',            
         ];
     }
 

diff --git a/Modules/Page/Http/Requests/UpdatePageRequest.php b/Modules/Page/Http/Requests/UpdatePageRequest.php
@@ -19,8 +19,7 @@ public function translationRules()
     {
         return [
             'title' => 'required',
-            'slug' => 'required',
-            'body' => 'required',
+            'slug' => 'required',         
         ];
     }
 

diff --git a/Modules/Translation/Resources/lang/core/en/core.php b/Modules/Translation/Resources/lang/core/en/core.php
@@ -8,6 +8,7 @@
     'table' => [
         'created at' => 'Created at',
         'updated at' => 'Updated at',
+        'deleted at' => 'Deleted at',
         'actions' => 'Actions',
         'thumbnail' => 'Thumbnail',
     ],
@@ -33,11 +34,15 @@
         'update' => 'Update',
         'delete' => 'Delete',
         'reset' => 'Reset',
+        'see' => 'See',
+        'visualize' => 'Visualize',
         'update and back' => 'Update and go back',
     ],
     'save' => 'Save',
     'confirm' => 'Confirm',
     'move' => 'Move',
+    'widget' => 'Widget',
+    'widgets' => 'Widgets',
     'breadcrumb' => [
         'home' => 'Home',
     ],

diff --git a/Modules/Translation/Resources/lang/core/es/core.php b/Modules/Translation/Resources/lang/core/es/core.php
@@ -8,6 +8,7 @@
     'table' => [
         'created at' => 'Creado el',
         'updated at' => 'Actualizado el',
+        'deleted at' => 'Eliminado el',
         'actions' => 'Acciones',
         'thumbnail' => 'Miniaturas',
     ],
@@ -33,11 +34,15 @@
         'update' => 'Actualizar',
         'delete' => 'Eliminar',
         'reset' => 'Reiniciar',
+        'see' => 'Ver',
+        'visualize' => 'Visualize',
         'update and back' => 'Actualizar y regresar',
     ],
     'save' => 'Guardar',
     'confirm' => 'Confirmar',
     'move' => 'Mover',
+    'widget' => 'Complemento',
+    'widgets' => 'Complementos',
     'breadcrumb' => [
         'home' => 'Inicio',
     ],

diff --git a/Modules/User/changelog.yml b/Modules/User/changelog.yml
@@ -1,5 +1,8 @@
 url: https://github.com/AsgardCms/Platform
 versions:
+    "@unreleased":
+         changed:
+         - Adding a test the user token is correctly generated
     "3.5.1":
         changed:
             - Fix issue 467 id() method checks null instead of false

diff --git a/Themes/Adminlte/views/partials/top-nav.blade.php b/Themes/Adminlte/views/partials/top-nav.blade.php
@@ -19,6 +19,7 @@
                 </a>
             </li>
             <li><a href="{{ url('/') }}"><i class="fa fa-eye"></i> {{ trans('core::core.general.view website') }}</a></li>
+            @if(count(LaravelLocalization::getSupportedLocales())>1)
             <li class="dropdown">
                 <a href="#" class="dropdown-toggle" data-toggle="dropdown">
                     <i class="fa fa-flag"></i>
@@ -37,6 +38,7 @@
                     @endforeach
                 </ul>
             </li>
+            @endif
             <!-- User Account: style can be found in dropdown.less -->
             <li class="dropdown user user-menu">
                 <a href="#" class="dropdown-toggle" data-toggle="dropdown">

diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php
@@ -17,6 +17,7 @@ public function boot()
     {
         Schema::defaultStringLength(191);
 
+        Carbon::setLocale(config('app.locale'));
         Carbon::serializeUsing(function ($carbon) {
             return $carbon->format('d/m/y H:i:s');
         });