Skip to content

fix: fall back to Locale.ROOT when no i18n_en.properties exists for English locale #51

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
busehalis-sap merged 2 commits into from
Jul 24, 2026
Merged

fix: fall back to Locale.ROOT when no i18n_en.properties exists for English locale #51

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
3e20638
fix: fall back to Locale.ROOT when no i18n_en.properties exists for E…
busehalis-sap Jul 24, 2026
0979ffe
docs: add CHANGELOG entry for i18n English root fallback fix
busehalis-sap Jul 24, 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
3 changes: 3 additions & 0 deletions CHANGELOG.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/).
### Fixed

## Version 0.0.2-alpha - 2026-07-20
### Fixed
- Fall back to `Locale.ROOT` (`i18n.properties`) when no explicit `i18n_en.properties` exists, so applications following the CAP default i18n convention no longer fail at startup with unresolved English placeholders

### Changed
- Updated cds.services.version to 5.0.0

Expand Down
10 changes: 9 additions & 1 deletion cds-feature-notifications/src/main/java/com/sap/cds/notifications/helpers/I18nHelper.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,15 @@ public Set<Locale> getAvailableLocalesForEvent(CdsEvent event) {
public Map<String, String> getI18nTexts(Locale locale) {
EdmxI18nProvider provider = getProvider();
if (provider != null) {
return provider.getTexts(locale);
Map<String, String> texts = new HashMap<>(provider.getTexts(locale));
// Also include Locale.ROOT (default i18n.properties) as fallback so that apps without an
// explicit i18n_en.properties file work correctly. putIfAbsent ensures that locale-specific
// entries from i18n_en.properties take precedence over root entries when both exist.
if (Locale.ENGLISH.equals(locale)) {
Map<String, String> rootTexts = provider.getTexts(Locale.ROOT);
rootTexts.forEach(texts::putIfAbsent);
}
return texts;
}
logger.warn("EdmxI18nProvider not available, i18n resolution will not work");
return Collections.emptyMap();
Expand Down
Loading