Merge pull request #11 from webfactor/1.2

[EH] use translation for notification and format errors

Author: tswonke

CHANGELOG.md

@@ -21,6 +21,12 @@ Updates should follow the [Keep a CHANGELOG](http://keepachangelog.com/) princip
 ### Security
 - Nothing
 
+## 1.2.0 - 2018-05-24
+
+### Changed
+- uses translation files for notifications
+- formated validation errors in notifications
+
 ## 1.1.0 - 2018-05-23
 
 ### Added

resources/views/modal/create.blade.php

@@ -34,17 +34,17 @@
                 success: function (data) {
                     new PNotify({
                         type: "success",
-                        title: "Erfolg",
-                        text: "gespeichert"
+                        title: "{{ trans('backpack::base.success') }}",
+                        text: "{{ trans('backpack::crud.insert_success') }}"
                     });
 
                     $("#{{ $entity }}_modal").modal('toggle');
                 },
                 error: function (data) {
                     new PNotify({
                         type: "error",
-                        title: "Fehler",
-                        text: "Nicht gespeichert: " + data.responseText
+                        title: "{{ trans('backpack::base.error') }}",
+                        text: "{{ trans('backpack::base.error') }}: " + data.responseJSON
                     });
                 }
             });
@@ -53,4 +53,4 @@
         });
     </script>
 
-@endpush
+@endpush

src/Traits/InstantFields.php

@@ -4,6 +4,7 @@
 
 use Illuminate\Foundation\Http\FormRequest;
 use Illuminate\Http\Request;
+use Illuminate\Support\MessageBag;
 
 trait InstantFields
 {
@@ -122,7 +123,7 @@ public function ajaxStore(Request $request)
 
         if ($storeRequest = $this->getAjaxStoreRequest()) {
             if ($errors = $this->ajaxValidationFails($request, $storeRequest->rules())) {
-                return response()->json($errors, 422);
+                return response()->json($this->ajaxFormatMessage($errors), 422);
             }
         }
 
@@ -156,7 +157,7 @@ public function ajaxValidationFails(Request $request, array $rules)
      */
     private function ajaxRespondNoPermission()
     {
-        return response()->json(['errors' => 'No permission'], 403);
+        return response()->json($this->ajaxFormatMessage(trans('backpack::base.unauthorized')), 403);
     }
 
     /**
@@ -176,6 +177,28 @@ private function ajaxRespondCreated()
      */
     private function ajaxRespondError()
     {
-        return response()->json(['errors' => 'Could not save'], 422);
+        return response()->json($this->ajaxFormatMessage(trans('backpack::base.error_saving')), 422);
+    }
+
+    /**
+     * Formats the message for the notification
+     *
+     * @return string
+     */
+    private function ajaxFormatMessage($message)
+    {
+        if ($message instanceof MessageBag) {
+            $validationErrors = '<ul>';
+
+            foreach ($message->all() as $validationError) {
+                $validationErrors .= '<li>' . $validationError . '</li>';
+            }
+
+            $validationErrors .= '</ul>';
+
+            return $validationErrors;
+        }
+
+        return $message;
     }
 }