baoshuo/S2OJ
baoshuo/S2OJ
1
1
Fork 0
mirror of https://github.com/renbaoshuo/S2OJ.git synced 2024-11-22 10:18:41 +00:00
Code Issues Actions Packages Releases Activity

feat: countdown rest time use uoj-countdown
All checks were successful
continuous-integration/drone/push Build is passing
Details

Browse Source
This commit is contained in:
Baoshuo Ren 2023-03-14 10:53:30 +08:00
parent d42c2a2c25
commit ae1d798795
Signed by: baoshuo
GPG Key ID: 00CB9680AB29F51A
4 changed files with 26 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
web/app/controllers/index.php
View File

@ -90,15 +90,17 @@ $friend_links = DB::selectAll([
<ul class="list-unstyled mb-0"> <ul class="list-unstyled mb-0">
<?php foreach ($countdowns as $countdown) : ?> <?php foreach ($countdowns as $countdown) : ?>
<?php <?php
$enddate = strtotime($countdown['end_time']); $end_time = UOJTime::str2time($countdown['end_time'])->getTimestamp();
$nowdate = time(); $now_time = UOJTime::$time_now->getTimestamp();
$diff = ceil(($enddate - $nowdate) / (24 * 60 * 60)); $diff = floor(($end_time - $now_time) / (24 * 60 * 60));
?> ?>
<li> <li>
<?php if ($diff > 0) : ?> <?php if ($diff > 0) : ?>
<?= UOJLocale::get('x days until countdown title', $countdown['title'], $diff) ?> <?= UOJLocale::get('x days before countdown {title}', $countdown['title'], $diff) ?>
<?php elseif ($diff == 0) : ?>
<?= UOJLocale::get('{rest} before countdown {title}', $countdown['title'], $end_time - $now_time) ?>
<?php else : ?> <?php else : ?>
<?= UOJLocale::get("countdown title has begun", $countdown['title']) ?> <?= UOJLocale::get("countdown {title} has begun", $countdown['title']) ?>
<?php endif ?> <?php endif ?>
</li> </li>
<?php endforeach ?> <?php endforeach ?>

2
web/app/controllers/super_manage.php
View File

@ -190,7 +190,7 @@ if ($cur_tab == 'index') {
return '标题不能为空'; return '标题不能为空';
} }
$vdata['title'] = $title; $vdata['title'] = HTML::escape($title);
return ''; return '';
}, },

9
web/app/locale/basic/en.php
View File

@ -90,11 +90,14 @@ return [
'male' => 'Male', 'male' => 'Male',
'female' => 'Female', 'female' => 'Female',
'countdowns' => 'Countdowns', 'countdowns' => 'Countdowns',
'countdown title has begun' => function($title) { 'countdown {title} has begun' => function ($title) {
return "<b>$title</b> has begun."; return "<b>$title</b> has begun.";
}, },
'x days until countdown title' => function($title, $days) { '{rest} before countdown {title}' => function ($title, $rest_seconds) {
return "<b>$days</b> ".($days <= 1 ? 'day' : 'days')." until <b>$title</b>."; return '<b><span class="countdown" data-rest="' . $rest_seconds . '">less than a day</span></b>' . " before <b>$title</b>.";
},
'x days before countdown {title}' => function ($title, $days) {
return "<b>$days</b> " . ($days <= 1 ? 'day' : 'days') . " before <b>$title</b>.";
}, },
'friend links' => 'Frequently Used Links', 'friend links' => 'Frequently Used Links',
'server time' => 'Server Time', 'server time' => 'Server Time',

7
web/app/locale/basic/zh-cn.php
View File

@ -90,10 +90,13 @@ return [
'male' => '男', 'male' => '男',
'female' => '女', 'female' => '女',
'countdowns' => '倒计时', 'countdowns' => '倒计时',
'countdown title has begun' => function($title) { 'countdown {title} has begun' => function($title) {
return "<b>$title</b> 已开始。"; return "<b>$title</b> 已开始。";
}, },
'x days until countdown title' => function($title, $days) { '{rest} before countdown {title}' => function ($title, $rest_seconds) {
return "距离 <b>$title</b> 还有 " . '<b><span class="countdown" data-rest="' . $rest_seconds . '">不足 1 天</span></b>。';
},
'x days before countdown {title}' => function($title, $days) {
return "距离 <b>$title</b> 还有 <b>$days</b> 天。"; return "距离 <b>$title</b> 还有 <b>$days</b> 天。";
}, },
'friend links' => '常用链接', 'friend links' => '常用链接',