tonyair/silverstripe-framework
1
0
Fork 0
mirror of https://github.com/silverstripe/silverstripe-framework synced 2024-10-22 14:05:37 +02:00
Code Issues Projects Releases Wiki Activity

Merge pull request #10179 from creative-commoners/pulls/4.8/textcollect

Browse Source 
FIX Look for existing modules in vendor folder rather than base folder
This commit is contained in:
Maxime Rainville 2021-12-16 10:31:38 +13:00 committed by GitHub
commit dfd57a7217
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/i18n/TextCollection/i18nTextCollector.php
View File

@ -372,7 +372,7 @@ class i18nTextCollector
// For each module do a simple merge of the default yml with these strings // For each module do a simple merge of the default yml with these strings
foreach ($entitiesByModule as $module => $messages) { foreach ($entitiesByModule as $module => $messages) {
// Load existing localisations // Load existing localisations
$masterFile = "{$this->basePath}/{$module}/lang/{$this->defaultLocale}.yml"; $masterFile = "{$this->basePath}/vendor/{$module}/lang/{$this->defaultLocale}.yml";
$existingMessages = $this->getReader()->read($this->defaultLocale, $masterFile); $existingMessages = $this->getReader()->read($this->defaultLocale, $masterFile);
// Merge // Merge