Merge branch 'develop' into 8.0

mitulgolakiya · mitulgolakiya · commit ab224689f3af · 2021-01-28T08:49:38.000+05:30
diff --git a/templates/scaffold/controller/datatable_controller_locale.stub b/templates/scaffold/controller/datatable_controller_locale.stub
@@ -72,7 +72,7 @@ class $MODEL_NAME$Controller extends AppBaseController
         $$MODEL_NAME_CAMEL$ = $this->$MODEL_NAME_CAMEL$Repository->find($id);
 
         if (empty($$MODEL_NAME_CAMEL$)) {
-            Flash::error(__('models/$MODEL_NAME_PLURAL_CAMEL$.singular').' '.__('messages.not_found'));
+            Flash::error(__('messages.not_found', ['model' => __('models/$MODEL_NAME_PLURAL_CAMEL$.singular')]));
 
             return redirect(route('$ROUTE_NAMED_PREFIX$$MODEL_NAME_PLURAL_CAMEL$.index'));
         }

Original file line number	Diff line number	Diff line change
`@@ -72,7 +72,7 @@ class $MODEL_NAME$Controller extends AppBaseController`
`72`	`72`	`$$MODEL_NAME_CAMEL$ = $this->$MODEL_NAME_CAMEL$Repository->find($id);`
`73`	`73`
`74`	`74`	`if (empty($$MODEL_NAME_CAMEL$)) {`
`75`		`- Flash::error(__('models/$MODEL_NAME_PLURAL_CAMEL$.singular').' '.__('messages.not_found'));`
	`75`	`+ Flash::error(__('messages.not_found', ['model' => __('models/$MODEL_NAME_PLURAL_CAMEL$.singular')]));`
`76`	`76`
`77`	`77`	`return redirect(route('$ROUTE_NAMED_PREFIX$$MODEL_NAME_PLURAL_CAMEL$.index'));`
`78`	`78`	`}`