diff options
author | Minteck <contact@minteck.org> | 2022-06-04 16:14:15 +0200 |
---|---|---|
committer | Minteck <contact@minteck.org> | 2022-06-04 16:14:15 +0200 |
commit | 9446ab46856cbd7a18db7a1049219bdd874cb3ba (patch) | |
tree | a977d638b5f6dff458b0640c962a08b69929b393 | |
parent | bc8e7e4fba4c03d274127dbb560ef2dda4ec3c02 (diff) | |
download | core-9446ab46856cbd7a18db7a1049219bdd874cb3ba.tar.gz core-9446ab46856cbd7a18db7a1049219bdd874cb3ba.tar.bz2 core-9446ab46856cbd7a18db7a1049219bdd874cb3ba.zip |
i18n
-rw-r--r-- | .idea/deployment.xml | 3 | ||||
-rw-r--r-- | .idea/workspace.xml | 25 | ||||
-rw-r--r-- | index.php | 26 | ||||
-rw-r--r-- | private/welcomed.json | 2 | ||||
-rw-r--r-- | version.txt | 2 |
5 files changed, 30 insertions, 28 deletions
diff --git a/.idea/deployment.xml b/.idea/deployment.xml index e190dc0..9cf9b38 100644 --- a/.idea/deployment.xml +++ b/.idea/deployment.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?>
<project version="4">
- <component name="PublishConfigData" autoUpload="Always" remoteFilesAllowedToDisappearOnAutoupload="false">
+ <component name="PublishConfigData" serverName="Familine" remoteFilesAllowedToDisappearOnAutoupload="false">
<serverData>
<paths name="Familine">
<serverdata>
@@ -14,6 +14,5 @@ </serverdata>
</paths>
</serverData>
- <option name="myAutoUpload" value="ALWAYS" />
</component>
</project>
\ No newline at end of file diff --git a/.idea/workspace.xml b/.idea/workspace.xml index 751fa53..1e50a3b 100644 --- a/.idea/workspace.xml +++ b/.idea/workspace.xml @@ -2,6 +2,7 @@ <project version="4">
<component name="ChangeListManager">
<list default="true" id="e4941d36-f387-4fd6-8e3d-4cad435f2034" name="Changes" comment="">
+ <change beforePath="$PROJECT_DIR$/.idea/deployment.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/deployment.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/cdn/statusbar.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/cdn/statusbar.php" afterDir="false" />
<change beforePath="$PROJECT_DIR$/app/genealogy/.gitignore" beforeDir="false" afterPath="$PROJECT_DIR$/app/genealogy/.gitignore" afterDir="false" />
@@ -62,7 +63,9 @@ <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$/app/intro/session.php" beforeDir="false" afterPath="$PROJECT_DIR$/app/intro/session.php" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/index.php" beforeDir="false" afterPath="$PROJECT_DIR$/index.php" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/private/welcomed.json" beforeDir="false" afterPath="$PROJECT_DIR$/private/welcomed.json" afterDir="false" />
+ <change beforePath="$PROJECT_DIR$/version.txt" beforeDir="false" afterPath="$PROJECT_DIR$/version.txt" afterDir="false" />
</list>
<option name="SHOW_DIALOG" value="false" />
<option name="HIGHLIGHT_CONFLICTS" value="true" />
@@ -82,7 +85,7 @@ </option>
</component>
<component name="Git.Settings">
- <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/app/intro" />
+ <option name="RECENT_GIT_ROOT_PATH" value="$PROJECT_DIR$/app/cdn" />
</component>
<component name="GitSEFilterConfiguration">
<file-type-list>
@@ -106,18 +109,18 @@ <option name="hideEmptyMiddlePackages" value="true" />
<option name="showLibraryContents" value="true" />
</component>
- <component name="PropertiesComponent">{ - "keyToString": { - "WebServerToolWindowFactoryState": "true", - "last_opened_file_path": "/Users/Scoots/Code/Familine", - "nodejs_package_manager_path": "npm", - "vue.rearranger.settings.migration": "true" + <component name="PropertiesComponent"><![CDATA[{ + "keyToString": { + "WebServerToolWindowFactoryState": "true", + "last_opened_file_path": "/Users/Scoots/Code/Familine/private/news", + "nodejs_package_manager_path": "npm", + "vue.rearranger.settings.migration": "true" } -}</component>
+}]]></component>
<component name="RecentsManager">
<key name="CopyFile.RECENT_KEYS">
- <recent name="$PROJECT_DIR$/app/intro" />
<recent name="$PROJECT_DIR$/private/news" />
+ <recent name="$PROJECT_DIR$/app/intro" />
<recent name="$PROJECT_DIR$" />
<recent name="$PROJECT_DIR$/app/media" />
<recent name="$PROJECT_DIR$/login/embed" />
@@ -167,7 +170,7 @@ <workItem from="1650805734182" duration="1344000" />
<workItem from="1653663350526" duration="616000" />
<workItem from="1654000587101" duration="441000" />
- <workItem from="1654345612131" duration="2127000" />
+ <workItem from="1654345612131" duration="4147000" />
</task>
<servers />
</component>
@@ -43,7 +43,7 @@ require_once $_SERVER['DOCUMENT_ROOT'] . "/private/session.php"; <div> <img src="/favicon.svg" width="128px" height="128px"> <h1 style="color:white !important;font-size: 48px;">Familine</h1> - <p style="color:white !important;">Familine soutient la population ukrainienne. <a href="/ukraine" style="color:white;">En savoir plus.</a><br> + <p style="color:white !important;"><?= l("Familine soutient la population ukrainienne.", "Familine supports people in Ukraine.") ?> <a href="/ukraine" style="color:white;"><?= l("En savoir plus.", "Learn More.") ?></a><br> <?php $list = array_reverse(scandir($_SERVER["DOCUMENT_ROOT"] . "/private/news")); @@ -58,22 +58,22 @@ require_once $_SERVER['DOCUMENT_ROOT'] . "/private/session.php"; } } - ?><a href="/news/<?= substr($article, 0, -5) ?>" style="color:white;">En ce moment : <?= $data["title"] ?></a></p> + ?><a href="/news/<?= substr($article, 0, -5) ?>" style="color:white;"><?= l("En ce moment :", "Right Now:") ?> <?= $data["title"] ?></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;"> - <span>Pages</span> - <span class="explore-description">Une encyclopédie de toutes les personnes de la famille</span> + <span><?= l("Pages", "Docs") ?></span> + <span class="explore-description"><?= l("Une encyclopédie de toutes les personnes de la famille", "An encyclopedia with everyone in the family") ?></span> </a> <a href="https://support.<?= $_CONFIG["Global"]["domain"] ?>" class="explore-btn"> <img src="/icns/familine-help.svg" width="48px" height="48px" style="height:32px;width:32px;margin: 0 5px;"> - <span>Aide</span> - <span class="explore-description">Votre point d'accès à l'aide de Familine</span> + <span><?= l("Aide", "Help") ?></span> + <span class="explore-description"><?= l("Votre point d'accès à l'aide de Familine", "Your access point to help from Familine") ?></span> </a> <a href="https://media.<?= $_CONFIG["Global"]["domain"] ?>" class="explore-btn"> <img src="/icns/familine-media.svg" width="48px" height="48px" style="height:32px;width:32px;margin: 0 5px;"> - <span>Média</span> - <span class="explore-description">Musique, photos et vidéos de la famille au même endroit</span> + <span><?= l("Média", "Media") ?></span> + <span class="explore-description"><?= l("Musique, photos et vidéos de la famille au même endroit", "Music, photos and videos from the family all in the same place") ?></span> </a> <!-- <a href="https://planning.--><?//= $_CONFIG["Global"]["domain"] ?><!--" class="explore-btn">--> <!-- <img src="/icns/familine-planning.svg" width="48px" height="48px" style="height:32px;width:32px;margin: 0 5px;">--> @@ -82,13 +82,13 @@ require_once $_SERVER['DOCUMENT_ROOT'] . "/private/session.php"; <!-- </a>--> <a href="https://genealogy.<?= $_CONFIG["Global"]["domain"] ?>" class="explore-btn"> <img src="/icns/familine-recall.svg" width="48px" height="48px" style="height:32px;width:32px;margin: 0 5px;"> - <span>Généalogie</span> - <span class="explore-description">Un accès plus simple à la généalogie</span> + <span><?= l("Généalogie", "Genealogy") ?></span> + <span class="explore-description"><?= l("Un accès plus simple à la généalogie", "A simpler access to genealogy") ?></span> </a> <a href="https://share.<?= $_CONFIG["Global"]["domain"] ?>" class="explore-btn"> <img src="/icns/familine-share.svg" width="48px" height="48px" style="height:32px;width:32px;margin: 0 5px;"> - <span>Partage</span> - <span class="explore-description">Partagez des fichiers avec qui vous voulez</span> + <span><?= l("Partage", "Share") ?></span> + <span class="explore-description"><?= l("Partagez des fichiers avec qui vous voulez", "Share files with whoever you want") ?></span> </a> <!-- <a href="https://chat.<?= $_CONFIG["Global"]["domain"] ?>" class="explore-btn"> <img src="/icns/familine-you.svg" width="48px" height="48px" style="height:32px;width:32px;margin: 0 5px;"> @@ -97,7 +97,7 @@ require_once $_SERVER['DOCUMENT_ROOT'] . "/private/session.php"; </a> --> </div> <div style="color: white;text-align: center;margin-top: 10px;opacity: .5;font-size: 14px;"> - <?php if ($_ADMIN): ?><a style="color:white;display:inline-block;" href="https://console.familine.minteck.org">Familine Camera</a> · <?php endif; ?><a style="color:white;display:inline-block;" href="https://app.familine.minteck.org/known">Problèmes connus</a> · <a target="_blank" style="color:white;display:inline-block;" href="https://gitlab.minteck.org/familine">Code source</a> · version <?= file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/version.txt") ?> + <a style="color:white;display:inline-block;" href="https://app.familine.minteck.org/known"><?= l("Problèmes connus", "Known Issues") ?></a> · <a target="_blank" style="color:white;display:inline-block;" href="https://gitlab.minteck.org/familine"><?= l("Code source", "Source Code") ?></a> · version <?= str_replace("%ea%", l("accès anticipé", "early access"), file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/version.txt")) ?> </div> <br> <br> diff --git a/private/welcomed.json b/private/welcomed.json index fca1acf..b77537e 100644 --- a/private/welcomed.json +++ b/private/welcomed.json @@ -1 +1 @@ -["mia.murat","mia.murat","mia.murat","mia.murat","patrick.murat","melanie.murat","mia.murat"]
\ No newline at end of file +["patrick.murat","melanie.murat"]
\ No newline at end of file diff --git a/version.txt b/version.txt index ba2d407..99a0db0 100644 --- a/version.txt +++ b/version.txt @@ -1 +1 @@ -4.9.4 (accès anticipé) +4.10.O (%ea%)
\ No newline at end of file |