Leahnaya/website
1
0
Fork 0
mirror of https://github.com/PretendoNetwork/website.git synced 2026-09-27 19:16:53 -05:00
Code Issues Actions Packages Projects Releases Wiki Activity

fix: types

Browse Source
This commit is contained in:
limes
2026-08-20 21:47:23 +02:00
parent ee2ac68b0d
commit 50250019e4
2 changed files with 21 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/pages/account/index.vue
View File

@@ -118,7 +118,7 @@ watch(newRegion, (o, n) => {
return;
}
newTimezone.value = newLocalizedTimezoneList.value[0].area;
newTimezone.value = newLocalizedTimezoneList.value?.[0]?.area;
});
const {

26
src/utils/localizeConsole.ts
View File

@@ -12,6 +12,12 @@ type TimezoneLanguageCollection = Record<string, Array<Timezone>>;
type TimezoneCollection = Record<string, TimezoneLanguageCollection>;
const timezones = timezoneData as TimezoneCollection;
type languageName = 'japanese' | 'french' | 'german' | 'italian' | 'spanish' | 'korean' | 'dutch' | 'portuguese' | 'russian' | 'chinese_traditional' | 'chinese_simple' | 'english';
type languageCode = 'ja' | 'fr' | 'de' | 'it' | 'es' | 'ko' | 'nl' | 'pt' | 'ru' | 'zh-Hant' | 'zh-Hans' | 'en';
export function webLocaleToConsoleLocale(lo: string): languageName {
const convObj: Record<languageCode, languageName> = {
'ja': 'japanese',
'fr': 'french',
'de': 'german',
@@ -22,15 +28,18 @@ const timezones = timezoneData as TimezoneCollection;
'pt': 'portuguese',
'ru': 'russian',
'zh-Hant': 'chinese_traditional',
'zh-Hans': 'chinese_simple'
'zh-Hans': 'chinese_simple',
'en': 'english'
};
const l = lo.split('-');
const l = lo.split('-')[0]!;
return convObj[l[0]] || convObj[lo] || 'english';
const correspondence = convObj[l as languageCode];
return correspondence || convObj[lo as languageCode] || convObj.en;
}
export function webLocaleToTimezoneLocale(lo: string) {
export function webLocaleToTimezoneLocale(lo: string): languageCode {
const l = lo.split('-');
switch (l[0]) {
@@ -81,11 +90,16 @@ export function getLocalizedRegionTimezones(localeCode: string, region: number |
}
const country = regionIdToCountryObject(region);
if (!country) {
return;
}
const l = webLocaleToTimezoneLocale(localeCode);
const countryTimezones = timezones[country.iso_code];
return countryTimezones[l] || countryTimezones.en || countryTimezones.ja;
return countryTimezones?.[l] || countryTimezones?.en || countryTimezones?.ja;
}
export function getLocalizedTimezoneString(localeCode: string | undefined, region: number | undefined, timezone: string | undefined) {
@@ -97,7 +111,7 @@ export function getLocalizedTimezoneString(localeCode: string | undefined, regio
let localizedTz = '';
const tzObj = tList.find((v) => {
const tzObj = tList?.find((v) => {
return (v.area === timezone);
});