#10378: Improved calculating version hash for the js-translation.json file

Author: ishakhsuvarov

app/code/Magento/Translation/Model/FileManager.php

@@ -6,6 +6,8 @@
 namespace Magento\Translation\Model;
 
 use Magento\Framework\App\Filesystem\DirectoryList;
+use Magento\Framework\App\ObjectManager;
+use Magento\Translation\Model\Inline\File as TranslationFile;
 
 /**
  * A service for handling Translation config files
@@ -17,28 +19,42 @@ class FileManager
      */
     const TRANSLATION_CONFIG_FILE_NAME = 'Magento_Translation/js/i18n-config.js';
 
-    /** @var \Magento\Framework\View\Asset\Repository */
+    /**
+     * @var \Magento\Framework\View\Asset\Repository
+     */
     private $assetRepo;
 
-    /** @var \Magento\Framework\App\Filesystem\DirectoryList */
+    /**
+     * @var \Magento\Framework\App\Filesystem\DirectoryList
+     */
     private $directoryList;
 
-    /** @var \Magento\Framework\Filesystem\Driver\File */
+    /**
+     * @var \Magento\Framework\Filesystem\Driver\File
+     */
     private $driverFile;
 
+    /**
+     * @var TranslationFile
+     */
+    private $translationFile;
+
     /**
      * @param \Magento\Framework\View\Asset\Repository $assetRepo
-     * @param \Magento\Framework\App\Filesystem\DirectoryList $directoryList,
-     * @param \Magento\Framework\Filesystem\Driver\File $driverFile,
+     * @param \Magento\Framework\App\Filesystem\DirectoryList $directoryList
+     * @param \Magento\Framework\Filesystem\Driver\File $driverFile
+     * @param TranslationFile $translationFile
      */
     public function __construct(
         \Magento\Framework\View\Asset\Repository $assetRepo,
         \Magento\Framework\App\Filesystem\DirectoryList $directoryList,
-        \Magento\Framework\Filesystem\Driver\File $driverFile
+        \Magento\Framework\Filesystem\Driver\File $driverFile,
+        \Magento\Translation\Model\Inline\File $translationFile = null
     ) {
         $this->assetRepo = $assetRepo;
         $this->directoryList = $directoryList;
         $this->driverFile = $driverFile;
+        $this->translationFile = $translationFile ?: ObjectManager::getInstance()->get(TranslationFile::class);
     }
 
     /**
@@ -111,12 +127,11 @@ public function updateTranslationFileContent($content)
     public function getTranslationFileVersion()
     {
         $translationFile = $this->getTranslationFileFullPath();
-        $translationFileHash = '';
-
-        if ($this->driverFile->isExists($translationFile)) {
-            $translationFileHash = sha1_file($translationFile);
+        if (!$this->driverFile->isExists($translationFile)) {
+            $this->updateTranslationFileContent($this->translationFile->getTranslationFileContent());
         }
 
+        $translationFileHash = sha1_file($translationFile);
         return sha1($translationFileHash . $this->getTranslationFilePath());
     }
 }

app/code/Magento/Translation/Model/Inline/File.php

@@ -0,0 +1,56 @@
+<?php
+/**
+ * Copyright © Magento, Inc. All rights reserved.
+ * See COPYING.txt for license details.
+ */
+namespace Magento\Translation\Model\Inline;
+
+/**
+ * Prepares content of inline translations file.
+ */
+class File
+{
+    /**
+     * @var \Magento\Framework\Translate\ResourceInterface
+     */
+    private $translateResource;
+
+    /**
+     * @var \Magento\Framework\Locale\ResolverInterface
+     */
+    private $localeResolver;
+
+    /**
+     * @var \Magento\Framework\Serialize\Serializer\Json
+     */
+    private $jsonSerializer;
+
+    /**
+     * Initialize dependencies
+     *
+     * @param \Magento\Framework\Translate\ResourceInterface $translateResource
+     * @param \Magento\Framework\Locale\ResolverInterface $localeResolver
+     * @param \Magento\Framework\Serialize\Serializer\Json $jsonSerializer
+     */
+    public function __construct(
+        \Magento\Framework\Translate\ResourceInterface $translateResource,
+        \Magento\Framework\Locale\ResolverInterface $localeResolver,
+        \Magento\Framework\Serialize\Serializer\Json $jsonSerializer
+    ) {
+        $this->translateResource = $translateResource;
+        $this->localeResolver = $localeResolver;
+        $this->jsonSerializer = $jsonSerializer;
+    }
+
+    /**
+     * Generate translation file content for the current locale.
+     *
+     * @return string
+     */
+    public function getTranslationFileContent()
+    {
+        $translations = $this->translateResource->getTranslationArray(null, $this->localeResolver->getLocale());
+        $translations = $this->jsonSerializer->serialize($translations);
+        return $translations;
+    }
+}