Merge pull request #42 from Laravel-Lang/1.x

Fixed an error in installing and deleting unprotected localizations
Laravel-Lang · Nov 6, 2024 · 5914712 · 5914712
2 parents f459170 + 4f70a65
commit 5914712
Show file tree

Hide file tree

Showing 6 changed files with 29 additions and 4 deletions.
diff --git a/src/HasTranslations.php b/src/HasTranslations.php
@@ -33,8 +33,14 @@ trait HasTranslations
 
     public function translations(): HasMany
     {
-        return $this->hasMany($this->translationModelName(), 'item_id')
-            ->tap(new FilterTranslationsScope());
+        return $this->translationsRaw()->tap(
+            new FilterTranslationsScope()
+        );
+    }
+
+    public function translationsRaw(): HasMany
+    {
+        return $this->hasMany($this->translationModelName(), 'item_id');
     }
 
     public function hasTranslated(string $column, Locale|LocaleData|string|null $locale = null): bool

diff --git a/src/ServiceProvider.php b/src/ServiceProvider.php
@@ -33,6 +33,6 @@ protected function bootCommands(): void
 
     protected function registry(): void
     {
-        $this->app->singleton(Registry::class, fn () => new Registry());
+        $this->app->singleton(Registry::class);
     }
 }
diff --git a/src/Services/Attribute.php b/src/Services/Attribute.php
@@ -96,7 +96,7 @@ public function forget(): Model
 
     public function forgetAll(): Model
     {
-        $this->model->translations()->delete();
+        $this->model->translationsRaw()->delete();
 
         Relation::clear($this->model);
 

diff --git a/src/Services/Relation.php b/src/Services/Relation.php
@@ -28,6 +28,10 @@ public static function initialize(Model $model): Model
 
     public static function initializeLocale(Model $model, LocaleData $locale): Translation
     {
+        if ($item = $model->translationsRaw()->where('locale', $locale->code)->first()) {
+            return static::setAttributes($model, $item, $locale);
+        }
+
         return static::setAttributes($model, new (static::modelName($model))(), $locale);
     }
 

diff --git a/tests/Unit/Models/ForgetTest.php b/tests/Unit/Models/ForgetTest.php
@@ -17,11 +17,13 @@
         FakeValue::ColumnTitle => [
             FakeValue::LocaleMain     => 'qwerty 10',
             FakeValue::LocaleFallback => 'qwerty 11',
+            FakeValue::LocaleCustom   => 'qwerty 12',
         ],
 
         FakeValue::ColumnDescription => [
             FakeValue::LocaleMain     => 'qwerty 20',
             FakeValue::LocaleFallback => 'qwerty 21',
+            FakeValue::LocaleCustom   => 'qwerty 22',
         ],
     ])
 );
@@ -67,25 +69,33 @@
 
     expect($model->hasTranslated(FakeValue::ColumnTitle, FakeValue::LocaleMain))->toBeTrue();
     expect($model->hasTranslated(FakeValue::ColumnTitle, FakeValue::LocaleFallback))->toBeTrue();
+    expect($model->hasTranslated(FakeValue::ColumnTitle, FakeValue::LocaleCustom))->toBeTrue();
     expect($model->hasTranslated(FakeValue::ColumnDescription, FakeValue::LocaleMain))->toBeTrue();
     expect($model->hasTranslated(FakeValue::ColumnDescription, FakeValue::LocaleFallback))->toBeTrue();
+    expect($model->hasTranslated(FakeValue::ColumnDescription, FakeValue::LocaleCustom))->toBeTrue();
 
     expect($model->getTranslation(FakeValue::ColumnTitle, FakeValue::LocaleMain))->toBe('qwerty 10');
     expect($model->getTranslation(FakeValue::ColumnTitle, FakeValue::LocaleFallback))->toBe('qwerty 11');
+    expect($model->getTranslation(FakeValue::ColumnTitle, FakeValue::LocaleCustom))->toBe('qwerty 12');
     expect($model->getTranslation(FakeValue::ColumnDescription, FakeValue::LocaleMain))->toBe('qwerty 20');
     expect($model->getTranslation(FakeValue::ColumnDescription, FakeValue::LocaleFallback))->toBe('qwerty 21');
+    expect($model->getTranslation(FakeValue::ColumnDescription, FakeValue::LocaleCustom))->toBe('qwerty 22');
 
     $model->forgetAllTranslations();
 
     expect($model->hasTranslated(FakeValue::ColumnTitle, FakeValue::LocaleMain))->toBeFalse();
     expect($model->hasTranslated(FakeValue::ColumnTitle, FakeValue::LocaleFallback))->toBeFalse();
+    expect($model->hasTranslated(FakeValue::ColumnTitle, FakeValue::LocaleCustom))->toBeFalse();
     expect($model->hasTranslated(FakeValue::ColumnDescription, FakeValue::LocaleMain))->toBeFalse();
     expect($model->hasTranslated(FakeValue::ColumnDescription, FakeValue::LocaleFallback))->toBeFalse();
+    expect($model->hasTranslated(FakeValue::ColumnDescription, FakeValue::LocaleCustom))->toBeFalse();
 
     expect($model->getTranslation(FakeValue::ColumnTitle, FakeValue::LocaleMain))->toBeNull();
     expect($model->getTranslation(FakeValue::ColumnTitle, FakeValue::LocaleFallback))->toBeNull();
+    expect($model->getTranslation(FakeValue::ColumnTitle, FakeValue::LocaleCustom))->toBeNull();
     expect($model->getTranslation(FakeValue::ColumnDescription, FakeValue::LocaleMain))->toBeNull();
     expect($model->getTranslation(FakeValue::ColumnDescription, FakeValue::LocaleFallback))->toBeNull();
+    expect($model->getTranslation(FakeValue::ColumnDescription, FakeValue::LocaleCustom))->toBeNull();
 
     assertDatabaseMissing(TestModelTranslation::class, [
         'item_id' => $model->id,

diff --git a/workbench/app/Models/TestModel.php b/workbench/app/Models/TestModel.php
@@ -6,6 +6,7 @@
 
 use Illuminate\Database\Eloquent\Collection;
 use Illuminate\Database\Eloquent\Model;
+use Illuminate\Database\Eloquent\Relations\HasMany;
 use Illuminate\Database\Eloquent\SoftDeletes;
 use LaravelLang\Models\HasTranslations;
 
@@ -14,6 +15,10 @@
  * @property string|null $title
  * @property string|null $description
  * @property Collection<TestModelTranslation> $translations
+ * @property Collection<TestModelTranslation> $translationsRaw
+ *
+ * @method  HasMany translations
+ * @method HasMany translationsRaw()
  */
 class TestModel extends Model
 {