From ce8fd4d3efb75f70dc744f46a2b3c300959e4d5d Mon Sep 17 00:00:00 2001 From: Flavio Copes Date: Thu, 20 Aug 2015 19:55:00 +0200 Subject: [PATCH] Add pathPrefixedByLangCode to Utils, fix generating pages routes for translated languages --- system/src/Grav/Common/Page/Page.php | 6 +++++- system/src/Grav/Common/Utils.php | 14 ++++++++++++++ 2 files changed, 19 insertions(+), 1 deletion(-) diff --git a/system/src/Grav/Common/Page/Page.php b/system/src/Grav/Common/Page/Page.php index 2cb8a63d3..37ee9e3b7 100644 --- a/system/src/Grav/Common/Page/Page.php +++ b/system/src/Grav/Common/Page/Page.php @@ -154,7 +154,11 @@ class Page if (file_exists($path)) { $aPage = new Page(); $aPage->init(new \SplFileInfo($path), $language .'.md'); - $translatedLanguages[$language] = isset($aPage->header()->routes['default']) ? $aPage->header()->routes['default'] : $aPage->rawRoute(); + + $route = isset($aPage->header()->routes['default']) ? $aPage->header()->routes['default'] : $aPage->rawRoute(); + if (!$route) $route = $aPage->slug(); + + $translatedLanguages[$language] = $route; } } diff --git a/system/src/Grav/Common/Utils.php b/system/src/Grav/Common/Utils.php index 2cd81ada6..d7421c9b6 100644 --- a/system/src/Grav/Common/Utils.php +++ b/system/src/Grav/Common/Utils.php @@ -437,4 +437,18 @@ abstract class Utils } return $result; } + + public static function pathPrefixedByLangCode($string) + { + $languages_enabled = self::getGrav()['config']->get('system.languages.supported', []); + + if ($string[0] == '/' && $string[3] == '/' && in_array(substr($string, 1, 2), $languages_enabled)) { + return true; + } + + return false; + } + + + }