add missing phrases related to issues MohmmedAshraf#111

digitalcraftlabs · Jan 13, 2025 · 72ce93e · 72ce93e
1 parent 779348a
commit 72ce93e
Show file tree

Hide file tree

Showing 6 changed files with 160 additions and 67 deletions.
diff --git a/config/translations.php b/config/translations.php
@@ -73,6 +73,6 @@
     |
     */
     'exclude_files' => [
-        //'validation.php', // Exclude default validation for example.
+        // 'validation.php', // Exclude default validation for example.
     ],
 ];
diff --git a/database/migrations/create_phrases_table.php b/database/migrations/create_phrases_table.php
@@ -21,7 +21,7 @@ public function up(): void
     {
         Schema::create('ltu_phrases', function (Blueprint $table) {
             $table->id();
-            $table->char('uuid', 36);;
+            $table->char('uuid', 36);
             $table->foreignIdFor(Translation::class)->constrained('ltu_translations')->cascadeOnDelete();
             $table->foreignIdFor(TranslationFile::class)->constrained('ltu_translation_files')->cascadeOnDelete();
             $table->foreignIdFor(Phrase::class)->nullable()->constrained('ltu_phrases')->cascadeOnDelete();

diff --git a/src/Actions/SyncPhrasesAction.php b/src/Actions/SyncPhrasesAction.php
@@ -1,12 +1,12 @@
 <?php
 
-namespace Outhebox\TranslationsUI\Actions;
+namespace App\Actions;
 
 use Outhebox\TranslationsUI\Models\Language;
 use Outhebox\TranslationsUI\Models\Translation;
 use Outhebox\TranslationsUI\Models\TranslationFile;
 
-class SyncPhrasesAction
+class SyncPhrasesActionForked
 {
     public static function execute(Translation $source, $key, $value, $locale, $file): void
     {
@@ -44,7 +44,9 @@ public static function execute(Translation $source, $key, $value, $locale, $file
         ], [
             'value' => (empty($value) ? null : $value),
             'parameters' => getPhraseParameters($value),
-            'phrase_id' => $translation->source ? null : $source->phrases()->where('key', $key)->first()?->id,
+            'phrase_id' => $translation->source ? null : $source->phrases()->where('translation_file_id', $translationFile->id)
+                ->where('group', $translationFile->name)
+                ->where('key', $key)->first()?->id,
         ]);
     }
 }
diff --git a/src/Console/Commands/ImportTranslationsCommand.php b/src/Console/Commands/ImportTranslationsCommand.php
@@ -133,7 +133,7 @@ public function syncMissingTranslations(Translation $source, string $locale): vo
         $source->load('phrases.translation', 'phrases.file');
 
         $source->phrases->each(function ($phrase) use ($translation, $locale) {
-            if (! $translation->phrases()->where('key', $phrase->key)->first()) {
+            if (! $translation->phrases()->where('group', $phrase->group)->where('key', $phrase->key)->first()) {
                 $fileName = $phrase->file->name.'.'.$phrase->file->extension;
 
                 if ($phrase->file->name === config('translations.source_language')) {

diff --git a/tests/TestCase.php b/tests/TestCase.php
@@ -46,8 +46,8 @@ protected function setUp(): void
     protected function refreshTestDatabase(): void
     {
         if (! RefreshDatabaseState::$migrated) {
-            //$this->artisan('vendor:publish', ['--tag' => 'mixpost-migrations', '--force' => true])->run();
-            //$this->artisan('migrate:fresh', $this->migrateFreshUsing());
+            // $this->artisan('vendor:publish', ['--tag' => 'mixpost-migrations', '--force' => true])->run();
+            // $this->artisan('migrate:fresh', $this->migrateFreshUsing());
 
             $this->app[Kernel::class]->setArtisan(null);