From 33bb8250cb92bcaa35d4fe1001205e3695ed3e30 Mon Sep 17 00:00:00 2001
From: Dessalines <dessalines@users.noreply.github.com>
Date: Sat, 18 Sep 2021 13:06:12 -0400
Subject: [PATCH] Remove active in the last (#419)

* Updating translations.

* Removing active_in_the_last for i18n.

- Fixes https://github.com/LemmyNet/lemmy-translations/issues/17
---
 lemmy-translations                          |  2 +-
 src/shared/components/community/sidebar.tsx | 19 ++++++++-----------
 src/shared/components/home/home.tsx         | 21 +++++++++------------
 3 files changed, 18 insertions(+), 24 deletions(-)

diff --git a/lemmy-translations b/lemmy-translations
index 183033e..a700edf 160000
--- a/lemmy-translations
+++ b/lemmy-translations
@@ -1 +1 @@
-Subproject commit 183033e0f796b450911e4e8f708ddd5969b12b77
+Subproject commit a700edf2dc9c290050b036b6d33e0ea351c92274
diff --git a/src/shared/components/community/sidebar.tsx b/src/shared/components/community/sidebar.tsx
index d4a5bc5..0e7358f 100644
--- a/src/shared/components/community/sidebar.tsx
+++ b/src/shared/components/community/sidebar.tsx
@@ -156,10 +156,10 @@ export class Sidebar extends Component<SidebarProps, SidebarState> {
         </li>
         <li
           className="list-inline-item badge badge-secondary pointer"
-          data-tippy-content={`${i18n.t("number_of_users", {
+          data-tippy-content={i18n.t("active_users_in_the_last_day", {
             count: counts.users_active_day,
             formattedCount: counts.users_active_day,
-          })} ${i18n.t("active_in_the_last")} ${i18n.t("day")}`}
+          })}
         >
           {i18n.t("number_of_users", {
             count: counts.users_active_day,
@@ -169,10 +169,10 @@ export class Sidebar extends Component<SidebarProps, SidebarState> {
         </li>
         <li
           className="list-inline-item badge badge-secondary pointer"
-          data-tippy-content={`${i18n.t("number_of_users", {
+          data-tippy-content={i18n.t("active_users_in_the_last_week", {
             count: counts.users_active_week,
             formattedCount: counts.users_active_week,
-          })} ${i18n.t("active_in_the_last")} ${i18n.t("week")}`}
+          })}
         >
           {i18n.t("number_of_users", {
             count: counts.users_active_week,
@@ -182,10 +182,10 @@ export class Sidebar extends Component<SidebarProps, SidebarState> {
         </li>
         <li
           className="list-inline-item badge badge-secondary pointer"
-          data-tippy-content={`${i18n.t("number_of_users", {
+          data-tippy-content={i18n.t("active_users_in_the_last_month", {
             count: counts.users_active_month,
             formattedCount: counts.users_active_month,
-          })} ${i18n.t("active_in_the_last")} ${i18n.t("month")}`}
+          })}
         >
           {i18n.t("number_of_users", {
             count: counts.users_active_month,
@@ -195,13 +195,10 @@ export class Sidebar extends Component<SidebarProps, SidebarState> {
         </li>
         <li
           className="list-inline-item badge badge-secondary pointer"
-          data-tippy-content={`${i18n.t("number_of_users", {
+          data-tippy-content={i18n.t("active_users_in_the_last_six_months", {
             count: counts.users_active_half_year,
             formattedCount: counts.users_active_half_year,
-          })} ${i18n.t("active_in_the_last")} ${i18n.t("number_of_months", {
-            count: 6,
-            formattedCount: 6,
-          })}`}
+          })}
         >
           {i18n.t("number_of_users", {
             count: counts.users_active_half_year,
diff --git a/src/shared/components/home/home.tsx b/src/shared/components/home/home.tsx
index a22a959..ec581c0 100644
--- a/src/shared/components/home/home.tsx
+++ b/src/shared/components/home/home.tsx
@@ -511,10 +511,10 @@ export class Home extends Component<any, HomeState> {
         </li>
         <li
           className="list-inline-item badge badge-secondary pointer"
-          data-tippy-content={`${i18n.t("number_of_users", {
+          data-tippy-content={i18n.t("active_users_in_the_last_day", {
             count: counts.users_active_day,
-            formattedCount: counts.users_active_day,
-          })} ${i18n.t("active_in_the_last")} ${i18n.t("day")}`}
+            formattedCount: numToSI(counts.users_active_day),
+          })}
         >
           {i18n.t("number_of_users", {
             count: counts.users_active_day,
@@ -524,10 +524,10 @@ export class Home extends Component<any, HomeState> {
         </li>
         <li
           className="list-inline-item badge badge-secondary pointer"
-          data-tippy-content={`${i18n.t("number_of_users", {
+          data-tippy-content={i18n.t("active_users_in_the_last_week", {
             count: counts.users_active_week,
             formattedCount: counts.users_active_week,
-          })} ${i18n.t("active_in_the_last")} ${i18n.t("week")}`}
+          })}
         >
           {i18n.t("number_of_users", {
             count: counts.users_active_week,
@@ -537,10 +537,10 @@ export class Home extends Component<any, HomeState> {
         </li>
         <li
           className="list-inline-item badge badge-secondary pointer"
-          data-tippy-content={`${i18n.t("number_of_users", {
+          data-tippy-content={i18n.t("active_users_in_the_last_month", {
             count: counts.users_active_month,
             formattedCount: counts.users_active_month,
-          })} ${i18n.t("active_in_the_last")} ${i18n.t("month")}`}
+          })}
         >
           {i18n.t("number_of_users", {
             count: counts.users_active_month,
@@ -550,13 +550,10 @@ export class Home extends Component<any, HomeState> {
         </li>
         <li
           className="list-inline-item badge badge-secondary pointer"
-          data-tippy-content={`${i18n.t("number_of_users", {
+          data-tippy-content={i18n.t("active_users_in_the_last_six_months", {
             count: counts.users_active_half_year,
             formattedCount: counts.users_active_half_year,
-          })} ${i18n.t("active_in_the_last")} ${i18n.t("number_of_months", {
-            count: 6,
-            formattedCount: 6,
-          })}`}
+          })}
         >
           {i18n.t("number_of_users", {
             count: counts.users_active_half_year,
-- 
2.44.1