Author: buildbot
Date: Wed Jun 17 12:25:36 2015
New Revision: 955122
Log:
Staging update by buildbot for sling
Modified:
websites/staging/sling/trunk/content/ (props changed)
websites/staging/sling/trunk/content/documentation/bundles/internationalization-support-i18n.html
Propchange: websites/staging/sling/trunk/content/
------------------------------------------------------------------------------
--- cms:source-revision (original)
+++ cms:source-revision Wed Jun 17 12:25:36 2015
@@ -1 +1 @@
-1685996
+1685998
Modified:
websites/staging/sling/trunk/content/documentation/bundles/internationalization-support-i18n.html
==============================================================================
---
websites/staging/sling/trunk/content/documentation/bundles/internationalization-support-i18n.html
(original)
+++
websites/staging/sling/trunk/content/documentation/bundles/internationalization-support-i18n.html
Wed Jun 17 12:25:36 2015
@@ -234,8 +234,8 @@ The parser will take any "key":"value" p
<li>dictionary entries below <code>/libs</code></li>
<li>dictionary entries anywhere else (outside the search path)</li>
</ol>
-<p>That means that the message for the same key in <code>/apps</code>
overwrites the one in <code>/libs</code> (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 <code>/apps/...</code> (for the same locale
and base name), any entry may be used.</p>
-<p>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.</p>
+<p>That means that the message for the same key in <code>/apps</code>
overwrites the one in <code>/libs</code> (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 <code>/apps/...</code> (for the same
locale and base name), any of those entries may be used.</p>
+<p>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.</p>
<p>The locale hierarchy is ordered like this:</p>
<ol>
<li><code><Language> <Country> <Variant></code></li>
@@ -250,9 +250,10 @@ The parser will take any "key":"value" p
<li><code>de</code></li>
<li><code>en</code></li>
</ol>
-<p>The last resort (root resource bundle in all hierarchies) is always the
bundle which returns the requested key as the value.</p>
+<p>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.</p>
<div class="timestamp" style="margin-top: 30px; font-size: 80%;
text-align: right;">
- Rev. 1685996 by kwin on Wed, 17 Jun 2015 12:16:12 +0000
+ Rev. 1685998 by kwin on Wed, 17 Jun 2015 12:25:29 +0000
</div>
<div class="trademarkFooter">
Apache Sling, Sling, Apache, the Apache feather logo, and the Apache
Sling project
