Merge 2c3100b into 68b7ecd

AsgardCms · Jun 5, 2017 · a4aad93 · a4aad93
2 parents 68b7ecd + 2c3100b
commit a4aad93
Show file tree

Hide file tree

Showing 4 changed files with 34 additions and 12 deletions.
diff --git a/Http/Requests/StoreCategoryRequest.php b/Http/Requests/StoreCategoryRequest.php
@@ -28,4 +28,12 @@ public function messages()
     {
         return [];
     }
+
+    public function translationMessages()
+    {
+        return [
+            'name.required' => trans('blog::messages.name is required'),
+            'slug.required' => trans('blog::messages.slug is required'),
+        ];
+    }
 }
diff --git a/Http/Requests/UpdateCategoryRequest.php b/Http/Requests/UpdateCategoryRequest.php
@@ -2,17 +2,23 @@
 
 namespace Modules\Blog\Http\Requests;
 
-use Illuminate\Foundation\Http\FormRequest;
+use Modules\Core\Internationalisation\BaseFormRequest;
 
-class UpdateCategoryRequest extends FormRequest
+class UpdateCategoryRequest extends BaseFormRequest
 {
-    public function rules()
+    public function translationRules()
     {
         return [
-           // 'slug[en]' => 'required'
+            'name' => 'required',
+            'slug' => 'required',
         ];
     }
 
+    public function rules()
+    {
+        return [];
+    }
+
     public function authorize()
     {
         return true;
@@ -22,4 +28,12 @@ public function messages()
     {
         return [];
     }
+
+    public function translationMessages()
+    {
+        return [
+            'name.required' => trans('blog::messages.name is required'),
+            'slug.required' => trans('blog::messages.slug is required'),
+        ];
+    }
 }
diff --git a/Resources/views/admin/categories/partials/create-fields.blade.php b/Resources/views/admin/categories/partials/create-fields.blade.php
@@ -1,12 +1,12 @@
 <div class="box-body">
-    <div class='form-group{{ $errors->has("{$lang}[name]") ? ' has-error' : '' }}'>
+    <div class='form-group{{ $errors->has("{$lang}.name") ? ' has-error' : '' }}'>
         {!! Form::label("{$lang}[name]", trans('blog::category.form.name')) !!}
         {!! Form::text("{$lang}[name]", old("{$lang}[name]"), ['class' => 'form-control', 'data-slug' => 'source', 'placeholder' => trans('blog::category.form.name')]) !!}
-        {!! $errors->first("{$lang}[name]", '<span class="help-block">:message</span>') !!}
+        {!! $errors->first("{$lang}.name", '<span class="help-block">:message</span>') !!}
     </div>
-    <div class='form-group{{ $errors->has("{$lang}[slug]") ? ' has-error' : '' }}'>
+    <div class='form-group{{ $errors->has("{$lang}.slug") ? ' has-error' : '' }}'>
        {!! Form::label("{$lang}[slug]", trans('blog::category.form.slug')) !!}
        {!! Form::text("{$lang}[slug]", old("{$lang}[slug]"), ['class' => 'form-control slug', 'data-slug' => 'target', 'placeholder' => trans('blog::category.form.slug')]) !!}
-       {!! $errors->first("{$lang}[slug]", '<span class="help-block">:message</span>') !!}
+       {!! $errors->first("{$lang}.slug", '<span class="help-block">:message</span>') !!}
    </div>
 </div>
diff --git a/Resources/views/admin/categories/partials/edit-fields.blade.php b/Resources/views/admin/categories/partials/edit-fields.blade.php
@@ -1,14 +1,14 @@
 <div class="box-body">
-    <div class='form-group{{ $errors->has("{$lang}[name]") ? ' has-error' : '' }}'>
+    <div class='form-group{{ $errors->has("{$lang}.name") ? ' has-error' : '' }}'>
         {!! Form::label("{$lang}[name]", trans('blog::category.form.name')) !!}
         <?php $old = $category->hasTranslation($locale) ? $category->translate($lang)->name : '' ?>
         {!! Form::text("{$lang}[name]", old("{$lang}[name]", $old), ['class' => 'form-control', 'data-slug' => 'source', 'placeholder' => trans('blog::category.form.name')]) !!}
-        {!! $errors->first("{$lang}[name]", '<span class="help-block">:message</span>') !!}
+        {!! $errors->first("{$lang}.name", '<span class="help-block">:message</span>') !!}
     </div>
-    <div class='form-group{{ $errors->has("{$lang}[slug]") ? ' has-error' : '' }}'>
+    <div class='form-group{{ $errors->has("{$lang}.slug") ? ' has-error' : '' }}'>
            {!! Form::label("{$lang}[slug]", trans('blog::category.form.slug')) !!}
             <?php $old = $category->hasTranslation($locale) ? $category->translate($lang)->slug : '' ?>
            {!! Form::text("{$lang}[slug]", old("{$lang}[slug]", $old), ['class' => 'form-control slug', 'data-slug' => 'target', 'placeholder' => trans('blog::category.form.slug')]) !!}
-           {!! $errors->first("{$lang}[slug]", '<span class="help-block">:message</span>') !!}
+           {!! $errors->first("{$lang}.slug", '<span class="help-block">:message</span>') !!}
        </div>
 </div>