161sh/iceshrimp-161sh
1
0
Fork 0
mirror of https://iceshrimp.dev/crimekillz/iceshrimp-161sh.git synced 2024-11-22 12:13:48 +01:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request 'feat: improved local time display' (#9851) from naskya/calckey:localtime-improvement into develop

Browse Source 
Reviewed-on: https://codeberg.org/calckey/calckey/pulls/9851
This commit is contained in:
Kainoa Kanter 2023-04-14 22:32:34 +00:00
commit 4c50736cda
3 changed files with 37 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
locales/en-US.yml
View File

@ -1426,7 +1426,7 @@ _profile:
metadataContent: "Content"
changeAvatar: "Change avatar"
changeBanner: "Change banner"
locationDescription: "If you enter your city, it will display your local time to other users."
locationDescription: "If you enter your city first, it will display your local time to other users."
_exportOrImport:
allNotes: "All posts"
followingList: "Followed users"

2
locales/ja-JP.yml
View File

@ -1423,7 +1423,7 @@ _profile:
metadataContent: "内容"
changeAvatar: "アバター画像を変更"
changeBanner: "バナー画像を変更"
locationDescription: "正しく入力すると、あなたの現地時間が他のユーザーに表示されます。"
locationDescription: "英語表記の都市名から始まる内容を入力すると、現地時間がユーザーページに表示されます。"
_exportOrImport:
allNotes: "全ての投稿"
followingList: "フォロー"

47
packages/client/src/pages/user/home.vue
View File

@ -353,18 +353,41 @@ const age = $computed(() => {
});
const timeForThem = $computed(() => {
const tzInfo = cityTimezones.lookupViaCity(
props.user.location!.replace(/\s.*/, "")
);
if (tzInfo.length == 0) return "";
const tz = tzInfo[0].timezone;
const theirTime = new Date().toLocaleString("en-US", {
timeZone: tz,
hour12: false,
});
return ` (${theirTime.split(",")[1].trim().split(":")[0]}:${theirTime
.split(" ")[1]
.slice(-5, -3)})`;
const maybeCityNames = [
props.user.location!,
props.user
.location!.replace(
/[^A-Za-z0-9ÁĆÉǴÍḰĹḾŃÓṔŔŚÚÝŹáćéǵíḱĺḿńóṕŕśúýź\-\'\.\s].*/,
""
)
.trim(),
props.user.location!.replace(
/[^A-Za-zÁĆÉǴÍḰĹḾŃÓṔŔŚÚÝŹáćéǵíḱĺḿńóṕŕśúýź\-\'\.].*/,
""
),
props.user.location!.replace(
/[^A-Za-zÁĆÉǴÍḰĹḾŃÓṔŔŚÚÝŹáćéǵíḱĺḿńóṕŕśúýź].*/,
""
),
];
for (const city of maybeCityNames) {
let tzInfo = cityTimezones.lookupViaCity(city);
if (tzInfo.length == 0) continue;
const tz = tzInfo[0].timezone;
if (!tz) continue;
const theirTime = new Date().toLocaleString("en-US", {
timeZone: tz,
hour12: false,
});
return ` (${theirTime.split(",")[1].trim().split(":")[0]}:${theirTime
.split(" ")[1]
.slice(-5, -3)})`;
}
return "";
});
function menu(ev) {