adjust tests

atk4 · Oct 3, 2021 · 8ba1784 · 8ba1784
1 parent f3ddfeb
commit 8ba1784
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 90 deletions.
diff --git a/src/Translator/Adapter/Generic.php b/src/Translator/Adapter/Generic.php
@@ -6,7 +6,6 @@
 
 use Atk4\Core\ConfigTrait;
 use Atk4\Core\Translator\ITranslatorAdapter;
-use Atk4\Data\Locale;
 
 class Generic implements ITranslatorAdapter
 {
@@ -83,32 +82,14 @@ protected function processMessagePlural($definition, array $parameters = [], int
      */
     protected function getDefinition(string $message, string $domain, ?string $locale)
     {
-        $this->loadDefinitionAtk($locale); // need to be called before manual add
-
         return $this->definitions[$locale][$domain][$message] ?? null;
     }
 
-    protected function loadDefinitionAtk(string $locale): void
-    {
-        if (isset($this->definitions[$locale]['atk'])) {
-            return;
-        }
-
-        $this->definitions[$locale]['atk'] = [];
-
-        if (class_exists(\Atk4\Data\Locale::class)) {
-            $path = Locale::getPath();
-            $this->addDefinitionFromFile($path . '/' . $locale . '/atk.php', $locale, 'atk', 'php');
-        }
-    }
-
     /**
      * Load definitions from file.
      */
     public function addDefinitionFromFile(string $file, string $locale, string $domain, string $format): void
     {
-        $this->loadDefinitionAtk($locale); // need to be called before manual add
-
         $this->readConfig($file, $format);
 
         $this->definitions = array_replace_recursive(
@@ -132,8 +113,6 @@ public function addDefinitionFromFile(string $file, string $locale, string $doma
      */
     public function setDefinitionSingle(string $key, $definition, string $locale = 'en', string $domain = 'atk')
     {
-        $this->loadDefinitionAtk($locale); // need to be called before manual add
-
         if (is_string($definition)) {
             $definition = [$definition];
         }

diff --git a/tests/LocalizationTest.php b/tests/LocalizationTest.php
diff --git a/tests/Translator/AdapterGenericTest.php b/tests/Translator/AdapterGenericTest.php
@@ -8,7 +8,6 @@
 use Atk4\Core\TranslatableTrait;
 use Atk4\Core\Translator\Adapter\Generic;
 use Atk4\Core\Translator\Translator;
-use Atk4\Data\Locale;
 
 class AdapterGenericTest extends AdapterTestBase
 {
@@ -60,9 +59,6 @@ public function testAdapter(): void
     {
         $adapter = new Generic();
 
-        // just to cover method addDefinitionFromFile
-        $adapter->addDefinitionFromFile(Locale::getPath() . '/en/atk.php', 'en', 'atk', 'php');
-
         $adapter->setDefinitionSingle('test', 'custom definition', 'en', 'other');
 
         Translator::instance()->setAdapter($adapter);