diff --git a/src/components/ProxyRegistrar.astro b/src/components/ProxyRegistrar.astro index f362ac2..e9f6d3d 100644 --- a/src/components/ProxyRegistrar.astro +++ b/src/components/ProxyRegistrar.astro @@ -201,7 +201,7 @@ let favicon = iframe.contentDocument.querySelector("link[rel='icon']") || iframe.contentDocument.querySelector("link[rel*='icon']"); - if (proxiedFavicon.src == favicon.href) return; + if(favicon) if (proxiedFavicon.src == favicon.href) return; if (favicon) { proxiedFavicon.src = favicon.href; } else { @@ -215,6 +215,15 @@ } function updateTopbarTitle(iframe) { let topbarTitle = document.getElementById("url-text"); - topbarTitle.innerText = iframe.contentDocument.title; + if (iframe.contentDocument.title == "") { + topbarTitle.innerText = iframe.src; + } else { + if (iframe.contentDocument.title.length > 65) { + topbarTitle.innerText = iframe.contentDocument.title.slice(0, 65) + "..."; + return; + } + topbarTitle.innerText = iframe.contentDocument.title; + } + } diff --git a/src/components/SettingsContent/ProxyTab.astro b/src/components/SettingsContent/ProxyTab.astro index d6aceee..97e8d6e 100644 --- a/src/components/SettingsContent/ProxyTab.astro +++ b/src/components/SettingsContent/ProxyTab.astro @@ -65,6 +65,10 @@ const transportsList = [ +
+ + +
{ let dropdownButton = document.getElementById(dropdown.id.replace("-menu", "")); diff --git a/src/components/ts/TransportManager.ts b/src/components/ts/TransportManager.ts index 1b2a280..792097f 100644 --- a/src/components/ts/TransportManager.ts +++ b/src/components/ts/TransportManager.ts @@ -41,7 +41,7 @@ export default class TransportManager { let transportConfig: transportConfig = { wisp: wispURL }; if (this.transport == "BareMod.BareClient") { - transportConfig = window.location.origin + "/bare/"; + transportConfig = localStorage.getItem("alu__bareURL") || window.location.origin + "/bare/"; } SetTransport(this.transport, transportConfig); diff --git a/src/i18n/en.json b/src/i18n/en.json index 09c9920..bb3148c 100644 --- a/src/i18n/en.json +++ b/src/i18n/en.json @@ -43,6 +43,7 @@ "settings.proxy.searxngURL": "Searx URL", "settings.proxy.transport": "Transport", "settings.proxy.wispURL": "Wisp URL", + "settings.proxy.bareURL": "Bare URL", "settings.customization": "Customization", "settings.customization.theme": "Theme", diff --git a/src/i18n/jp.json b/src/i18n/jp.json index dab5dc5..c018b32 100644 --- a/src/i18n/jp.json +++ b/src/i18n/jp.json @@ -34,6 +34,7 @@ "settings.title": "設定", "settings.proxy": "プロキシ", + "settings.proxy.auto": "自動", "settings.proxy.selectedProxy": "選択されたプロキシ", "settings.proxy.searchEngine": "検索エンジン", "settings.proxy.openPageWith": "開く", @@ -42,6 +43,7 @@ "settings.proxy.searxngURL": "SearxのURL", "settings.proxy.transport": "トランスポート", "settings.proxy.wispURL": "ウィスプのURL", + "settings.proxy.bareURL": "BareのURL", "settings.customization": "カスタマイズ", "settings.customization.theme": "テーマ", diff --git a/src/i18n/utils.ts b/src/i18n/utils.ts index 6c8d123..5746416 100644 --- a/src/i18n/utils.ts +++ b/src/i18n/utils.ts @@ -10,7 +10,8 @@ export function getLangFromUrl(url: URL) { } export function useTranslations(lang: keyof typeof ui) { - return function t(key: keyof (typeof ui)[typeof defaultLang]) { - return ui[lang][key] || ui[defaultLang][key]; + return function t(translationKey: keyof (typeof ui)[typeof defaultLang]) { + if (ui[lang][translationKey]) return ui[lang][translationKey]; + else return ui[defaultLang][translationKey]; }; }