Nemcio/Grav-Admin-Plugin
1
0
Fork 0
mirror of https://github.com/getgrav/grav-plugin-admin.git synced 2025-11-03 20:05:53 +01:00
Code Issues Packages Projects Releases Activity

Fix for translations not substituting text properly #567

Browse Source
This commit is contained in:
Andy Miller
2016-05-06 13:36:16 -06:00
parent 50c4b5dc61
commit 79a49fdcbc
3 changed files with 3 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
CHANGELOG.md
View File

@@ -7,6 +7,7 @@
* Better error handling when `obj->validate()` fails with exception [#594](https://github.com/getgrav/grav-plugin-admin/issues/564) * Better error handling when `obj->validate()` fails with exception [#594](https://github.com/getgrav/grav-plugin-admin/issues/564)
* Improve markup of update and add package dependencies in update modal [#560](https://github.com/getgrav/grav-plugin-admin/issues/560) * Improve markup of update and add package dependencies in update modal [#560](https://github.com/getgrav/grav-plugin-admin/issues/560)
1. [](#bugfix) 1. [](#bugfix)
* Fix for admin translation filter (`|tu`) not substituting text - [#567](https://github.com/getgrav/grav-plugin-admin/issues/567)
* Translated "Publishing" tab text [#561](https://github.com/getgrav/grav-plugin-admin/issues/561) * Translated "Publishing" tab text [#561](https://github.com/getgrav/grav-plugin-admin/issues/561)
* Fix invalid argument supplied in foreach [#563](https://github.com/getgrav/grav-plugin-admin/issues/563) * Fix invalid argument supplied in foreach [#563](https://github.com/getgrav/grav-plugin-admin/issues/563)
* CSS fixes for editor button alignment * CSS fixes for editor button alignment

3
classes/admin.php
View File

@@ -966,9 +966,6 @@ class Admin
{ {
if (is_array($args)) { if (is_array($args)) {
$lookup = array_shift($args); $lookup = array_shift($args);
if (!empty($args)) {
$languages = array_shift($args);
}
} else { } else {
$lookup = $args; $lookup = $args;
$args = []; $args = [];

4
twig/AdminTwigExtension.php
View File

@@ -45,9 +45,9 @@ class AdminTwigExtension extends \Twig_Extension
]; ];
} }
public function tuFilter() public function tuFilter($args, $lang = null)
{ {
return $this->grav['admin']->translate(func_get_args()); return $this->grav['admin']->translate($args, $lang);
} }
public function toYamlFilter($value, $inline = true) public function toYamlFilter($value, $inline = true)