Nemcio/Grav
1
0
Fork 0
mirror of https://github.com/getgrav/grav.git synced 2026-07-08 11:51:27 +02:00
Code Issues Packages Projects Releases Activity

Merge branch 'develop' of https://github.com/pierrejoye/grav into pierrejoye-develop

Browse Source
This commit is contained in:
Matias Griese
2021-02-08 12:40:49 +02:00
parent d91e91128c 6c3c068485
commit afc5f5a13f
11 changed files with 49 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
system/src/Grav/Common/Page/Page.php
View File

@@ -271,7 +271,8 @@ class Page implements PageInterface
if ($exists) {
$aPage = new Page();
$aPage->init(new SplFileInfo($path), $languageExtension);
$aPage->route($this->route());
$aPage->rawRoute($this->rawRoute());
$route = $aPage->header()->routes['default'] ?? $aPage->rawRoute();
if (!$route) {
$route = $aPage->route();

1
system/src/Grav/Common/Utils.php
View File

@@ -1196,7 +1196,6 @@ abstract class Utils
if (count($parts) > 0 && in_array($parts[0], $languages_enabled)) {
return $parts[0];
}
return false;
}

4
tests/_bootstrap.php
View File

@@ -12,6 +12,10 @@ $grav = function () {
$grav = Grav::instance();
$grav['config']->init();
// This must be set first before the other init
$grav['config']->set('system.languages.supported', ['en', 'fr', 'vi']);
$grav['config']->set('system.languages.default_lang', 'en');
foreach (array_keys($grav['setup']->getStreams()) as $stream) {
@stream_wrapper_unregister($stream);
}

0
tests/fake/simple-site/user/pages/04.page-translated/default.en.md Normal file
View File

5
tests/fake/simple-site/user/pages/04.page-translated/default.fr.md Normal file
View File

@@ -0,0 +1,5 @@
---
title: Simple Page avec traduction
---
Simple Page Content in English

0
tests/fake/simple-site/user/pages/05.translatedlong/part2/default.en.md Normal file
View File

5
tests/fake/simple-site/user/pages/05.translatedlong/part2/default.fr.md Normal file
View File

@@ -0,0 +1,5 @@
---
title: Simple Page avec traduction
---
Page Simple FR

0
tests/fake/single-page-translated/user/pages/01.simple-page/default.en.md Normal file
View File

5
tests/fake/single-page-translated/user/pages/01.simple-page/default.fr.md Normal file
View File

@@ -0,0 +1,5 @@
---
title: Simple Page avec traduction
---
Page Simple FR

25
tests/unit/Grav/Common/Page/PagesTest.php
View File

@@ -236,6 +236,31 @@ class PagesTest extends \Codeception\TestCase\Test
self::assertSame('—-▸ Blog', $list['/blog']);
}
public function testTranslatedLanguages(): void
{
/** @var UniformResourceLocator $locator */
$locator = $this->grav['locator'];
$folder = $locator->findResource('tests://');
$page = $this->pages->get($folder . '/fake/simple-site/user/pages/04.page-translated');
$this->assertInstanceOf(PageInterface::class, $page);
$translatedLanguages = $page->translatedLanguages();
$this->assertIsArray($translatedLanguages);
$this->assertSame(["en" => "/page-translated", "fr" => "/page-translated"], $translatedLanguages);
}
public function testLongPathTranslatedLanguages(): void
{
/** @var UniformResourceLocator $locator */
$locator = $this->grav['locator'];
$folder = $locator->findResource('tests://');
$page = $this->pages->get($folder . '/fake/simple-site/user/pages/05.translatedlong/part2');
$this->assertInstanceOf(PageInterface::class, $page);
$translatedLanguages = $page->translatedLanguages();
$this->assertIsArray($translatedLanguages);
$this->assertSame(["en" => "/translatedlong/part2", "fr" => "/translatedlong/part2"], $translatedLanguages);
}
public function testGetTypes(): void
{
}

4
tests/unit/Grav/Common/UtilsTest.php
View File

@@ -299,7 +299,9 @@ class UtilsTest extends \Codeception\TestCase\Test
$oneLanguageNotEnabled = reset($languagesNotEnabled);
if (count($languagesEnabled)) {
self::assertTrue(Utils::pathPrefixedByLangCode('/' . $languagesEnabled[0] . '/test'));
$languageCodePathPrefix = Utils::pathPrefixedByLangCode('/' . $languagesEnabled[0] . '/test');
$this->assertIsString($languageCodePathPrefix);
$this->assertTrue(in_array($languageCodePathPrefix, $languagesEnabled));
}
self::assertFalse(Utils::pathPrefixedByLangCode('/' . $oneLanguageNotEnabled . '/test'));