- Changing the default installation folder for Beat Saber instances will cause all installed data to be moved to the new folder.
+ {t("modals.install-folder.description")}
- resolver({exitCode: ModalExitCode.CANCELED})} withBar={false} text="Cancel"/>
- resolver({exitCode: ModalExitCode.COMPLETED})} withBar={false} text="Choose Folder"/>
+ resolver({exitCode: ModalExitCode.CANCELED})} withBar={false} text="misc.cancel"/>
+ resolver({exitCode: ModalExitCode.COMPLETED})} withBar={false} text="modals.install-folder.buttons.submit"/>
)
diff --git a/src/renderer/components/modal/modal-types/login-modal.component.tsx b/src/renderer/components/modal/modal-types/login-modal.component.tsx
index cbe6989e..9592f8ca 100644
--- a/src/renderer/components/modal/modal-types/login-modal.component.tsx
+++ b/src/renderer/components/modal/modal-types/login-modal.component.tsx
@@ -1,6 +1,7 @@
import { useState } from "react";
import { BsmButton } from "renderer/components/shared/bsm-button.component";
import { BsmImage } from "renderer/components/shared/bsm-image.component";
+import { useTranslation } from "renderer/hooks/use-translation.hook";
import { ModalExitCode, ModalResponse } from "renderer/services/modale.service";
import BeatImpatient from '../../../../../assets/images/apngs/beat-impatient.png'
@@ -9,6 +10,7 @@ export function LoginModal({resolver}: {resolver: (x: ModalResponse) => void}) {
const [username, setUsername] = useState('');
const [password, setPassword] = useState('');
const [stay, setStay] = useState(true);
+ const t = useTranslation();
const loggin = () => {
if(!username || !password){ return; }
@@ -17,23 +19,23 @@ export function LoginModal({resolver}: {resolver: (x: ModalResponse) => void}) {
return (
)
diff --git a/src/renderer/components/modal/modal-types/uninstall-modal.component.tsx b/src/renderer/components/modal/modal-types/uninstall-modal.component.tsx
index 8b0aa4e2..a760a83d 100644
--- a/src/renderer/components/modal/modal-types/uninstall-modal.component.tsx
+++ b/src/renderer/components/modal/modal-types/uninstall-modal.component.tsx
@@ -3,19 +3,21 @@ import BeatConflict from "../../../../../assets/images/apngs/beat-conflict.png"
import { BSVersion } from "main/services/bs-version-manager.service";
import { BsmButton } from "renderer/components/shared/bsm-button.component";
import { BsmImage } from "renderer/components/shared/bsm-image.component";
+import { useTranslation } from "renderer/hooks/use-translation.hook";
export function UninstallModal({resolver}: {resolver: (x: ModalResponse) => void}) {
const version = ModalService.getInsance().getModalData();
+ const t = useTranslation();
return (
)
diff --git a/src/renderer/hooks/use-translation.hook.ts b/src/renderer/hooks/use-translation.hook.ts
index 1474feb2..5c13efbe 100644
--- a/src/renderer/hooks/use-translation.hook.ts
+++ b/src/renderer/hooks/use-translation.hook.ts
@@ -1,12 +1,11 @@
import { I18nService } from "renderer/services/i18n.service"
-export function useTranslation(): (translationKey: string) => string{
+export function useTranslation(): (translationKey: string, args?: Record) => string{
const i18nService = I18nService.getInstance();
- return (key: string) => {
- if(!key){ return ""; }
+ return (key: string, args?: Record) => {
const tranlatables = key.split(" ");
- return tranlatables.map((key) => i18nService.translate(key)).join(" ");
+ return tranlatables.map((key) => i18nService.translate(key, args)).join(" ");
}
}
\ No newline at end of file
diff --git a/src/renderer/services/i18n.service.ts b/src/renderer/services/i18n.service.ts
index 35c12609..90a0965e 100644
--- a/src/renderer/services/i18n.service.ts
+++ b/src/renderer/services/i18n.service.ts
@@ -44,12 +44,14 @@ export class I18nService {
this.configService.set("language" as DefaultConfigKey, this.getSupportedLanguages().includes(lang) ? lang : this.LANG_FALLBACK);
}
- public translate(translationKey: string): string{
- const cachedTranlation = this.cache.get(translationKey);
- if(!!cachedTranlation){ return cachedTranlation; }
- const tranlated = getProperty(this.dictionary, translationKey);
- tranlated && this.cache.set(translationKey, tranlated);
- return tranlated || translationKey;
+ public translate(translationKey: string, args?: Record): string{
+ let translated = this.cache.get(translationKey);
+ if(!translated){
+ translated = getProperty(this.dictionary, translationKey);
+ translated ? this.cache.set(translated, translationKey) : translated = translationKey;
+ }
+ args && Object.keys(args).forEach(key => translated = translated.replaceAll(`{${key}}`, args[key]));
+ return translated;
}