Merge pull request #27 from atymic/fix-translations

fix: fix translations + update readme
spatie · Jun 13, 2019 · 2180a33 · 2180a33
2 parents afb93c0 + 90e51ba
commit 2180a33
Show file tree

Hide file tree

Showing 11 changed files with 22 additions and 15 deletions.
diff --git a/README.md b/README.md
@@ -18,6 +18,13 @@ composer require spatie/laravel-validation-rules
 
 The package will automatically register itself.
 
+### Translations
+
+If you wish to edit the package translations, you can run the following command to publish them into your `resources/lang` folder
+
+```bash
+php artisan vendor:publish --provider="Spatie\ValidationRules\ValidationRulesServiceProvider"
+```
 
 ## Available rules
 

diff --git a/resources/lang/en/validationRules.php → resources/lang/en/messages.php b/resources/lang/en/validationRules.php → resources/lang/en/messages.php
diff --git a/src/Rules/Authorized.php b/src/Rules/Authorized.php
@@ -45,7 +45,7 @@ public function message(): string
     {
         $classBasename = class_basename($this->className);
 
-        return __('validation.authorized', [
+        return __('validationRules::messages.authorized', [
             'attribute' => $this->attribute,
             'ability' => $this->ability,
             'className' => $classBasename,

diff --git a/src/Rules/CountryCode.php b/src/Rules/CountryCode.php
@@ -40,7 +40,7 @@ public function passes($attribute, $value): bool
 
     public function message(): string
     {
-        return __('validation.country_code', [
+        return __('validationRules::messages.country_code', [
             'attribute' => $this->attribute,
         ]);
     }

diff --git a/src/Rules/Delimited.php b/src/Rules/Delimited.php
@@ -87,7 +87,7 @@ public function passes($attribute, $value)
 
         if (! is_null($this->minimum)) {
             if ($items->count() < $this->minimum) {
-                $this->message = __('validation.delimited.min', [
+                $this->message = __('validationRules::messages.delimited.min', [
                     'minimum' => $this->minimum,
                     'actual' => $items->count(),
                     'item' => Str::plural($this->validationMessageWord, $items->count()),
@@ -99,7 +99,7 @@ public function passes($attribute, $value)
 
         if (! is_null($this->maximum)) {
             if ($items->count() > $this->maximum) {
-                $this->message = __('validation.delimited.max', [
+                $this->message = __('validationRules::messages.delimited.max', [
                     'maximum' => $this->maximum,
                     'actual' => $items->count(),
                     'item' => Str::plural($this->validationMessageWord, $items->count()),
@@ -127,7 +127,7 @@ public function passes($attribute, $value)
 
         if (! $this->allowDuplicates) {
             if ($items->unique()->count() !== $items->count()) {
-                $this->message = __('validation.delimited.unique');
+                $this->message = __('validationRules::messages.delimited.unique');
 
                 return false;
             }

diff --git a/src/Rules/Enum.php b/src/Rules/Enum.php
@@ -28,7 +28,7 @@ public function message(): string
     {
         $validValues = implode(', ', $this->validValues);
 
-        return __('validation.enum', [
+        return __('validationRules::messages.enum', [
             'attribute' => $this->attribute,
             'validValues' => $validValues,
         ]);

diff --git a/src/Rules/ModelsExist.php b/src/Rules/ModelsExist.php
@@ -44,7 +44,7 @@ public function message(): string
 
         $classBasename = class_basename($this->modelClassName);
 
-        return __('validation.model_ids', [
+        return __('validationRules::messages.model_ids', [
             'attribute' => $this->attribute,
             'model' => $classBasename,
             'modelAttribute' => $this->modelAttribute,

diff --git a/tests/Rules/AuthorizedTest.php b/tests/Rules/AuthorizedTest.php
@@ -81,8 +81,8 @@ public function it_will_return_false_if_the_gate_returns_false()
     public function it_passes_attribute_ability_and_class_name_to_the_validation_message()
     {
         Lang::addLines([
-            'validation.authorized' => ':attribute :ability and :className',
-        ], Lang::getLocale());
+            'messages.authorized' => ':attribute :ability and :className',
+        ], Lang::getLocale(), 'validationRules');
 
         $rule = new Authorized('edit', TestModel::class);
 

diff --git a/tests/Rules/CountryCodeTest.php b/tests/Rules/CountryCodeTest.php
@@ -44,8 +44,8 @@ public function it_can_be_a_nullable_country_code_field()
     public function it_passes_the_attribute_name_to_the_validation_message()
     {
         Lang::addLines([
-            'validation.country_code' => ':attribute',
-        ], Lang::getLocale());
+            'messages.country_code' => ':attribute',
+        ], Lang::getLocale(), 'validationRules');
 
         $rule = new CountryCode();
 

diff --git a/tests/Rules/EnumTest.php b/tests/Rules/EnumTest.php
@@ -22,8 +22,8 @@ public function it_will_return_true_for_a_value_that_is_part_of_the_enum()
     public function it_passes_attribute_and_valid_values_to_the_validation_message()
     {
         Lang::addLines([
-            'validation.enum' => ':attribute :validValues',
-        ], Lang::getLocale());
+            'messages.enum' => ':attribute :validValues',
+        ], Lang::getLocale(), 'validationRules');
 
         $rule = new Enum(TestEnum::class);
 

diff --git a/tests/Rules/ModelsExistTest.php b/tests/Rules/ModelsExistTest.php
@@ -42,8 +42,8 @@ public function it_can_validate_existence_of_models_by_column()
     public function it_passes_relevant_data_to_the_validation_message()
     {
         Lang::addLines([
-            'validation.model_ids' => ':attribute :model :modelAttribute :modelIds',
-        ], Lang::getLocale());
+            'messages.model_ids' => ':attribute :model :modelAttribute :modelIds',
+        ], Lang::getLocale(), 'validationRules');
 
         $rule = new ModelsExist(User::class, 'id');