Skip to content

871 bug switching languages breaks the map #875

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

871 bug switching languages breaks the map #875

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
9f28053
fix(871): update IRC link to libera.chat in README
dgraf-gh Apr 2, 2026
a9bf26a
fix(871): ensure locale is stored as language tag in UserSettingsDTO
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
2 changes: 1 addition & 1 deletion README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -381,7 +381,7 @@ There are multiple ways of getting support:

- create a [new issue](https://github.com/dedicatedcode/reitti/issues/new/choose)
- tag me on [Lemmy](https://discuss.tchncs.de/u/danielgraf)
- or join **#reitti** on [irc.dedicatedcode.com](https://irc.dedicatedcode.com)
- or join **#reitti** on [libera.chat](https://libera.chat)

## Translations

Expand Down
7 changes: 4 additions & 3 deletions src/main/java/com/dedicatedcode/reitti/controller/UserSettingsControllerAdvice.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ public UserSettingsDTO getCurrentUserSettings() {
// Return default settings for anonymous users
return new UserSettingsDTO(false,
Language.EN,
Locale.ENGLISH,
Locale.ENGLISH.toLanguageTag(),
Instant.now(),
UnitSystem.METRIC,
DEFAULT_HOME_LATITUDE,
Expand All @@ -77,7 +77,7 @@ public UserSettingsDTO getCurrentUserSettings() {
Language selectedLanguage = dbSettings.getSelectedLanguage();
return new UserSettingsDTO(dbSettings.isPreferColoredMap(),
selectedLanguage,
selectedLanguage.getLocale(),
selectedLanguage.getLocale().toLanguageTag(),
latestData,
dbSettings.getUnitSystem(),
dbSettings.getHomeLatitude(),
Expand All @@ -92,7 +92,7 @@ public UserSettingsDTO getCurrentUserSettings() {
// Fallback for authenticated users not found in database
return new UserSettingsDTO(false,
Language.EN,
Locale.ENGLISH,
Locale.ENGLISH.toLanguageTag(),
Instant.now(),
UnitSystem.METRIC,
DEFAULT_HOME_LATITUDE,
Expand All @@ -119,6 +119,7 @@ private UserSettingsDTO.UIMode mapUserToUiMode(Authentication authentication) {
throw new IllegalStateException("Invalid user authentication mode detected [" + grantedRoles + "]");
}
}

private UserSettingsDTO.PhotoMode mapUserToPhotoMode(Authentication authentication) {
List<String> grantedRoles = authentication.getAuthorities().stream().map(GrantedAuthority::getAuthority).toList();
if (grantedRoles.contains("ROLE_ADMIN") ||
Expand Down
2 changes: 1 addition & 1 deletion src/main/java/com/dedicatedcode/reitti/dto/UserSettingsDTO.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
public record UserSettingsDTO(
boolean preferColoredMap,
Language selectedLanguage,
Locale selectedLocale,
String selectedLocale,
Instant newestData,
UnitSystem unitSystem,
Double homeLatitude,
Expand Down
Loading