Remove .source_strings.json before collecting

richardDobron · Apr 19, 2023 · 9ed58f7 · 9ed58f7
1 parent 80f1835
commit 9ed58f7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/fbt/Runtime/Shared/FbtHooks.php b/src/fbt/Runtime/Shared/FbtHooks.php
@@ -181,9 +181,7 @@ public static function storePhrases()
             $parentIds[$index] = self::savePhrase($phrase, $parentIds[$parentKey] ?? null);
         }
 
-        if (self::$sourceHashes) {
-            file_put_contents($file, json_encode(self::$sourceStrings), LOCK_EX);
-        }
+        file_put_contents($file, json_encode(self::$sourceStrings), LOCK_EX);
 
         FbtTransform::$childToParent = [];
         FbtTransform::$phrases = [];

diff --git a/src/fbt/Services/CollectFbtsService.php b/src/fbt/Services/CollectFbtsService.php
@@ -57,11 +57,16 @@ public function __construct()
     public function collectFromFiles(string $path, string $src, string $fbtCommonPath)
     {
         $fbtDir = $path . '/';
+        $file = $fbtDir . '.source_strings.json';
 
         if (! is_dir($fbtDir)) {
             mkdir($fbtDir, 0755, true);
         }
 
+        if (file_exists($file)) {
+            unlink($file);
+        }
+
         FbtConfig::set('path', $path);
         FbtConfig::set('fbtCommonPath', $fbtCommonPath);