mirror/php-flarum
1
0
Fork 0
mirror of https://github.com/flarum/core.git synced 2025-08-02 14:37:49 +02:00
Code Issues Releases Wiki Activity

Support module prefixing of locale resources

Browse Source 
In preparation for upcoming changes, allow locale resources to have a module prefix added when they are loaded from a file.
This commit is contained in:
Toby Zerner
2016-11-28 11:28:10 +10:30
parent e84dd3fee3
commit 39adb0f223
4 changed files with 42 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
framework/core/src/Http/WebApp/AbstractWebApp.php
View File

@@ -95,7 +95,7 @@ abstract class AbstractWebApp
*/ */
protected function getTranslationFilter() protected function getTranslationFilter()
{ {
return '/^[^\.]+\.(?:'.$this->getName().'|lib)\./'; return '/^.+(?:\.|::)(?:'.$this->getName().'|lib)\./';
} }
/** /**

6
framework/core/src/Locale/LocaleManager.php
View File

@@ -58,9 +58,11 @@ class LocaleManager
return isset($this->locales[$locale]); return isset($this->locales[$locale]);
} }
public function addTranslations($locale, $file) public function addTranslations($locale, $file, $module = null)
{ {
$this->translator->addResource('yaml', $file, $locale); $prefix = $module ? $module.'::' : '';
$this->translator->addResource('prefixed_yaml', compact('file', 'prefix'), $locale);
} }
public function addJsFile($locale, $js) public function addJsFile($locale, $js)

2
framework/core/src/Locale/LocaleServiceProvider.php
View File

@@ -43,7 +43,7 @@ class LocaleServiceProvider extends AbstractServiceProvider
$translator = new Translator($defaultLocale, new MessageSelector()); $translator = new Translator($defaultLocale, new MessageSelector());
$translator->setFallbackLocales([$defaultLocale, 'en']); $translator->setFallbackLocales([$defaultLocale, 'en']);
$translator->addLoader('yaml', new YamlFileLoader()); $translator->addLoader('prefixed_yaml', new PrefixedYamlFileLoader());
return $translator; return $translator;
}); });

36
framework/core/src/Locale/PrefixedYamlFileLoader.php Normal file
View File

@@ -0,0 +1,36 @@
<?php
/*
* This file is part of Flarum.
*
* (c) Toby Zerner <toby.zerner@gmail.com>
*
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*/
namespace Flarum\Locale;
use Symfony\Component\Translation\Loader\YamlFileLoader;
class PrefixedYamlFileLoader extends YamlFileLoader
{
/**
* {@inheritdoc}
*/
public function load($resource, $locale, $domain = 'messages')
{
$catalogue = parent::load($resource['file'], $locale, $domain);
if (! empty($resource['prefix'])) {
$messages = $catalogue->all($domain);
$prefixedKeys = array_map(function ($k) use ($resource) {
return $resource['prefix'].$k;
}, array_keys($messages));
$catalogue->replace(array_combine($prefixedKeys, $messages));
}
return $catalogue;
}
}