Skip to content

SLING-8802 JcrResourceBundle should not consider dictionaries with a … #2

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

Open
joerghoh wants to merge 1 commit into
base: master
Choose a base branch
from
Open

SLING-8802 JcrResourceBundle should not consider dictionaries with a … #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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: 2 additions & 1 deletion src/main/java/org/apache/sling/i18n/impl/JcrResourceBundle.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -337,7 +337,8 @@ private Set<String> loadPotentialLanguageRoots(ResourceResolver resourceResolver
|| language.equals(localeRFC4646StringLower)) {
// basename might be a multivalue (see https://issues.apache.org/jira/browse/SLING-4547)
String[] baseNames = properties.get(PROP_BASENAME, new String[]{});
if (baseName == null || Arrays.asList(baseNames).contains(baseName)) {
if ((baseName != null && Arrays.asList(baseNames).contains(baseName))
|| baseName == null && Arrays.asList(baseNames).isEmpty()) {
paths.add(bundle.getPath());
}
}
Expand Down
4 changes: 2 additions & 2 deletions src/test/java/org/apache/sling/i18n/it/ResourceBundleProviderIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -207,13 +207,13 @@ public void testChangesDetection() throws RepositoryException {
// set a message and fetch it so that it is cached in the resourcebundle cache
setMessage(enBasenameRoot, MSG_KEY3, "EN_basename_message");
session.save();
assertMessage(MSG_KEY3, Locale.ENGLISH, null, "EN_basename_message");
assertMessage(MSG_KEY3, Locale.ENGLISH, null, MSG_KEY3); // returns the key, as it's not found
assertMessage(MSG_KEY3, Locale.ENGLISH, BASENAME, "EN_basename_message");

// see that both resource bundles with and without basename are changed
setMessage(enBasenameRoot, MSG_KEY3, "EN_basename_changed");
session.save();
assertMessage(MSG_KEY3, Locale.ENGLISH, null, "EN_basename_changed");
assertMessage(MSG_KEY3, Locale.ENGLISH, null, MSG_KEY3);
assertMessage(MSG_KEY3, Locale.ENGLISH, BASENAME, "EN_basename_changed");
}

Expand Down