diff --git a/public/html/settings.html b/public/html/settings.html index f0f7d73..4aef602 100644 --- a/public/html/settings.html +++ b/public/html/settings.html @@ -17,7 +17,7 @@
General
-
Runners
+
Wine version
DXVK
@@ -64,7 +64,7 @@
-

Runners

+

diff --git a/public/locales/de.json b/public/locales/de.json index 4adc818..3f6f4ca 100644 --- a/public/locales/de.json +++ b/public/locales/de.json @@ -1,11 +1,13 @@ { "Install": "Installieren", + "Update": "Updaten", "Launch": "Starten", "Runners": "Runners", "Langs": "Sprachen", "Voice": "Sprachpaket", "SettingsTitle": "Einstellungen", "GeneralSettings": "Generell", + "WineVersion": "Wine Version", "Downloading": "wird Heruntergeladen", "Unpack": "wird Entpackt", "GameDownloaded": "Spiel würde erfolgreich heruntergeladen", diff --git a/public/locales/en-us.json b/public/locales/en-us.json index 7eddd44..ef0cacf 100644 --- a/public/locales/en-us.json +++ b/public/locales/en-us.json @@ -1,5 +1,6 @@ { "Install": "Install", + "Update": "Update", "Launch": "Launch", "Runners": "Runners", "Langs": "Languages", @@ -7,6 +8,7 @@ "SettingsTitle": "Settings", "GeneralSettings": "General", "Downloading": "Downloading", + "WineVersion": "Wine version", "Unpack": "Unpacking", "GameDownloaded": "Game was successfully installed", "ApplyPatch": "Applying patch...", diff --git a/public/locales/en.json b/public/locales/en.json index 7eddd44..cad7c8f 100644 --- a/public/locales/en.json +++ b/public/locales/en.json @@ -1,11 +1,13 @@ { "Install": "Install", + "Update": "Update", "Launch": "Launch", "Runners": "Runners", "Langs": "Languages", "Voice": "Voice Pack", "SettingsTitle": "Settings", "GeneralSettings": "General", + "WineVersion": "Wine version", "Downloading": "Downloading", "Unpack": "Unpacking", "GameDownloaded": "Game was successfully installed", diff --git a/public/locales/es.json b/public/locales/es.json index 7eddd44..cad7c8f 100644 --- a/public/locales/es.json +++ b/public/locales/es.json @@ -1,11 +1,13 @@ { "Install": "Install", + "Update": "Update", "Launch": "Launch", "Runners": "Runners", "Langs": "Languages", "Voice": "Voice Pack", "SettingsTitle": "Settings", "GeneralSettings": "General", + "WineVersion": "Wine version", "Downloading": "Downloading", "Unpack": "Unpacking", "GameDownloaded": "Game was successfully installed", diff --git a/public/locales/fr.json b/public/locales/fr.json index 7eddd44..cad7c8f 100644 --- a/public/locales/fr.json +++ b/public/locales/fr.json @@ -1,11 +1,13 @@ { "Install": "Install", + "Update": "Update", "Launch": "Launch", "Runners": "Runners", "Langs": "Languages", "Voice": "Voice Pack", "SettingsTitle": "Settings", "GeneralSettings": "General", + "WineVersion": "Wine version", "Downloading": "Downloading", "Unpack": "Unpacking", "GameDownloaded": "Game was successfully installed", diff --git a/public/locales/id.json b/public/locales/id.json index 7eddd44..cad7c8f 100644 --- a/public/locales/id.json +++ b/public/locales/id.json @@ -1,11 +1,13 @@ { "Install": "Install", + "Update": "Update", "Launch": "Launch", "Runners": "Runners", "Langs": "Languages", "Voice": "Voice Pack", "SettingsTitle": "Settings", "GeneralSettings": "General", + "WineVersion": "Wine version", "Downloading": "Downloading", "Unpack": "Unpacking", "GameDownloaded": "Game was successfully installed", diff --git a/public/locales/ja.json b/public/locales/ja.json index 7a2a76e..a2a2d76 100644 --- a/public/locales/ja.json +++ b/public/locales/ja.json @@ -1,5 +1,6 @@ { "Install": "インストール", + "Update": "アップデート", "Launch": "打ち上げ", "Runners": "Runners", "Langs": "言語", @@ -7,6 +8,7 @@ "SettingsTitle": "設定", "GeneralSettings": "一般", "Downloading": "ダウンロード中", + "WineVersion": "ワインバージョン", "Unpack": "開梱", "GameDownloaded": "ゲームのインストールに成功しました", "ApplyPatch": "パッチの適用...", diff --git a/public/locales/ko.json b/public/locales/ko.json index 7eddd44..cad7c8f 100644 --- a/public/locales/ko.json +++ b/public/locales/ko.json @@ -1,11 +1,13 @@ { "Install": "Install", + "Update": "Update", "Launch": "Launch", "Runners": "Runners", "Langs": "Languages", "Voice": "Voice Pack", "SettingsTitle": "Settings", "GeneralSettings": "General", + "WineVersion": "Wine version", "Downloading": "Downloading", "Unpack": "Unpacking", "GameDownloaded": "Game was successfully installed", diff --git a/public/locales/pt.json b/public/locales/pt.json index 7eddd44..cad7c8f 100644 --- a/public/locales/pt.json +++ b/public/locales/pt.json @@ -1,11 +1,13 @@ { "Install": "Install", + "Update": "Update", "Launch": "Launch", "Runners": "Runners", "Langs": "Languages", "Voice": "Voice Pack", "SettingsTitle": "Settings", "GeneralSettings": "General", + "WineVersion": "Wine version", "Downloading": "Downloading", "Unpack": "Unpacking", "GameDownloaded": "Game was successfully installed", diff --git a/public/locales/ru.json b/public/locales/ru.json index 7eddd44..cad7c8f 100644 --- a/public/locales/ru.json +++ b/public/locales/ru.json @@ -1,11 +1,13 @@ { "Install": "Install", + "Update": "Update", "Launch": "Launch", "Runners": "Runners", "Langs": "Languages", "Voice": "Voice Pack", "SettingsTitle": "Settings", "GeneralSettings": "General", + "WineVersion": "Wine version", "Downloading": "Downloading", "Unpack": "Unpacking", "GameDownloaded": "Game was successfully installed", diff --git a/public/locales/th.json b/public/locales/th.json index 7eddd44..cad7c8f 100644 --- a/public/locales/th.json +++ b/public/locales/th.json @@ -1,11 +1,13 @@ { "Install": "Install", + "Update": "Update", "Launch": "Launch", "Runners": "Runners", "Langs": "Languages", "Voice": "Voice Pack", "SettingsTitle": "Settings", "GeneralSettings": "General", + "WineVersion": "Wine version", "Downloading": "Downloading", "Unpack": "Unpacking", "GameDownloaded": "Game was successfully installed", diff --git a/public/locales/vi.json b/public/locales/vi.json index 7eddd44..cad7c8f 100644 --- a/public/locales/vi.json +++ b/public/locales/vi.json @@ -1,11 +1,13 @@ { "Install": "Install", + "Update": "Update", "Launch": "Launch", "Runners": "Runners", "Langs": "Languages", "Voice": "Voice Pack", "SettingsTitle": "Settings", "GeneralSettings": "General", + "WineVersion": "Wine version", "Downloading": "Downloading", "Unpack": "Unpacking", "GameDownloaded": "Game was successfully installed", diff --git a/public/locales/zh-cn.json b/public/locales/zh-cn.json index f5f0ddd..3dc9fa9 100644 --- a/public/locales/zh-cn.json +++ b/public/locales/zh-cn.json @@ -1,5 +1,6 @@ { "Install": "安装", + "Update": "更新", "Launch": "发射", "Runners": "Runners", "Langs": "语言", @@ -7,6 +8,7 @@ "SettingsTitle": "设置", "GeneralSettings": "一般的", "Downloading": "下载", + "WineVersion": "葡萄酒版", "Unpack": "开箱", "GameDownloaded": "游戏安装成功", "ApplyPatch": "应用补丁...", diff --git a/public/locales/zh-tw.json b/public/locales/zh-tw.json index cc1d6df..dc1de1e 100644 --- a/public/locales/zh-tw.json +++ b/public/locales/zh-tw.json @@ -1,5 +1,6 @@ { "Install": "安裝", + "Update": "更新", "Launch": "發射", "Runners": "Runners", "Langs": "語言", @@ -7,6 +8,7 @@ "SettingsTitle": "設置", "GeneralSettings": "一般的", "Downloading": "下載", + "WineVersion": "葡萄酒版", "Unpack": "Unpacking", "GameDownloaded": "遊戲安裝成功", "ApplyPatch": "Applying patch...", diff --git a/src/ts/LauncherUI.ts b/src/ts/LauncherUI.ts index 133fa5a..77ceed9 100644 --- a/src/ts/LauncherUI.ts +++ b/src/ts/LauncherUI.ts @@ -55,7 +55,7 @@ export class LauncherUI break; case 'game-update-available': - $('#launch').text('Update'); // FIXME i18n.translate + $('#launch').text(i18n.translate('Update')); break; @@ -156,13 +156,26 @@ export class LauncherUI Genshinlib.getBackgroundUri().then(uri => $('body').css('background-image', `url(${uri})`)); } + public static updateSocial (): void + { + fetch(`https://genshin.mihoyo.com/launcher/10/${Genshinlib.lang.launcher}?api_url=https%3A%2F%2Fapi-os-takumi.mihoyo.com%2Fhk4e_global&prev=false`) + .then(res => res.text()) + .then(body => { + $('#__layout').remove(); + $(body).find('#__layout').appendTo('#launchcontent'); + + $('#launchcontent .home__main .home-swiper-wrap').remove(); + $('#launchcontent .home__main .home-news').remove(); + }); + } + public static updateLang (lang: string|null = null): void { if (lang !== null) i18n.setLang(lang); $('*[i18id]').each((i, element) => { - element.innerText = i18n.translate(element.getAttribute('i18id')?.toString()!); + element.innerText = i18n.translate(element.getAttribute('i18id')!); }); } } \ No newline at end of file diff --git a/src/ts/index.ts b/src/ts/index.ts index 0438930..220eb93 100644 --- a/src/ts/index.ts +++ b/src/ts/index.ts @@ -25,19 +25,13 @@ $(() => { LauncherUI.setState('game-launch-available'); LauncherUI.updateBackground(); - - fetch(`https://genshin.mihoyo.com/launcher/10/${Genshinlib.lang.launcher}?api_url=https%3A%2F%2Fapi-os-takumi.mihoyo.com%2Fhk4e_global&prev=false`) - .then(res => res.text()) - .then(body => { - $(body).find('#__layout').appendTo('#launchcontent'); - - $('#launchcontent .home__main .home-swiper-wrap').remove(); - $('#launchcontent .home__main .home-news').remove(); - }); + LauncherUI.updateSocial(); ipcRenderer.on('change-lang', (event: void, data: any) => { LauncherUI.updateBackground(); - LauncherUI.updateLang(); + LauncherUI.updateSocial(); + // Needs data.lang in the arguments since the button doesn't get updated otherwise. + LauncherUI.updateLang(data.lang); }); let rpc: any;