Skip to content

Commit e4d45c9

Browse files
committed
Language separation
1 parent 4fa8163 commit e4d45c9

File tree

3 files changed

+26
-8
lines changed

3 files changed

+26
-8
lines changed

bin/drupal.php

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,13 @@
3636

3737
$consoleRoot = __DIR__.'/../';
3838

39+
// Drupal installed with composer
40+
if(is_dir(__DIR__.'/../../../../web/')) {
41+
$drupalRoot = __DIR__ . '/../../../../web/';
42+
} else {
43+
$drupalRoot = __DIR__ . '/../../../../';
44+
}
45+
3946
if (file_exists($consoleRoot.'vendor/autoload.php')) {
4047
$autoload = include_once $consoleRoot.'vendor/autoload.php';
4148
} elseif (file_exists($consoleRoot.'../../autoload.php')) {
@@ -61,11 +68,10 @@
6168
AnnotationRegistry::registerLoader([$autoload, "loadClass"]);
6269

6370
$config = $container->get('config');
64-
$container->get('translator')
65-
->loadResource($config->get('application.language'), $consoleRoot);
71+
$container->get('translator')->loadResource($config->get('application.language'), $consoleRoot, $drupalRoot);
6672

6773
$translatorHelper = new TranslatorHelper();
68-
$translatorHelper->loadResource($config->get('application.language'), $consoleRoot);
74+
$translatorHelper->loadResource($config->get('application.language'), $consoleRoot, $drupalRoot);
6975

7076
$helpers = [
7177
'nested-array' => new NestedArrayHelper(),

src/Helper/TranslatorHelper.php

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -63,16 +63,21 @@ private function addLoader($loader, $name = 'yaml')
6363
/**
6464
* @param $language
6565
* @param $directoryRoot
66+
* @param $drupalRoot
6667
*/
67-
public function loadResource($language, $directoryRoot)
68+
public function loadResource($language, $directoryRoot, $drupalRoot)
6869
{
6970
$this->language = $language;
7071
$this->translator = new Translator($this->language);
7172
$this->addLoader(new ArrayLoader(), 'array');
7273
$this->addLoader(new YamlFileLoader(), 'yaml');
7374

74-
$languageDirectory = $directoryRoot . 'config/translations/' . $language;
75-
if (!is_dir($languageDirectory)) {
75+
if($language != 'en') {
76+
$languageDirectory = $drupalRoot . 'console/language/' . $language;
77+
if (!is_dir($languageDirectory)) {
78+
$languageDirectory = $directoryRoot . 'config/translations/en';
79+
}
80+
} else {
7681
$languageDirectory = $directoryRoot . 'config/translations/en';
7782
}
7883

src/Utils/Translator.php

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,8 +80,9 @@ private function addLoader($loader, $name = 'yaml')
8080
/**
8181
* @param $language
8282
* @param $directoryRoot
83+
* @param $drupalRoot
8384
*/
84-
public function loadResource($language, $directoryRoot)
85+
public function loadResource($language, $directoryRoot, $drupalRoot)
8586
{
8687
$this->language = $language;
8788
$this->translator = new BaseTranslator($this->language);
@@ -90,9 +91,15 @@ public function loadResource($language, $directoryRoot)
9091

9192
$languageDirectory = $directoryRoot . 'config/translations/' . $language;
9293

93-
if (!is_dir($languageDirectory)) {
94+
if($language != 'en') {
95+
$languageDirectory = $drupalRoot . 'console/language/' . $language;
96+
if (!is_dir($languageDirectory)) {
97+
$languageDirectory = $directoryRoot . 'config/translations/en';
98+
}
99+
} else {
94100
$languageDirectory = $directoryRoot . 'config/translations/en';
95101
}
102+
96103
$finder = new Finder();
97104
$finder->files()
98105
->name('*.yml')

0 commit comments

Comments
 (0)