From 489c02aea1ec860cb4d6bcb9916e72dd5bc6c4a2 Mon Sep 17 00:00:00 2001
From: Roman Kelesidis <roman25052006.kelesh@gmail.com>
Date: Sat, 6 Jan 2024 21:57:41 +0700
Subject: [PATCH] Used declensions for days in some cases (#1310)

* Minor improvements

* Update admin_forums.php

* Updated

* Updated

* Updated
---
 admin/admin_forums.php           | 4 ++--
 admin/admin_user_search.php      | 6 +++---
 library/language/source/main.php | 4 ++--
 3 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/admin/admin_forums.php b/admin/admin_forums.php
index f37c986e7..081637781 100644
--- a/admin/admin_forums.php
+++ b/admin/admin_forums.php
@@ -433,6 +433,7 @@ if ($mode) {
             if ($to_id == -1) {
                 // Delete everything from forum
                 \TorrentPier\Legacy\Admin\Common::topic_delete('prune', $from_id, 0, true);
+                $datastore->update('stats');
             } else {
                 // Move all posts
                 $sql = 'SELECT * FROM ' . BB_FORUMS . " WHERE forum_id IN($from_id, $to_id)";
@@ -472,7 +473,6 @@ if ($mode) {
             fix_orphan_sf();
             \TorrentPier\Legacy\Group::update_user_level('all');
             $datastore->update('cat_forums');
-            $datastore->update('stats');
             CACHE('bb_cache')->rm();
 
             bb_die($lang['FORUMS_UPDATED'] . '<br /><br />' . sprintf($lang['CLICK_RETURN_FORUMADMIN'], '<a href="admin_forums.php">', '</a>') . '<br /><br />' . sprintf($lang['CLICK_RETURN_ADMIN_INDEX'], '<a href="index.php?pane=right">', '</a>'));
@@ -739,7 +739,7 @@ if (!$mode || $show_main_page) {
                         'FORUM_DESC' => htmlCHR($forum_rows[$j]['forum_desc']),
                         'NUM_TOPICS' => $forum_rows[$j]['forum_topics'],
                         'NUM_POSTS' => $forum_rows[$j]['forum_posts'],
-                        'PRUNE_DAYS' => $forum_rows[$j]['prune_days'] ?: '-',
+                        'PRUNE_DAYS' => !empty($forum_rows[$j]['prune_days']) ? delta_time((TIMENOW - 86400 * $forum_rows[$j]['prune_days']), TIMENOW, 'days') : '-',
 
                         'ORDER' => $forum_rows[$j]['forum_order'],
                         'FORUM_ID' => $forum_rows[$j]['forum_id'],
diff --git a/admin/admin_user_search.php b/admin/admin_user_search.php
index b23b48107..cd243869b 100644
--- a/admin/admin_user_search.php
+++ b/admin/admin_user_search.php
@@ -85,7 +85,7 @@ if (!isset($_REQUEST['dosearch'])) {
     $lastvisited_list = '';
 
     foreach ($lastvisited as $days) {
-        $lastvisited_list .= '<option value="' . $days . '">' . $days . ' ' . (($days > 1) ? $lang['DAYS'] : $lang['DAY']) . '</option>';
+        $lastvisited_list .= '<option value="' . $days . '">' . delta_time((TIMENOW - 86400 * $days), TIMENOW, 'days') . '</option>';
     }
 
     $template->assign_vars([
@@ -635,7 +635,7 @@ if (!isset($_REQUEST['dosearch'])) {
 
             switch ($lastvisited_type) {
                 case 'in':
-                    $text = sprintf($lang['SEARCH_FOR_LASTVISITED_INTHELAST'], $lastvisited_days, (($lastvisited_days > 1) ? $lang['DAYS'] : $lang['DAY']));
+                    $text = sprintf($lang['SEARCH_FOR_LASTVISITED_INTHELAST'], delta_time((TIMENOW - 86400 * $lastvisited_days), TIMENOW, 'days'));
 
                     $total_sql .= 'SELECT COUNT(user_id) AS total
 									FROM ' . BB_USERS . "
@@ -646,7 +646,7 @@ if (!isset($_REQUEST['dosearch'])) {
 											AND u.user_id <> " . GUEST_UID;
                     break;
                 case 'after':
-                    $text = sprintf($lang['SEARCH_FOR_LASTVISITED_AFTERTHELAST'], $lastvisited_days, (($lastvisited_days > 1) ? $lang['DAYS'] : $lang['DAY']));
+                    $text = sprintf($lang['SEARCH_FOR_LASTVISITED_AFTERTHELAST'], delta_time((TIMENOW - 86400 * $lastvisited_days), TIMENOW, 'days'));
 
                     $total_sql .= 'SELECT COUNT(user_id) AS total
 									FROM ' . BB_USERS . "
diff --git a/library/language/source/main.php b/library/language/source/main.php
index 0b4d16b13..5f9c2b496 100644
--- a/library/language/source/main.php
+++ b/library/language/source/main.php
@@ -2626,8 +2626,8 @@ $lang['SEARCH_FOR_USERFIELD_WEBSITE'] = 'Searching for users with an Website mat
 $lang['SEARCH_FOR_USERFIELD_LOCATION'] = 'Searching for users with a Location matching %s';
 $lang['SEARCH_FOR_USERFIELD_INTERESTS'] = 'Searching for users with their Interests field matching %s';
 $lang['SEARCH_FOR_USERFIELD_OCCUPATION'] = 'Searching for users with their Occupation field matching %s';
-$lang['SEARCH_FOR_LASTVISITED_INTHELAST'] = 'Searching for users who have visited in the last %s %s';
-$lang['SEARCH_FOR_LASTVISITED_AFTERTHELAST'] = 'Searching for users who have visited after the last %s %s';
+$lang['SEARCH_FOR_LASTVISITED_INTHELAST'] = 'Searching for users who have visited in the last %s';
+$lang['SEARCH_FOR_LASTVISITED_AFTERTHELAST'] = 'Searching for users who have visited after the last %s';
 $lang['SEARCH_FOR_LANGUAGE'] = 'Searching for users who have set %s as their language';
 $lang['SEARCH_FOR_TIMEZONE'] = 'Searching for users who have set UTC %s as their timezone';
 $lang['SEARCH_FOR_STYLE'] = 'Searching for users who have set %s as their style';