@@ -918,26 +918,24 @@ protected function getErrorMessage(
918918 ): string {
919919 $ param ??= '' ;
920920
921+ $ args = [
922+ 'field ' => ($ label === null || $ label === '' ) ? $ field : lang ($ label ),
923+ 'param ' => (! isset ($ this ->rules [$ param ]['label ' ])) ? $ param : lang ($ this ->rules [$ param ]['label ' ]),
924+ 'value ' => $ value ?? '' ,
925+ ];
926+
921927 // Check if custom message has been defined by user
922928 if (isset ($ this ->customErrors [$ field ][$ rule ])) {
923- $ message = lang ($ this ->customErrors [$ field ][$ rule ]);
924- } elseif (null !== $ originalField && isset ($ this ->customErrors [$ originalField ][$ rule ])) {
925- $ message = lang ($ this ->customErrors [$ originalField ][$ rule ]);
926- } else {
927- // Try to grab a localized version of the message...
928- // lang() will return the rule name back if not found,
929- // so there will always be a string being returned.
930- $ message = lang ('Validation. ' . $ rule );
929+ return lang ($ this ->customErrors [$ field ][$ rule ], $ args );
930+ }
931+ if (null !== $ originalField && isset ($ this ->customErrors [$ originalField ][$ rule ])) {
932+ return lang ($ this ->customErrors [$ originalField ][$ rule ], $ args );
931933 }
932934
933- $ message = str_replace ('{field} ' , ($ label === null || $ label === '' ) ? $ field : lang ($ label ), $ message );
934- $ message = str_replace (
935- '{param} ' ,
936- (! isset ($ this ->rules [$ param ]['label ' ])) ? $ param : lang ($ this ->rules [$ param ]['label ' ]),
937- $ message
938- );
939-
940- return str_replace ('{value} ' , $ value ?? '' , $ message );
935+ // Try to grab a localized version of the message...
936+ // lang() will return the rule name back if not found,
937+ // so there will always be a string being returned.
938+ return lang ('Validation. ' . $ rule , $ args );
941939 }
942940
943941 /**
0 commit comments