aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--.idea/workspace.xml7
-rw-r--r--index.php26
-rw-r--r--news_internal/index.php4
-rw-r--r--version.txt2
4 files changed, 20 insertions, 19 deletions
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index b6b250d..665cded 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -62,8 +62,8 @@
<change beforePath="$PROJECT_DIR$/app/genealogy/styles/dark.css" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/styles/dark.css" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/genealogy/tree/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/tree/index.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/genealogy/tree/mktree.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/tree/mktree.php" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/private/session-noconf.php" beforeDir="false" afterPath="$PROJECT_DIR$/private/session-noconf.php" afterDir="false" />
- <change beforePath="$PROJECT_DIR$/private/session.php" beforeDir="false" afterPath="$PROJECT_DIR$/private/session.php" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/index.php" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/news_internal/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/news_internal/index.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/version.txt" beforeDir="false" afterPath="$PROJECT_DIR$/version.txt" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
@@ -174,7 +174,8 @@
<workItem from="1654352378304" duration="53000" />
<workItem from="1654352763363" duration="147000" />
<workItem from="1654692815481" duration="319000" />
- <workItem from="1654695589166" duration="60000" />
+ <workItem from="1654695589166" duration="74000" />
+ <workItem from="1654708779061" duration="743000" />
</task>
<servers />
</component>
diff --git a/index.php b/index.php
index 0b1e5aa..cb35385 100644
--- a/index.php
+++ b/index.php
@@ -58,7 +58,7 @@ require_once $_SERVER['DOCUMENT_ROOT'] . "/private/session.php";
}
}
- ?><a href="/news/<?= substr($article, 0, -5) ?>" style="color:white;"><?= l("En ce moment :", "Right Now:") ?> <?= $data["title"] ?></a></p>
+ ?><a href="/news/<?= substr($article, 0, -5) ?>" style="color:white;"><?= l("En ce moment :", "Right Now:") ?> <?= $data["title"][l("fr", "en")] ?></a></p>
<div id="explore-list" class="container">
<a href="https://docs.<?= $_CONFIG["Global"]["domain"] ?>" class="explore-btn">
<img src="/icns/familine-docs.svg" width="48px" height="48px" style="height:32px;width:32px;margin: 0 5px;">
@@ -119,7 +119,7 @@ require_once $_SERVER['DOCUMENT_ROOT'] . "/private/session.php";
<br>
<div class="container">
- <h1><span id="home-greeting">Bienvenue</span> <?php $p = explode(" ", $_FULLNAME); array_shift($p); echo(implode(" ", $p)) ?></h1>
+ <h1><span id="home-greeting"><?= l("Bienvenue", "Welcome") ?></span> <?php $p = explode(" ", $_FULLNAME); array_shift($p); echo(implode(" ", $p)) ?></h1>
<script>
hours = new Date().getHours();
switch (hours) {
@@ -129,39 +129,39 @@ require_once $_SERVER['DOCUMENT_ROOT'] . "/private/session.php";
case 2:
case 3:
case 4:
- document.getElementById("home-greeting").innerText = "Bonne nuit";
+ document.getElementById("home-greeting").innerText = "<?= l("Bonne nuit", "Good night") ?>";
break;
case 5:
case 6:
case 7:
- document.getElementById("home-greeting").innerText = "Bon matin";
+ document.getElementById("home-greeting").innerText = "<?= l("Bon matin", "Good morning") ?>";
break;
case 8:
case 9:
case 10:
case 11:
- document.getElementById("home-greeting").innerText = "Bonne journée";
+ document.getElementById("home-greeting").innerText = "<?= l("Bonne journée", "Good morning") ?>";
break;
case 12:
case 13:
- document.getElementById("home-greeting").innerText = "Bon appétit";
+ document.getElementById("home-greeting").innerText = "<?= l("Bon appétit", "Have a good meal") ?>";
break;
case 14:
case 15:
case 16:
case 17:
- document.getElementById("home-greeting").innerText = "Bonne après-midi";
+ document.getElementById("home-greeting").innerText = "<?= l("Bonne après-midi", "Good afternoon") ?>";
break;
case 18:
- document.getElementById("home-greeting").innerText = "Bonne fin de journée";
+ document.getElementById("home-greeting").innerText = "<?= l("Bonne fin de journée", "Good evening") ?>";
break;
case 19:
case 20:
- document.getElementById("home-greeting").innerText = "Bon appétit";
+ document.getElementById("home-greeting").innerText = "<?= l("Bon appétit", "Have a good meal") ?>";
break;
case 21:
case 22:
- document.getElementById("home-greeting").innerText = "Bonne soirée";
+ document.getElementById("home-greeting").innerText = "<?= l("Bonne soirée", "Good evening") ?>";
break;
}
</script>
@@ -170,10 +170,10 @@ require_once $_SERVER['DOCUMENT_ROOT'] . "/private/session.php";
<?php $data = json_decode(file_get_contents($_SERVER["DOCUMENT_ROOT"] . "/private/news/" . $article), true); $html = file_get_contents($_SERVER["DOCUMENT_ROOT"] . "/private/news/" . substr($article, 0, -5) . ".html"); $summary = trim(explode("<!---->", $html)[0]); $full = trim($html); ?>
<?php if ($data["limited"] === null || in_array($_USER, $data["limited"])): ?>
<div class="jumbotron">
- <h5><?= $data["date"] ?></h5>
- <h3><?= $data["title"] ?></h3>
+ <h5><?= $data["date"][l("fr","en")] ?></h5>
+ <h3><?= $data["title"][l("fr","en")] ?></h3>
<p><?= $summary ?></p>
- <a class="news-link" href="/news/<?= substr($article, 0, -5) ?>">En lire plus...</a>
+ <a class="news-link" href="/news/<?= substr($article, 0, -5) ?>"><?= l("En lire plus...", "Read more...") ?></a>
</div>
<?php endif; endif; endforeach; ?>
diff --git a/news_internal/index.php b/news_internal/index.php
index d5b2aa9..63b691a 100644
--- a/news_internal/index.php
+++ b/news_internal/index.php
@@ -75,8 +75,8 @@ if (isset($_GET['a'])) {
</head>
<body>
<div class="container" style="margin-top:30px;">
- <h1><?= $data["title"] ?></h1>
- <h3><?= $data["date"] ?></h3>
+ <h1><?= $data["title"][l("fr", "en")] ?></h1>
+ <h3><?= $data["date"][l("fr", "en")] ?></h3>
<?= $full ?>
</div>
<script>
diff --git a/version.txt b/version.txt
index 9fe1978..32c6598 100644
--- a/version.txt
+++ b/version.txt
@@ -1 +1 @@
-4.10.4b (%ea%) \ No newline at end of file
+4.10.5 (%ea%) \ No newline at end of file
© Floofi Systems, Some rights reserved. Powered by cgit.