Skip to content

873 feature request key jscommonminutes ago and so on needs placeholders #874

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
dgraf-gh merged 2 commits into from
Apr 2, 2026
Merged

873 feature request key jscommonminutes ago and so on needs placeholders #874

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ccdf9e4
feat(873): update time formatting with placeholders for international…
dgraf-gh Apr 2, 2026
b884df9
feat(873): improve popup hover behavior for markers
dgraf-gh Apr 2, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/main/resources/messages.properties
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1593,9 +1593,9 @@ js.common.position=Position

js.common.unknown=Unknown
js.common.just-now=Just now
js.common.minutes-ago=minutes ago
js.common.hours-ago=hours ago
js.common.days-ago=days ago
js.common.minutes-ago={0} minutes ago
js.common.hours-ago={0} hours ago
js.common.days-ago={0} days ago
js.common.last-updated=Last updated

js.autoupdate.state.disable=Leave Auto-Update-Mode
Expand Down
25 changes: 14 additions & 11 deletions src/main/resources/static/js/map-renderer.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1105,16 +1105,19 @@ class MapRenderer {
closeButton: false
}).setHTML(popupContent);

marker.setPopup(popup);
container.addEventListener('pointerenter', (e) => {
e.stopPropagation();
e.stopImmediatePropagation();
popup.setLngLat([lng, lat]).addTo(this.map);
}, { capture: true });

container.addEventListener('pointerleave', (e) => {
e.stopPropagation();
e.stopImmediatePropagation();
popup.remove();
}, { capture: true });

// Use MapLibre's built-in hover events for better reliability
marker.getElement().addEventListener('mouseenter', () => {
marker.getPopup().addTo(this.map);
});

marker.getElement().addEventListener('mouseleave', () => {
marker.getPopup().remove();
});

// Store the marker by user ID for updates
this.avatarMarkers.set(userId, marker);
Expand Down Expand Up @@ -1259,12 +1262,12 @@ class MapRenderer {
if (diffMinutes < 1) {
return t('common.just-now') || 'Just now';
} else if (diffMinutes < 60) {
return `${diffMinutes} ${t('common.minutes-ago') || 'minutes ago'}`;
return `${t('common.minutes-ago', [diffMinutes]) || 'minutes ago'}`;
} else if (diffHours < 24) {
return `${diffHours} ${t('common.hours-ago') || 'hours ago'}`;
return `${t('common.hours-ago', [diffHours]) || 'hours ago'}`;
} else {
const diffDays = Math.floor(diffHours / 24);
return `${diffDays} ${t('common.days-ago') || 'days ago'}`;
return `${t('common.days-ago', [diffDays]) || 'days ago'}`;
}
}

Expand Down
Loading