Merge branch 'main' into main

diff --combined src/shared/components/common/sort-select.tsx
index c77f068ea1e6a73af6f3f1ecabda3d41f0b1cf57,90515d5648992452114a0af158eb5d70ecdbfc5d..33c5c85ff133431be03fa3ca5f80afd24c5000a1
--- 1/src/shared/components/common/sort-select.tsx
--- 2/src/shared/components/common/sort-select.tsx
+++ b/src/shared/components/common/sort-select.tsx
@@@ -2,7 -2,7 +2,7 @@@ import { randomStr } from "@utils/helpe
  import { Component, linkEvent } from "inferno";
  import { SortType } from "lemmy-js-client";
  import { relTags, sortingHelpUrl } from "../../config";
- import { i18n } from "../../i18next";
+ import { I18NextService } from "../../services";
  import { Icon } from "./icon";
  
  interface SortSelectProps {
@@@ -41,46 -41,45 +41,46 @@@ export class SortSelect extends Compone
            value={this.state.sort}
            onChange={linkEvent(this, this.handleSortChange)}
            className="sort-select form-select d-inline-block w-auto me-2"
-           aria-label={i18n.t("sort_type")}
+           aria-label={I18NextService.i18n.t("sort_type")}
          >
            <option disabled aria-hidden="true">
-             {i18n.t("sort_type")}
+             {I18NextService.i18n.t("sort_type")}
            </option>
            {!this.props.hideHot && [
              <option key={"Hot"} value={"Hot"}>
-               {i18n.t("hot")}
+               {I18NextService.i18n.t("hot")}
              </option>,
              <option key={"Active"} value={"Active"}>
-               {i18n.t("active")}
+               {I18NextService.i18n.t("active")}
              </option>,
            ]}
-           <option value={"New"}>{i18n.t("new")}</option>
-           <option value={"Old"}>{i18n.t("old")}</option>
+           <option value={"New"}>{I18NextService.i18n.t("new")}</option>
+           <option value={"Old"}>{I18NextService.i18n.t("old")}</option>
            {!this.props.hideMostComments && [
              <option key={"MostComments"} value={"MostComments"}>
-               {i18n.t("most_comments")}
+               {I18NextService.i18n.t("most_comments")}
              </option>,
              <option key={"NewComments"} value={"NewComments"}>
-               {i18n.t("new_comments")}
+               {I18NextService.i18n.t("new_comments")}
              </option>,
            ]}
            <option disabled aria-hidden="true">
              ─────
            </option>
-           <option value={"TopHour"}>{i18n.t("top_hour")}</option>
-           <option value={"TopSixHour"}>{i18n.t("top_six_hours")}</option>
-           <option value={"TopTwelveHour"}>{i18n.t("top_twelve_hours")}</option>
-           <option value={"TopDay"}>{i18n.t("top_day")}</option>
-           <option value={"TopWeek"}>{i18n.t("top_week")}</option>
-           <option value={"TopMonth"}>{i18n.t("top_month")}</option>
-           <option value={"TopYear"}>{i18n.t("top_year")}</option>
-           <option value={"TopAll"}>{i18n.t("top_all")}</option>
++          <option value={"TopHour"}>{I18NextService.i18n.t("top_hour")}</option>
++          <option value={"TopSixHour"}>{I18NextService.i18n.t("top_six_hours")}</option>
++          <option value={"TopTwelveHour"}>{I18NextService.i18n.t("top_twelve_hours")}</option>
+           <option value={"TopDay"}>{I18NextService.i18n.t("top_day")}</option>
+           <option value={"TopWeek"}>{I18NextService.i18n.t("top_week")}</option>
 -          <option value={"TopMonth"}>
 -            {I18NextService.i18n.t("top_month")}
 -          </option>
++          <option value={"TopMonth"}>{I18NextService.i18n.t("top_month")}</option>
+           <option value={"TopYear"}>{I18NextService.i18n.t("top_year")}</option>
+           <option value={"TopAll"}>{I18NextService.i18n.t("top_all")}</option>
          </select>
          <a
            className="sort-select-icon text-muted"
            href={sortingHelpUrl}
            rel={relTags}
-           title={i18n.t("sorting_help")}
+           title={I18NextService.i18n.t("sorting_help")}
          >
            <Icon icon="help-circle" classes="icon-inline" />
          </a>