fix: bugs

refactor: Improve covering weird keys

Author: kargnas

src/AI/AIProvider.php

@@ -29,11 +29,14 @@ public function __construct(
     }
 
     protected function verify(array $list): void {
-        $sourceKeys = collect($this->strings)->keys()->unique()->sort()->values()->toArray();
-        $resultKeys = collect($list)->pluck('key')->unique()->sort()->values()->toArray();
+        $sourceKeys = collect($this->strings)->keys()->unique()->sort()->values();
+        $resultKeys = collect($list)->pluck('key')->unique()->sort()->values();
 
-        if ($sourceKeys !== $resultKeys) {
-            throw new VerifyFailedException("Failed to translate the string. The keys are not matched. (Source: " . implode(', ', $sourceKeys) . ") (Result: " . implode(', ', $resultKeys) . ")");
+        $diff = $sourceKeys->diff($resultKeys);
+
+        if ($diff->count() > 0) {
+//            \Log::error("Failed to translate the string. The keys are not matched. (Diff: {$diff->implode(', ')})");
+            throw new VerifyFailedException("Failed to translate the string. The keys are not matched. (Diff: {$diff->implode(', ')})");
         }
 
         foreach ($list as $item) {
@@ -71,7 +74,7 @@ protected function getUserPrompt($replaces = []) {
             'targetLanguage' => $this->targetLanguage,
             'filename' => $this->filename,
             'parentKey' => basename($this->filename, '.php'),
-            'keys' => collect($this->strings)->keys()->implode(", "),
+            'keys' => collect($this->strings)->keys()->implode("`, `"),
             'strings' => collect($this->strings)->map(function ($string, $key) {
                 if (is_string($string)) {
                     return "  - `{$key}`: \"\"\"{$string}\"\"\"";

src/AI/prompt-system.txt

@@ -23,6 +23,7 @@ Follow these additional rules:
 - Keep the length almost the same.
 - Keep the words forms same. Don't change the tense or form of the words.
 - Don't translate codes(`code`), variables, commands(/command), placeholders, and html tags.
+- Keep the html codes like <0>, </0>, <1>, </1>. Don't remove.
 - For time expressions:
   - Translate time-related phrases like "Updated at :time" by adjusting the variable position to fit the target language's natural word order while preserving the meaning.
 - For count expressions:

src/AI/prompt-user.txt

@@ -6,6 +6,7 @@ The most important mission: All strings should be translated into {targetLanguag
 
 # Content
 - Parent key (Only for your reference, don't put to the key): `{parentKey}`
-- To make sure, the keys you should translate are: {keys}
+- To make sure, the keys you should translate are: `{keys}`
+- [CRITICAL] Sometimes key has double quotes, '’', '"', '{', '}', ':' or other special characters. You should keep them in the translation.
 - These are the strings that you should translate into the target language. The source strings: (e.g. `key`: """(value)""")
 {strings}

src/Console/TranslateCrowdin.php

@@ -312,6 +312,9 @@ public function translate() {
                 $this->line("      Retrieving strings...");
                 $allStrings = $this->getAllSourceString($this->selectedProject['id'], $file['id']);
 
+                $this->line("      Retrieving translations...");
+                $allTranslations = $this->getAllLanguageTranslations($this->selectedProject['id'], $file['id'], $targetLanguage['id']);
+
                 $this->line("      Retrieving approvals...");
                 $approvals = $this->getApprovals($this->selectedProject['id'], $file['id'], $targetLanguage['id']);
 
@@ -338,17 +341,21 @@ public function translate() {
                 });
 
                 $untranslatedStrings = $allStrings
-                    ->filter(function (SourceString $sourceString) use ($approvals) {
+                    ->filter(function (SourceString $sourceString) use ($approvals, $allTranslations) {
                         if (!$sourceString->getIdentifier()) return false;
 
                         if ($sourceString->isHidden()) {
-//                                $this->line("      Skip: {$sourceString->getIdentifier()}: {$sourceString->getText()} (hidden)");
+//                            $this->line("      Skip: {$sourceString->getIdentifier()}: {$sourceString->getText()} (hidden)");
                             return false;
                         }
 
-                        if (!$approvals->filter(fn(StringTranslationApproval $ap) => $ap->getStringId() == $sourceString->getId())->isEmpty()) {
-//                                $this->line("      Skip: {$sourceString->getIdentifier()}: {$sourceString->getText()} (approved)");
-                            return false;
+                        $approved = $approvals->filter(fn(StringTranslationApproval $ap) => $ap->getStringId() == $sourceString->getId());
+                        if ($approved->count() > 0) {
+                            $translation = $allTranslations->filter(fn(LanguageTranslation $t) => $t->getTranslationId() == $approved->first()->getTranslationId())->first();
+                            if ($translation) {
+                                $this->line("      Skip: {$sourceString->getIdentifier()}: {$sourceString->getText()} (approved)");
+                                return false;
+                            }
                         }
 
                         return true;
@@ -397,6 +404,10 @@ public function translate() {
 
                         foreach ($translated as $item) {
                             $targetString = $untranslatedStrings->where('identifier', $item->key)->first();
+                            if (!$targetString) {
+                                $this->info("Skipping translation: {$item->key} (Not found)");
+                                continue;
+                            }
 
                             $existsTranslations = $this->getAllTranslations($this->selectedProject['id'], $targetString['id'], $targetLanguage['id']);
                             $existsTranslations = $existsTranslations->sortByDesc(fn(StringTranslation $t) => Carbon::make($t->getDataProperty('created_at')))->values();