Merge branch 'main' into main

diff --cc 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
@@@ -67,14 -67,13 +67,14 @@@ export class SortSelect extends Compone
            <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"