fixes

matronator · Sep 23, 2023 · 801c313 · 801c313
1 parent 4dd5679
commit 801c313
Show file tree

Hide file tree

Showing 7 changed files with 250 additions and 253 deletions.
diff --git a/app/lang/general.cs_CZ.neon b/app/lang/general.cs_CZ.neon
@@ -67,6 +67,7 @@ ui:
 	sidebar:
 		preparing: '(Již brzy)'
 		new: 'NOVÉ'
+		soon: 'BRZY'
 		player:
 			account: 'Účet'
 			training: 'Trénink'

diff --git a/app/lang/general.en_US.neon b/app/lang/general.en_US.neon
@@ -73,6 +73,7 @@ ui:
 	sidebar:
 		preparing: '(Preparing)'
 		new: 'NEW'
+		soon: 'SOON'
 		player:
 			account: 'Account'
 			inventory: 'Inventory'

diff --git a/app/modules/Front/components/UI/Sidebar/Sidebar.latte b/app/modules/Front/components/UI/Sidebar/Sidebar.latte
@@ -13,11 +13,11 @@
         {* NEW badge VVV *}
         {* <li n:class="$presenter->isLinkCurrent('Default:default') ? uk-active"><a n:href="Account:voting">{_general.ui.sidebar.player.reward}&nbsp;<sup class="uk-text-danger uk-text-tiny">{_general.ui.sidebar.new}</sup></a></li> *}
         <li n:class="$presenter->isLinkCurrent('Info:voting') ? uk-active"><a n:href="Info:voting">{_general.ui.sidebar.player.reward}</a></li>
-        <li n:class="$presenter->isLinkCurrent('Premium:default') ? uk-active"><a n:href="Premium:default">{_general.ui.sidebar.player.premium}&nbsp;<sup class="uk-text-danger uk-text-tiny">{_general.ui.sidebar.new}</sup></a></li>
+        <li n:class="$presenter->isLinkCurrent('Premium:default') ? uk-active"><a n:href="Premium:default">{_general.ui.sidebar.player.premium}&nbsp;<sup class="uk-text-warning uk-text-tiny">{_general.ui.sidebar.soon}</sup></a></li>
         <li class="uk-nav-divider"></li>
         <li n:class="$presenter->isLinkCurrent('Default:default') ? uk-active"><a n:href="Default:default">{_general.ui.sidebar.player.home}</a></li>
         <li n:class="$presenter->isLinkCurrent('Account:settings') ? uk-active"><a n:href="Account:settings">{_general.ui.sidebar.player.account}</a></li>
-        <li n:class="$presenter->isLinkCurrent('Inventory:default') ? uk-active"><a n:href="Inventory:default">{_general.ui.sidebar.player.inventory}</a></li>
+        <li n:class="$presenter->isLinkCurrent('Inventory:default') ? uk-active"><a n:href="Inventory:default">{_general.ui.sidebar.player.inventory}&nbsp;<sup class="uk-text-danger uk-text-tiny">{_general.ui.sidebar.new}</sup></a></li>
         <li n:class="$presenter->isLinkCurrent('Default:training') ? uk-active"><a n:href="Default:training">{_general.ui.sidebar.player.training}</a></li>
         <li n:class="$presenter->isLinkCurrent('Default:rest') ? uk-active"><a n:href="Default:rest">{_general.ui.sidebar.player.rest}</a></li>
         <li class="uk-nav-divider"></li>

diff --git a/app/modules/Front/presenters/ApiPresenter.php b/app/modules/Front/presenters/ApiPresenter.php
@@ -44,9 +44,9 @@ public function actionJob()
             if ($diff >= 0) {
                 $missionKey = array_search($whatMission, array_column($this->allJobs, 'locale'));
                 $currentMission = $this->allJobs[$missionKey];
-                $missionDuration = intval($currentMission['duration'] * 60);
+                $missionDuration = (int) ($currentMission['duration'] * 60);
                 $s = $diff % 60;
-                $m = $diff / 60 % 60;
+                $m = (int) round($diff / 60) % 60;
                 $minutes = $m;
                 $seconds = $s;
                 $timeMax = $missionDuration;