Skip to content

Commit 97a4e73

Browse files
committed
Fix multilanguage, make an example, fixes dauxio#416
1 parent e831e75 commit 97a4e73

File tree

9 files changed

+22
-6
lines changed

9 files changed

+22
-6
lines changed

examples/multilanguage/_index.md

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
This is our landing page.
2+
3+
Welcome to this awesome multilanguage documentation.

examples/multilanguage/config.json

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
{
2+
"title": "Multilanguage Example",
3+
"tagline": "The Easiest Way To Document Your Project",
4+
5+
"languages": {
6+
"en": "English",
7+
"fr": "Français"
8+
}
9+
}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
It starts here.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Some configuration options
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
C'est ici que tout commence.
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
Quelques options de configuration

libs/Daux.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,8 @@ public function generateTree()
229229
$this->tree = new Root($this->getParams());
230230
Builder::build($this->tree, $this->options['ignore']);
231231

232-
if (!empty($this->options['languages'])) {
232+
// Apply the language name as Section title
233+
if ($this->options->isMultilanguage()) {
233234
foreach ($this->options['languages'] as $key => $node) {
234235
$this->tree->getEntries()[$key]->setTitle($node);
235236
}

libs/Format/HTML/ContentPage.php

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,18 +9,17 @@ class ContentPage extends \Todaymade\Daux\Format\Base\ContentPage
99

1010
private function isHomepage()
1111
{
12+
// If we don't have the auto_landing parameter, we don't want any homepage
1213
if (array_key_exists('auto_landing', $this->params['html']) && !$this->params['html']['auto_landing']) {
1314
return false;
1415
}
1516

17+
// If the current page isn't the index, no chance it is the landing page
1618
if ($this->file->getParent()->getIndexPage() != $this->file) {
1719
return false;
1820
}
1921

20-
if ($this->params->isMultilanguage()) {
21-
return $this->file->getParent()->getParent() instanceof Root;
22-
}
23-
22+
// If the direct parent is root, this is the homage
2423
return $this->file->getParent() instanceof Root;
2524
}
2625

templates/layout/05_page.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
$path = '';
2121

2222
if ($page['language'] !== '') {
23-
$rendertree = $tree->value[$page['language']];
23+
$rendertree = $tree[$page['language']];
2424
$path = $page['language'];
2525
}
2626

0 commit comments

Comments
 (0)