From 330a90b0ab810f1ed3ca4f89f2e13cd4bc5b8087 Mon Sep 17 00:00:00 2001 From: Andy Miller Date: Mon, 20 Mar 2017 10:36:26 -0600 Subject: [PATCH] Added `language_codes` to Twig init to allow for easy language name/code/native-name lookup --- CHANGELOG.md | 2 ++ system/src/Grav/Common/Twig/Twig.php | 3 ++- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index b53fb1bd7..ea32e2aeb 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,6 +1,8 @@ # v1.2.0-rc.3 ## 03/xx/2017 +1. [](#new) + * Added `language_codes` to Twig init to allow for easy language name/code/native-name lookup 1. [](#bugfix) * Simplified modular/twig processing logic and fixed an issue with system process config [#1351](https://github.com/getgrav/grav/issues/1351) * Fix for page-level debugger override changing the option site-wide diff --git a/system/src/Grav/Common/Twig/Twig.php b/system/src/Grav/Common/Twig/Twig.php index 4ca45c7f6..7eec5b775 100644 --- a/system/src/Grav/Common/Twig/Twig.php +++ b/system/src/Grav/Common/Twig/Twig.php @@ -11,6 +11,7 @@ namespace Grav\Common\Twig; use Grav\Common\Grav; use Grav\Common\Config\Config; use Grav\Common\Language\Language; +use Grav\Common\Language\LanguageCodes; use Grav\Common\Page\Page; use RocketTheme\Toolbox\ResourceLocator\UniformResourceLocator; use RocketTheme\Toolbox\Event\Event; @@ -173,7 +174,7 @@ class Twig 'theme_dir' => $locator->findResource('theme://'), 'theme_url' => $this->grav['base_url'] . '/' . $locator->findResource('theme://', false), 'html_lang' => $this->grav['language']->getActive() ?: $config->get('site.default_lang', 'en'), - + 'language_codes' => new LanguageCodes, ]; } }