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

Fix for substitutions passed in via twig function (they need to be in an array) - #574

Browse Source
This commit is contained in:
Andy Miller
2016-05-08 22:18:22 -06:00
parent 9c3a7257ee
commit fe5c2eecf9
2 changed files with 19 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
themes/grav/templates/partials/modal-remove-package.html.twig
View File

@@ -3,9 +3,9 @@
data-remodal-options="hashTracking: false"> data-remodal-options="hashTracking: false">
<form> <form>
<div class="remove-package-confirm"> <div class="remove-package-confirm">
<h1>{{ "PLUGIN_ADMIN.REMOVE_THE"|tu(("PLUGIN_ADMIN." ~ type|upper)|tu) }}</h1> <h1>{{ "PLUGIN_ADMIN.REMOVE_THE"|tu([("PLUGIN_ADMIN." ~ type|upper)|tu]) }}</h1>
<p class="bigger"> <p class="bigger">
{{ "PLUGIN_ADMIN.CONFIRM_REMOVAL"|tu(("PLUGIN_ADMIN." ~ type|upper)|tu) }} {{ "PLUGIN_ADMIN.CONFIRM_REMOVAL"|tu([("PLUGIN_ADMIN." ~ type|upper)|tu]) }}
</p> </p>
<div class="button-bar"> <div class="button-bar">
@@ -15,9 +15,9 @@
</div> </div>
<div class="remove-package-dependencies hidden"> <div class="remove-package-dependencies hidden">
<h1>{{ "PLUGIN_ADMIN.REMOVED_SUCCESSFULLY"|tu(("PLUGIN_ADMIN." ~ type|upper)|tu) }}</h1> <h1>{{ "PLUGIN_ADMIN.REMOVED_SUCCESSFULLY"|tu([("PLUGIN_ADMIN." ~ type|upper)|tu]) }}</h1>
<p> <p>
{{ "PLUGIN_ADMIN.ADDITIONAL_DEPENDENCIES_CAN_BE_REMOVED"|tu(("PLUGIN_ADMIN." ~ type|upper)|tu) }} {{ "PLUGIN_ADMIN.ADDITIONAL_DEPENDENCIES_CAN_BE_REMOVED"|tu([("PLUGIN_ADMIN." ~ type|upper)|tu]) }}
</p> </p>
<div> <div>
<ul class="package-dependencies-container"></ul> <ul class="package-dependencies-container"></ul>
@@ -25,14 +25,14 @@
</div> </div>
<div class="remove-package-done hidden"> <div class="remove-package-done hidden">
<h1>{{ "PLUGIN_ADMIN.REMOVED_SUCCESSFULLY"|tu(("PLUGIN_ADMIN." ~ type|upper)|tu) }}</h1> <h1>{{ "PLUGIN_ADMIN.REMOVED_SUCCESSFULLY"|tu([("PLUGIN_ADMIN." ~ type|upper)|tu]) }}</h1>
<div class="button-bar"> <div class="button-bar">
<a href="{{ base_url_relative ~ '/' ~ type ~ 's' }}" class="button secondary"><i class="fa fa-fw fa-close"></i> {{ "PLUGIN_ADMIN.CLOSE"|tu }}</a> <a href="{{ base_url_relative ~ '/' ~ type ~ 's' }}" class="button secondary"><i class="fa fa-fw fa-close"></i> {{ "PLUGIN_ADMIN.CLOSE"|tu }}</a>
</div> </div>
</div> </div>
<div class="remove-package-error hidden"> <div class="remove-package-error hidden">
<h1>{{ "PLUGIN_ADMIN.ERROR_REMOVING_THE"|tu(("PLUGIN_ADMIN." ~ type|upper)|tu) }}</h1> <h1>{{ "PLUGIN_ADMIN.ERROR_REMOVING_THE"|tu([("PLUGIN_ADMIN." ~ type|upper)|tu]) }}</h1>
<div class="button-bar"> <div class="button-bar">
<button data-remodal-action="cancel" class="button secondary remodal-cancel"><i class="fa fa-fw fa-close"></i> {{ "PLUGIN_ADMIN.CANCEL"|tu }}</button> <button data-remodal-action="cancel" class="button secondary remodal-cancel"><i class="fa fa-fw fa-close"></i> {{ "PLUGIN_ADMIN.CANCEL"|tu }}</button>
</div> </div>

13
twig/AdminTwigExtension.php
View File

@@ -45,8 +45,19 @@ class AdminTwigExtension extends \Twig_Extension
]; ];
} }
public function tuFilter($args, $lang = null) public function tuFilter()
{ {
$args = func_get_args();
$numargs = count($args);
$lang = null;
if (($numargs == 3 && is_array($args[1])) || ($numargs == 2 && !is_array($args[1]))) {
$lang = array_pop($args);
} elseif ($numargs == 2 && is_array($args[1])) {
$subs = array_pop($args);
$args = array_merge($args, $subs);
}
return $this->grav['admin']->translate($args, $lang); return $this->grav['admin']->translate($args, $lang);
} }