From 26db88966f9c09d036a1b191a0c579e9a48af58e Mon Sep 17 00:00:00 2001
From: ChristoferMendes
Date: Sun, 12 May 2024 21:54:03 -0300
Subject: [PATCH] refactor: Update getRepackLanguageBasedOnRepacker function
parameters and use user preferences
---
src/renderer/src/helpers/searcher.ts | 15 ++++------
.../src/pages/game-details/repacks-modal.tsx | 13 ++++++++-
.../seeders-and-peers/useMagnetHealth.tsx | 29 ++++++++++---------
3 files changed, 34 insertions(+), 23 deletions(-)
diff --git a/src/renderer/src/helpers/searcher.ts b/src/renderer/src/helpers/searcher.ts
index 52d0cd52..899b2691 100644
--- a/src/renderer/src/helpers/searcher.ts
+++ b/src/renderer/src/helpers/searcher.ts
@@ -14,20 +14,17 @@ export const supportMultiLanguage = (title: string) => {
return multiFollowedByDigitsRegex.test(title.toLowerCase());
};
-// const languageCode = 'en';
-// const displayNames = new Intl.DisplayNames([languageCode], { type: 'language' });
-// const englishLanguage = displayNames.of(languageCode);
-
-// console.log(englishLanguage); // Output: "English"
-
-export const getRepackLanguageBasedOnRepacker = (repacker: string) => {
+export const getRepackLanguageBasedOnRepacker = (
+ repacker: string,
+ userLanguage: string
+) => {
const languageCodes = {
xatab: "ru",
};
- const languageCode = languageCodes[repacker.toLowerCase()] || "en";
+ const languageCode = languageCodes[repacker.toLowerCase()] || userLanguage;
- const displayNames = new Intl.DisplayNames([languageCode], {
+ const displayNames = new Intl.DisplayNames([userLanguage.slice(0, 2)], {
type: "language",
});
diff --git a/src/renderer/src/pages/game-details/repacks-modal.tsx b/src/renderer/src/pages/game-details/repacks-modal.tsx
index 55ea440b..525e10bb 100644
--- a/src/renderer/src/pages/game-details/repacks-modal.tsx
+++ b/src/renderer/src/pages/game-details/repacks-modal.tsx
@@ -34,6 +34,9 @@ export function RepacksModal({
const [filteredRepacks, setFilteredRepacks] = useState([]);
const [repack, setRepack] = useState(null);
const [showSelectFolderModal, setShowSelectFolderModal] = useState(false);
+ const { value: userPreferences } = useAppSelector(
+ (state) => state.userPreferences
+ );
const repackersFriendlyNames = useAppSelector(
(state) => state.repackersFriendlyNames.value
@@ -109,7 +112,15 @@ export function RepacksModal({
{repack.uploadDate
? format(repack.uploadDate, "dd/MM/yyyy")
: ""}
- {" - " + getRepackLanguageBasedOnRepacker(repack.repacker)}
+ {userPreferences?.language && (
+ <>
+ {" - " +
+ getRepackLanguageBasedOnRepacker(
+ repack.repacker,
+ userPreferences?.language
+ )}
+ >
+ )}
diff --git a/src/renderer/src/pages/game-details/seeders-and-peers/useMagnetHealth.tsx b/src/renderer/src/pages/game-details/seeders-and-peers/useMagnetHealth.tsx
index 6ea55a27..67e6f21e 100644
--- a/src/renderer/src/pages/game-details/seeders-and-peers/useMagnetHealth.tsx
+++ b/src/renderer/src/pages/game-details/seeders-and-peers/useMagnetHealth.tsx
@@ -27,21 +27,24 @@ export function useMagnetHealth(magnet: string) {
return;
}
- window.electron.getMagnetHealth(magnet).then(
- (result) => {
- if (result) {
- setMagnetData(result);
- setIsLoading(false);
+ window.electron
+ .getMagnetHealth(magnet)
+ .then(
+ (result) => {
+ if (result) {
+ setMagnetData(result);
+ setIsLoading(false);
- cache[magnet] = result;
- cache[magnet].lastTracked = new Date();
+ cache[magnet] = result;
+ cache[magnet].lastTracked = new Date();
+ }
+ },
+ (error) => {
+ setError(error);
+ setIsLoading(false);
}
- },
- (error) => {
- setError(error);
- setIsLoading(false);
- }
- );
+ )
+ .catch(() => {});
}, [magnet]);
useEffect(() => {