tonyair
/
silverstripe-framework
mirror of https://github.com/silverstripe/silverstripe-framework
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch '4.8' into 4.9

This commit is contained in:
Steve Boyd 2021-12-16 10:57:58 +13:00
parent 9ea608d0f2 dfd57a7217
commit d5f0c78262
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
foreach ($entitiesByModule as $module => $messages) {
// 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);
// Merge