Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2026-07-05 23:39:16 +02:00
Code Issues Packages Projects Releases Activity

Updated changelog

Browse Source
This commit is contained in:
Andy Miller
2019-02-01 19:02:16 -07:00
parent b111a2c29d
commit cebe28e591
2 changed files with 31 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
CHANGELOG.md
View File

@@ -6,7 +6,8 @@
* Added `LogViewer` helper class and CLI command: `bin/grav logviewer`
1. [](#improved)
* Improved error detection for broken Flex Objects
* Removed apc and xcache support, made apc alias of apcu
* Removed `apc` and `xcache` support, made `apc` alias of `apcu`
* Support admin and regular translations via the `|t` twig filter and `t()` twig function
1. [](#bugfix)
* Fixed non-namespaced exceptions in scheduler
* Fixed trailing slash redirect in multlang environment [#2350](https://github.com/getgrav/grav/issues/2350)

33
system/src/Grav/Common/Twig/TwigExtension.php
View File

@@ -103,7 +103,7 @@ class TwigExtension extends \Twig_Extension implements \Twig_Extension_GlobalsIn
new \Twig_SimpleFilter('yaml_decode', [$this, 'yamlDecodeFilter']),
// Translations
new \Twig_SimpleFilter('t', [$this, 'translate']),
new \Twig_SimpleFilter('t', [$this, 'translate'], ['needs_environment' => true]),
new \Twig_SimpleFilter('tl', [$this, 'translateLanguage']),
new \Twig_SimpleFilter('ta', [$this, 'translateArray']),
@@ -166,7 +166,7 @@ class TwigExtension extends \Twig_Extension implements \Twig_Extension_GlobalsIn
// Translations
new \Twig_simpleFunction('t', [$this, 'translate']),
new \Twig_simpleFunction('t', [$this, 'translate'], ['needs_environment' => true]),
new \Twig_simpleFunction('tl', [$this, 'translateLanguage']),
new \Twig_simpleFunction('ta', [$this, 'translateArray']),
];
@@ -710,9 +710,34 @@ class TwigExtension extends \Twig_Extension implements \Twig_Extension_GlobalsIn
/**
* @return mixed
*/
public function translate()
public function translate(\Twig_Environment $twig)
{
return $this->grav['language']->translate(func_get_args());
static $admin_call;
// One time check and assignment of admin provided tu filter
if ($admin_call == null) {
$filters = $twig->getFilters();
$admin_translate = $filters['tu'] ?? false;
if ($admin_translate) {
list($class, $method) = $admin_translate->getCallable();
$admin_call = [$class->getName(),$method];
} else {
$admin_call = false;
}
}
// shift of the environment
$args = func_get_args();
array_shift($args);
// If admin and tu filter provided, use it
if (is_array($admin_call)) {
return call_user_func_array($admin_call, $args);
}
// else use the default grav translate functionality
return $this->grav['language']->translate($args);
}
/**