summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRaindropsSys <raindrops@equestria.dev>2024-02-10 22:14:42 +0100
committerRaindropsSys <raindrops@equestria.dev>2024-02-10 22:14:42 +0100
commit63374df56891034f4b1f7a702590de797840c45d (patch)
tree689c5cbbc119991f85aac89bb325d361a12915a2
parent38c15eacb26220c369a39248aaf9d20e138e8791 (diff)
downloaddelta-63374df56891034f4b1f7a702590de797840c45d.tar.gz
delta-63374df56891034f4b1f7a702590de797840c45d.tar.bz2
delta-63374df56891034f4b1f7a702590de797840c45d.zip
Updated 6 files (automated)
-rw-r--r--admin/handoff/index.php5
-rw-r--r--index.php5
-rw-r--r--lang/en.json7
-rw-r--r--lang/fr.json7
-rw-r--r--mobile_profile/index.php2
-rw-r--r--version2
6 files changed, 23 insertions, 5 deletions
diff --git a/admin/handoff/index.php b/admin/handoff/index.php
index 86fb763..40ceeb9 100644
--- a/admin/handoff/index.php
+++ b/admin/handoff/index.php
@@ -19,6 +19,8 @@ $indexes = [
"Background"
];
+global $palette;
+
?>
<div class="container">
@@ -26,10 +28,11 @@ $indexes = [
<a href="/admin">← <?= l("lang_admin_title") ?></a>
<h1><?= l("lang_admin_titles_handoff") ?></h1>
+ <code><?= implode(",", $palette) ?></code><br>
<code><?= $_COOKIE["DeltaHandoffPalette"] ?? "-" ?></code>
<ul>
- <?php global $palette; foreach ($palette as $index => $color): ?>
+ <?php foreach ($palette as $index => $color): ?>
<li>[<?= $index ?>, <?= $indexes[9 - $index] ?? "(unknown)" ?>] <code>#<?= $color ?></code> <div style="background-color: #<?= $color ?>; width: 16px; height: 16px; display: inline-block;"></div></li>
<?php endforeach; ?>
</ul>
diff --git a/index.php b/index.php
index a3783fb..efebeb3 100644
--- a/index.php
+++ b/index.php
@@ -32,6 +32,11 @@ $version = file_get_contents($_SERVER['DOCUMENT_ROOT'] . "/version");
<b>This is a development environment.</b> All data is reset with data from production every 60 minutes. Run <code style="color: inherit;"><?= $_SERVER['DOCUMENT_ROOT'] ?>/includes/prod.sh</code> to push this release to production.
</div>
<?php endif; ?>
+ <?php if (isset($_COOKIE["DeltaHandoffPalette"])): ?>
+ <div class="alert alert-danger">
+ <b><?= l("lang_mobile_end_0") ?></b> <?= l("lang_mobile_end_1") ?>
+ </div>
+ <?php endif; ?>
<?php if (str_contains($version, "rc") ||
str_contains($version, "eap") ||
diff --git a/lang/en.json b/lang/en.json
index 5c269b7..10505af 100644
--- a/lang/en.json
+++ b/lang/en.json
@@ -600,7 +600,12 @@
"pending": "Pending change requests",
"support": "Delta help and support",
"studio": "Open Delta Studio",
- "beta": "Latest Delta Beta changes"
+ "beta": "Latest Delta Beta changes",
+ "admin": "Administrative options",
+ "end": [
+ "The Delta Android app is going away.",
+ "We are discontinuing the Delta mobile application soon. Please use Delta in your web browser instead from now on."
+ ]
},
"support": {
"title": "Help center",
diff --git a/lang/fr.json b/lang/fr.json
index af93c25..ef291db 100644
--- a/lang/fr.json
+++ b/lang/fr.json
@@ -600,7 +600,12 @@
"pending": "Demandes de changement en attente",
"support": "Aide et support Delta",
"studio": "Ouvrir Delta Studio",
- "beta": "Derniers changements Delta Beta"
+ "beta": "Derniers changements Delta Beta",
+ "admin": "Options administratives",
+ "end": [
+ "L'application Delta Android s'en va.",
+ "Nous arrêtons l'application mobile Delta prochainement. Merci d'utiliser Delta dans votre navigateur Web dès à présent."
+ ]
},
"support": {
"title": "Centre d'aide",
diff --git a/mobile_profile/index.php b/mobile_profile/index.php
index 91660b0..263c646 100644
--- a/mobile_profile/index.php
+++ b/mobile_profile/index.php
@@ -52,7 +52,7 @@ global $_PROFILE; global $_USER; global $unreadAlerts;
<?php endif; ?>
<?php if (isset($_PROFILE["admin"]) && $_PROFILE["admin"]): ?>
<a href="/admin" class="list-group-item list-group-item-action">
- <img class="icon" src="/icons/admin.svg" style="margin-right:5px;"><span style="vertical-align: middle;">Administrative options</span>
+ <img class="icon" src="/icons/admin.svg" style="margin-right:5px;"><span style="vertical-align: middle;"><?= l("lang_mobile_admin") ?></span>
</a>
<?php endif; ?>
</div>
diff --git a/version b/version
index 3e27405..e3d01e4 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-5.2.21 \ No newline at end of file
+5.2.22 \ No newline at end of file