From 6ba780ba3b6d1fa6da2dbb16a77efd8dbb29b7ed Mon Sep 17 00:00:00 2001 From: Andy Miller Date: Tue, 21 Jul 2015 11:50:08 -0600 Subject: [PATCH] support translate taking string or array for key --- system/src/Grav/Common/Language/Language.php | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/system/src/Grav/Common/Language/Language.php b/system/src/Grav/Common/Language/Language.php index 735bcbf63..48a31db22 100644 --- a/system/src/Grav/Common/Language/Language.php +++ b/system/src/Grav/Common/Language/Language.php @@ -276,15 +276,21 @@ class Language /** * Translate a key and possibly arguments into a string using current lang and fallbacks * - * @param Array $args first argument is the lookup key value + * @param $args first argument is the lookup key value * other arguments can be passed and replaced in the translation with sprintf syntax * @param Array $languages * * @return string */ - public function translate(Array $args, Array $languages = null) + public function translate($args, Array $languages = null) { - $lookup = array_shift($args); + if (is_array($args)) { + $lookup = array_shift($args); + } else { + $lookup = $args; + $args = []; + } + if ($this->config->get('system.languages.translations', true)) { if ($this->enabled() && $lookup) {