Merge pull request #26 from vdhicts/feature/translations

dvdheiden · web-flow · commit ba63a268ab68 · 2025-03-14T08:18:18.000+01:00
Improve translations
diff --git a/resources/lang/en/messages.php b/resources/lang/en/messages.php
@@ -2,26 +2,26 @@
 
 return [
     'bic_number' => 'The :attribute must be a valid BIC number',
-    'contains' => 'The :attribute must contain `%s`',
-    'contains_any' => 'The :attribute must contain one of these values: `%s`',
-    'date_after_or_equal' => 'The :attribute must be after or equal to `%s`',
-    'date_before_or_equal' => 'The :attribute must be before or equal to `%s`',
+    'contains' => 'The :attribute must contain `:value`',
+    'contains_any' => 'The :attribute must contain one of these values: `:values`',
+    'date_after_or_equal' => 'The :attribute must be after or equal to `:date`',
+    'date_before_or_equal' => 'The :attribute must be before or equal to `:date`',
     'date_has_specific_minutes' => 'The :attribute must have one of :minutes minutes',
     'dutch_phone' => 'The :attribute must be a valid dutch phone number',
     'dutch_postal_code' => 'The :attribute must be a valid dutch post code',
     'hex_color' => 'The :attribute must be a valid Hex color',
     'hostname' => 'The :attribute must be a valid hostname',
     'iban' => 'The :attribute must be a valid IBAN',
     'interval' => 'The :attribute must be an interval',
-    'maximum_hour_difference' => 'The start and end date differ more then %s hours',
+    'maximum_hour_difference' => 'The start and end date differ more then :diff hours',
     'mime_type' => 'The :attribute must be a valid MIME',
-    'not_contains' => 'The :attribute must not contain `%s`',
-    'not_ends_with' => 'The :attribute must not end with `%s`',
-    'not_starts_with' => 'The :attribute must not start with `%s`',
+    'not_contains' => 'The :attribute must not contain `:value`',
+    'not_ends_with' => 'The :attribute must not end with `:value',
+    'not_starts_with' => 'The :attribute must not start with `:value`',
     'password_strength' => 'The :attribute must contains at least one capital letter, one lowercase letter and one number',
     'phone' => 'The :attribute must be a valid phone number',
     'positive_interval' => 'The :attribute must be a positive interval',
-    'price_custom_decimal' => 'The :attribute must be a valid price like `10%s95`',
+    'price_custom_decimal' => 'The :attribute must be a valid price like `10 :separator 95`',
     'price' => 'The :attribute must be a valid price like `10,95` or `10.50`',
     'semver' => 'The :attribute must be a valid version according to the semver standard',
     'secure_url' => 'The :attribute must be a HTTPS url',
diff --git a/resources/lang/nl/messages.php b/resources/lang/nl/messages.php
@@ -2,25 +2,26 @@
 
 return [
     'bic_number' => 'Het veld :attribute moet een geldig BIC nummer bevatten',
-    'contains_any' => 'Het veld :attribute moet een van deze waardes bevatten: `%s`',
-    'date_after_or_equal' => 'Het veld :attribute moet na of op `%s` zijn',
-    'date_before_or_equal' => 'Het veld :attribute moet voor of op `%s` zijn',
+    'contains' => 'Het veld :attribute moet `:value` bevatten',
+    'contains_any' => 'Het veld :attribute moet een van deze waardes bevatten: `:values',
+    'date_after_or_equal' => 'Het veld :attribute moet na of op `:date` zijn',
+    'date_before_or_equal' => 'Het veld :attribute moet voor of op `:date` zijn',
     'date_has_specific_minutes' => 'Het veld :attribute moet ingesteld zijn op een van :minutes minuten',
     'dutch_phone' => 'Het veld :attribute moet een geldig telefoonnummer bevatten',
     'dutch_postal_code' => 'Het veld :attribute moet een geldige postcode bevatten',
     'hex_color' => 'Het veld :attribute moet een geldige Hex kleur bevatten',
     'hostname' => 'Het veld :attribute moet een geldige hostname bevatten',
     'iban' => 'Het veld :attribute moet een geldige IBAN bevatten',
     'interval' => 'Het veld :attribute moet een interval zijn',
-    'maximum_hour_difference' => 'De start en eind datum moeten meer dan %s uur verschil',
+    'maximum_hour_difference' => 'De start en eind datum moeten meer dan :diff uur verschil',
     'mime_type' => 'Het veld :attribute moet een geldig MIME-type zijn',
-    'not_contains' => 'Het veld :attribute mag geen `%s` bevatten',
-    'not_ends_with' => 'Het veld :attribute mag niet eindigen met `%s`',
-    'not_starts_with' => 'Het veld :attribute mag niet beginnen `%s`',
+    'not_contains' => 'Het veld :attribute mag geen `:value` bevatten',
+    'not_ends_with' => 'Het veld :attribute mag niet eindigen met `:value`',
+    'not_starts_with' => 'Het veld :attribute mag niet beginnen `:value`',
     'password' => 'Het veld :attribute moet minstens een hoofdletter, een kleine letter en een nummer bevatten',
     'phone' => 'Het veld :attribute moet een geldig telefoonnummer bevatten',
     'positive_interval' => 'Het veld :attribute moet een positieve interval bevatten',
-    'price_custom_decimal' => 'Het veld :attribute moet een geldig bedrag bevatten, zoals `10%s95`',
+    'price_custom_decimal' => 'Het veld :attribute moet een geldig bedrag bevatten, zoals `10 :separator 95`',
     'price' => 'Het veld :attribute moet een geldig bedrag bevatten, zoals `10,95` of `10.50`',
     'secure_url' => 'Het veld :attribute moet een HTTPS url zijn',
     'semver' => 'Het veld :attribute moet een geldige versie zijn volgens de semver standaard',
diff --git a/src/Rules/BicNumber.php b/src/Rules/BicNumber.php
@@ -13,6 +13,6 @@ public function passes(mixed $value): bool
 
     public function message(): string
     {
-        return __('validationRules.bic_number');
+        return __('validationRules::messages.bic_number');
     }
 }
diff --git a/src/Rules/Contains.php b/src/Rules/Contains.php
@@ -21,9 +21,6 @@ public function passes(mixed $value): bool
 
     public function message(): string
     {
-        return sprintf(
-            __('validationRules.contains'),
-            $this->needle
-        );
+        return __('validationRules::messages.contains', ['value' => $this->needle]);
     }
 }
diff --git a/src/Rules/ContainsAny.php b/src/Rules/ContainsAny.php
@@ -17,9 +17,6 @@ public function passes(mixed $value): bool
 
     public function message(): string
     {
-        return sprintf(
-            __('validationRules.contains_any'),
-            implode(', ', $this->needles)
-        );
+        return __('validationRules::messages.contains_any', ['values' => implode(', ', $this->needles)]);
     }
 }
diff --git a/src/Rules/DateAfterOrEqual.php b/src/Rules/DateAfterOrEqual.php
@@ -21,9 +21,6 @@ public function passes(mixed $value): bool
 
     public function message(): string
     {
-        return sprintf(
-            __('validationRules.date_after_or_equal'),
-            $this->date->format('c')
-        );
+        return __('validationRules::messages.date_after_or_equal', ['date' => $this->date->format('c')]);
     }
 }
diff --git a/src/Rules/DateBeforeOrEqual.php b/src/Rules/DateBeforeOrEqual.php
@@ -26,9 +26,6 @@ public function passes(mixed $value): bool
 
     public function message(): string
     {
-        return sprintf(
-            __('validationRules.date_before_or_equal'),
-            $this->date->format('c')
-        );
+        return __('validationRules::messages.date_before_or_equal', ['date' => $this->date->format('c')]);
     }
 }
diff --git a/src/Rules/DateHasSpecificMinutes.php b/src/Rules/DateHasSpecificMinutes.php
@@ -28,7 +28,7 @@ public function passes(mixed $value): bool
 
     public function message(): string
     {
-        return trans('validationRules.date_has_specific_minutes', [
+        return __('validationRules::messages.date_has_specific_minutes', [
             'minutes' => implode(', ', $this->allowedMinutes),
         ]);
     }
diff --git a/src/Rules/DutchPhone.php b/src/Rules/DutchPhone.php
@@ -13,6 +13,6 @@ public function passes(mixed $value): bool
 
     public function message(): string
     {
-        return __('validationRules.dutch_phone');
+        return __('validationRules::messages.dutch_phone');
     }
 }
diff --git a/src/Rules/DutchPostalCode.php b/src/Rules/DutchPostalCode.php
@@ -13,6 +13,6 @@ public function passes(mixed $value): bool
 
     public function message(): string
     {
-        return __('validationRules.dutch_postal_code');
+        return __('validationRules::messages.dutch_postal_code');
     }
 }
diff --git a/src/Rules/HexColor.php b/src/Rules/HexColor.php
@@ -16,6 +16,6 @@ public function passes(mixed $value): bool
 
     public function message(): string
     {
-        return __('validationRules.hex_color');
+        return __('validationRules::messages.hex_color');
     }
 }
diff --git a/src/Rules/Hostname.php b/src/Rules/Hostname.php
@@ -13,6 +13,6 @@ public function passes(mixed $value): bool
 
     public function message(): string
     {
-        return __('validationRules.hostname');
+        return __('validationRules::messages.hostname');
     }
 }
diff --git a/src/Rules/InternationalBankAccountNumber.php b/src/Rules/InternationalBankAccountNumber.php
@@ -13,6 +13,6 @@ public function passes(mixed $value): bool
 
     public function message(): string
     {
-        return __('validationRules.iban');
+        return __('validationRules::messages.iban');
     }
 }
diff --git a/src/Rules/Interval.php b/src/Rules/Interval.php
@@ -24,6 +24,6 @@ public function passes(mixed $value): bool
 
     public function message(): string
     {
-        return trans('validationRules.interval');
+        return __('validationRules::messages.interval');
     }
 }
diff --git a/src/Rules/MaximumHourDifference.php b/src/Rules/MaximumHourDifference.php
@@ -28,9 +28,6 @@ public function passes(mixed $value): bool
 
     public function message(): string
     {
-        return sprintf(
-            __('validationRules.maximum_hour_difference'),
-            $this->hours
-        );
+        return __('validationRules::messages.maximum_hour_difference', ['diff' => $this->hours]);
     }
 }
diff --git a/src/Rules/MimeType.php b/src/Rules/MimeType.php
@@ -17,6 +17,6 @@ public function passes(mixed $value): bool
 
     public function message(): string
     {
-        return trans('validationRules.mime_type');
+        return __('validationRules::messages.mime_type');
     }
 }
diff --git a/src/Rules/NotContains.php b/src/Rules/NotContains.php
@@ -21,9 +21,6 @@ public function passes(mixed $value): bool
 
     public function message(): string
     {
-        return sprintf(
-            __('validationRules.not_contains'),
-            $this->needle
-        );
+        return __('validationRules::messages.not_contains', ['value' => $this->needle]);
     }
 }
diff --git a/src/Rules/Phone.php b/src/Rules/Phone.php
@@ -20,6 +20,6 @@ public function passes(mixed $value): bool
 
     public function message(): string
     {
-        return __('validationRules.phone');
+        return __('validationRules::messages.phone');
     }
 }
diff --git a/src/Rules/PositiveInterval.php b/src/Rules/PositiveInterval.php
@@ -36,6 +36,6 @@ public function passes(mixed $value): bool
 
     public function message(): string
     {
-        return trans('validationRules.positive_interval');
+        return __('validationRules::messages.positive_interval');
     }
 }
diff --git a/src/Rules/Price.php b/src/Rules/Price.php
@@ -12,8 +12,8 @@ public function __construct(
 
     public function passes(mixed $value): bool
     {
-        $requiresDecimals = ! is_null($this->decimalSign);
-        if (is_null($this->decimalSign)) {
+        $requiresDecimals = $this->decimalSign !== null;
+        if ($this->decimalSign === null) {
             $decimalSign = '(,|\.)?';
         } else {
             $decimalSign = '('.($this->decimalSign === '.' ? '\.' : $this->decimalSign).')';
@@ -30,13 +30,8 @@ public function passes(mixed $value): bool
 
     public function message(): string
     {
-        if (is_null($this->decimalSign)) {
-            return __('validationRules.price');
-        }
-
-        return sprintf(
-            __('validationRules.price_custom_decimal'),
-            $this->decimalSign
-        );
+        return $this->decimalSign === null
+            ? __('validationRules::messages.price')
+            : __('validationRules::messages.price_custom_decimal', ['separator' => $this->decimalSign]);
     }
 }
diff --git a/src/Rules/SecureUrl.php b/src/Rules/SecureUrl.php
@@ -17,6 +17,6 @@ public function passes(mixed $value): bool
 
     public function message(): string
     {
-        return trans('validationRules.secure_url');
+        return __('validationRules::messages.secure_url');
     }
 }
diff --git a/src/Rules/Semver.php b/src/Rules/Semver.php
@@ -23,6 +23,6 @@ public function passes(mixed $value): bool
 
     public function message(): string
     {
-        return trans('validationRules.semver');
+        return __('validationRules::messages.semver');
     }
 }
diff --git a/src/Rules/VatNumber.php b/src/Rules/VatNumber.php
@@ -59,6 +59,6 @@ public function passes(mixed $value): bool
 
     public function message(): string
     {
-        return __('validationRules.vat_number');
+        return __('validationRules::messages.vat_number');
     }
 }

Original file line number	Diff line number	Diff line change
`@@ -13,6 +13,6 @@ public function passes(mixed $value): bool`
`13`	`13`
`14`	`14`	`public function message(): string`
`15`	`15`	`{`
`16`		`- return __('validationRules.bic_number');`
	`16`	`+ return __('validationRules::messages.bic_number');`
`17`	`17`	`}`
`18`	`18`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,9 +21,6 @@ public function passes(mixed $value): bool`
`21`	`21`
`22`	`22`	`public function message(): string`
`23`	`23`	`{`
`24`		`- return sprintf(`
`25`		`- __('validationRules.contains'),`
`26`		`- $this->needle`
`27`		`- );`
	`24`	`+ return __('validationRules::messages.contains', ['value' => $this->needle]);`
`28`	`25`	`}`
`29`	`26`	`}`
Original file line number	Diff line number	Diff line change
`@@ -17,9 +17,6 @@ public function passes(mixed $value): bool`
`17`	`17`
`18`	`18`	`public function message(): string`
`19`	`19`	`{`
`20`		`- return sprintf(`
`21`		`- __('validationRules.contains_any'),`
`22`		`- implode(', ', $this->needles)`
`23`		`- );`
	`20`	`+ return __('validationRules::messages.contains_any', ['values' => implode(', ', $this->needles)]);`
`24`	`21`	`}`
`25`	`22`	`}`
Original file line number	Diff line number	Diff line change
`@@ -26,9 +26,6 @@ public function passes(mixed $value): bool`
`26`	`26`
`27`	`27`	`public function message(): string`
`28`	`28`	`{`
`29`		`- return sprintf(`
`30`		`- __('validationRules.date_before_or_equal'),`
`31`		`- $this->date->format('c')`
`32`		`- );`
	`29`	`+ return __('validationRules::messages.date_before_or_equal', ['date' => $this->date->format('c')]);`
`33`	`30`	`}`
`34`	`31`	`}`
Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,7 @@ public function passes(mixed $value): bool`
`28`	`28`
`29`	`29`	`public function message(): string`
`30`	`30`	`{`
`31`		`- return trans('validationRules.date_has_specific_minutes', [`
	`31`	`+ return __('validationRules::messages.date_has_specific_minutes', [`
`32`	`32`	`'minutes' => implode(', ', $this->allowedMinutes),`
`33`	`33`	`]);`
`34`	`34`	`}`