Skip to content

Fix Translator to merge shared and module translations #403

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
armanist merged 1 commit into from
Jan 13, 2026
Merged

Fix Translator to merge shared and module translations #403

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
56 changes: 33 additions & 23 deletions src/Libraries/Lang/Translator.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,10 +19,7 @@
use Quantum\App\Exceptions\BaseException;
use Quantum\Di\Exceptions\DiException;
use Dflydev\DotAccessData\Data;
use Quantum\Loader\Loader;
use Quantum\Loader\Setup;
use ReflectionException;
use Quantum\Di\Di;

/**
* Class Translator
Expand All @@ -46,7 +43,7 @@ public function __construct(string $lang)
}

/**
* Load translation file
* Load translation files
* @throws BaseException
* @throws ConfigException
* @throws DiException
Expand All @@ -55,38 +52,51 @@ public function __construct(string $lang)
*/
public function loadTranslations(): void
{

if ($this->translations !== null) {
return;
}

$langDir = modules_dir() . DS . current_module() . DS . 'resources' . DS . 'lang' . DS . $this->lang;
$files = fs()->glob($langDir . DS . '*.php');
$this->translations = new Data();
$loaded = false;

if (is_array($files) && !count($files)) {
$langDir = base_dir() . DS . 'shared' . DS . 'resources' . DS . 'lang' . DS . $this->lang;
$files = fs()->glob($langDir . DS . '*.php');
$sharedDir = base_dir() . DS . 'shared' . DS . 'resources' . DS . 'lang' . DS . $this->lang;
$sharedFiles = fs()->glob($sharedDir . DS . '*.php');

if (is_array($files) && !count($files)) {
throw LangException::translationsNotFound();
}
if (is_array($sharedFiles) && count($sharedFiles)) {
$this->loadFiles($sharedFiles);
$loaded = true;
}

$translations = [];
$moduleDir = modules_dir() . DS . current_module() . DS . 'resources' . DS . 'lang' . DS . $this->lang;
$moduleFiles = fs()->glob($moduleDir . DS . '*.php');

if (is_array($moduleFiles) && count($moduleFiles)) {
$this->loadFiles($moduleFiles);
$loaded = true;
}

if (!$loaded) {
throw LangException::translationsNotFound();
}
}

/**
* Load translations
* @param array $files
* @throws BaseException
* @throws ConfigException
* @throws DiException
* @throws ReflectionException
*/
private function loadFiles(array $files): void
{
foreach ($files as $file) {
$fileName = fs()->fileName($file);

$setup = new Setup();
$setup->setPathPrefix('resources' . DS . 'lang' . DS . $this->lang);
$setup->setFilename($fileName);
$setup->setHierarchy(true);

$translations[$fileName] = Di::get(Loader::class)->setup($setup)->load();
$this->translations->import([
$fileName => fs()->require($file),
]);
}

$this->translations = new Data();
$this->translations->import($translations);
}

/**
Expand Down