Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Initialize route and raw_route, fix empty route as values #3184

Merged
merged 9 commits into from
Feb 8, 2021
Merged

Initialize route and raw_route, fix empty route as values #3184

Changes from 1 commit
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
cb2c961
Initialize route and raw_route, fix empty route as values
pierrejoye Jan 29, 2021
ea758e9
Add test for this translatedLanguages
pierrejoye Jan 30, 2021
711d7b1
Add fixture for translatedLanguages
pierrejoye Jan 30, 2021
10be5d5
fix text if language is found and is part as enabled languages
pierrejoye Jan 31, 2021
4ce3ff5
Add the test translated pages
pierrejoye Jan 31, 2021
b208385
Resolved merge conflict
pierrejoye Feb 1, 2021
2044a64
add another test with subfolder
pierrejoye Feb 2, 2021
caf431d
add faker for multiple parts with folder
pierrejoye Feb 2, 2021
6c3c068
add test for multiple parts using folder
pierrejoye Feb 2, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
Initialize route and raw_route, fix empty route as values
  • Loading branch information
@pierrejoye
pierrejoye committed Jan 29, 2021
commit cb2c9616d7d19aecdad9a64c581068bdc0ac8e2a
3 changes: 2 additions & 1 deletion system/src/Grav/Common/Page/Page.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -271,7 +271,8 @@ public function translatedLanguages($onlyPublished = false)
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();
Expand Down