Author: kwin
Date: Wed Jun 17 12:25:29 2015
New Revision: 1685998

URL: http://svn.apache.org/r1685998
Log:
some more fixes

Modified:
    
sling/site/trunk/content/documentation/bundles/internationalization-support-i18n.mdtext

Modified: 
sling/site/trunk/content/documentation/bundles/internationalization-support-i18n.mdtext
URL: 
http://svn.apache.org/viewvc/sling/site/trunk/content/documentation/bundles/internationalization-support-i18n.mdtext?rev=1685998&r1=1685997&r2=1685998&view=diff
==============================================================================
--- 
sling/site/trunk/content/documentation/bundles/internationalization-support-i18n.mdtext
 (original)
+++ 
sling/site/trunk/content/documentation/bundles/internationalization-support-i18n.mdtext
 Wed Jun 17 12:25:29 2015
@@ -152,13 +152,13 @@ The dictionary entries for one `JcrResou
    2. dictionary entries below `/libs`
    3. dictionary entries anywhere else (outside the search path)
 
-That means that the message for the same key in `/apps` overwrites the one in 
`/libs` (if both are for the same locale and base name). Within those 
categories the order is non-deterministic, so if there are two entries for the 
same key in `/apps/...` (for the same locale and base name), any entry may be 
used.
+That means that the message for the same key in `/apps` overwrites the one in 
`/libs` (if both are for the same locale and base name). Within those 
categories the order is non-deterministic, so if there is more than one entry 
for the same key in `/apps/...` (for the same locale and base name), any of 
those entries may be used.
 
-The resource bundles of the same base name with different locales also form a 
hierarchy. Each key is looked up recursively first in the ResourceBundle itself 
and then within its parent ResourceBundle. The parent resource bundle is the 
one having the same base name and the parent locale.
+The resource bundles of the same base name with different locales also form a 
hierarchy. Each key is looked up recursively first in the current resource 
bundle and then in its parent resource bundle. The parent resource bundle is 
the one having the same base name but the parent locale.
 
 The locale hierarchy is ordered like this:
 
-1. `<Language> <Country> <Variant> `
+1. `<Language> <Country> <Variant>`
 2. `<Language> <Country>`
 3. `<Language>`
 4. `<Default Locale>`, usually `en`
@@ -170,4 +170,5 @@ So for the locale `de-DE-MAC` the fallba
 3. `de`
 4. `en`
 
+In case there is a resource bundle requested for a locale without country or 
variant, there is only 1 fallback (i.e. the default locale).
 The last resort (root resource bundle in all hierarchies) is always the bundle 
which returns the requested key as the value.
\ No newline at end of file


Reply via email to