Merge pull request #118 from davelnewton/patch-1
Removed spurious closing tag
diff --git a/source/core-developers/localization.md b/source/core-developers/localization.md
index 2428278..769423b 100644
--- a/source/core-developers/localization.md
+++ b/source/core-developers/localization.md
@@ -13,7 +13,7 @@
The framework supports internationalization (i18n) in the following places:
-1. the _UI Tags_
+1. the _UI Tags_
2. Messages and Errors from the [ValidationAware](http://struts.apache.org/struts2-core/apidocs/index.html?com/opensymphony/xwork2/ValidationAware.html)
3. Within action classes that extend [ActionSupport](http://struts.apache.org/struts2-core/apidocs/index.html?com/opensymphony/xwork2/ActionSupport.html) through the `getText()` method
@@ -29,7 +29,7 @@
6. search up the i18n message key hierarchy itself
7. global resource properties
-This is how it is implemented in a default implementation of the `LocalizedTextProvider` interface. You can provide your
+This is how it is implemented in a default implementation of the `LocalizedTextProvider` interface. You can provide your
own implementation using `TextProvider` and `TextProviderFactory` interfaces.
To clarify #5, while traversing the package hierarchy, Struts 2 will look for a file `package.properties`:
@@ -42,9 +42,9 @@
package.properties
FooAction.java
FooAction.properties
-```
+```
-> If `FooAction.properties` does not exist, `com/acme/action/package.properties` will be searched for, if not found
+> If `FooAction.properties` does not exist, `com/acme/action/package.properties` will be searched for, if not found
> `com/acme/package.properties`, if not found `com/package.properties`, etc.
## Default action's class
@@ -57,11 +57,11 @@
</action>
```
-it will use a default class defined with `default-class-ref` in `struts-default.xml` which is
+it will use a default class defined with `default-class-ref` in `struts-default.xml` which is
`com.opensymphony.xwork2.ActionSupport`. It means you have two options here to get I18N working in that case:
- define `com/opensymphony/xwork2/ActionSupport.properties` and put messages there
-- point `default-class-ref` to your base class and then defined appropriated `.properties` file (corresponding to
+- point `default-class-ref` to your base class and then defined appropriated `.properties` file (corresponding to
class' name or package)
## Examples
@@ -77,7 +77,7 @@
<s:property value="getText('some.key')" />
```
-The default implementation of `TextProvider` which is used in `ActionSupport` perform evaluation of value read from
+The default implementation of `TextProvider` which is used in `ActionSupport` perform evaluation of value read from
bundle base on the provided key, see [Localizing Output] for an example.
### Using the text tag
@@ -94,16 +94,16 @@
### Using the I18n tag
-The `i18n` tag pushes an arbitrary resource bundle on to the value stack. Other tags within the scope of the i18n tag
+The `i18n` tag pushes an arbitrary resource bundle on to the value stack. Other tags within the scope of the i18n tag
can display messages from that resource bundle.
```xml
-<s:i18n name="some.package.bundle"></s:i18n>
+<s:i18n name="some.package.bundle">
<s:text name="some.key" />
</s:i18n>
```
-Internationalizing SiteMesh decorators is possible, but there are quirks. See [SiteMesh Plugin](../plugins/sitemesh/)
+Internationalizing SiteMesh decorators is possible, but there are quirks. See [SiteMesh Plugin](../plugins/sitemesh/)
for more.
### Using the Key attribute of UI Tags
@@ -116,7 +116,7 @@
## I18n Interceptor
-Essentially, the i18n Interceptor pushes a locale into the ActionContext map upon every request. The framework
+Essentially, the i18n Interceptor pushes a locale into the ActionContext map upon every request. The framework
components that support localization all utilize the ActionContext locale. See [I18n Interceptor](i18n-interceptor.html) f
or details.
@@ -130,15 +130,15 @@
## Comparison with Struts 1
-Struts 1 users should be familiar with the application.properties resource bundle, where you can put all the messages
-in the application that are going to be translated. Struts 2, though, splits the resource bundles per action or model
-class, and you may end up with duplicated messages in those resource bundles. A quick fix for that is to create a file
-called ActionSupport.properties in com/opensymphony/xwork2 and put it on your classpath. This will only work well if
+Struts 1 users should be familiar with the application.properties resource bundle, where you can put all the messages
+in the application that are going to be translated. Struts 2, though, splits the resource bundles per action or model
+class, and you may end up with duplicated messages in those resource bundles. A quick fix for that is to create a file
+called ActionSupport.properties in com/opensymphony/xwork2 and put it on your classpath. This will only work well if
all your actions subclass XWork2's ActionSupport.
## Using only global bundles
-If you don't need to use the package-scan-functionality and only base on the global bundles (those provided by
+If you don't need to use the package-scan-functionality and only base on the global bundles (those provided by
the framework and via `struts.custom.i18n.resources`) you can use existing `GlobalLocalizedTextProvider`
implementation. To use this please define the following option in your `struts.xml`:
@@ -148,8 +148,8 @@
## Custom TextProvider and TextProviderFactory
-If you want use a different logic to search for localized messages, or you want to use a database or just want to search
-default bundles, you must implement both those interfaces (or subclass the existing implementations). You can check
-a small [example app](https://github.com/apache/struts-examples/tree/master/text-provider) how to use both.
-Please remember that the `TextProvider` interface is implemented by the `ActionSupport` class, that's why
+If you want use a different logic to search for localized messages, or you want to use a database or just want to search
+default bundles, you must implement both those interfaces (or subclass the existing implementations). You can check
+a small [example app](https://github.com/apache/struts-examples/tree/master/text-provider) how to use both.
+Please remember that the `TextProvider` interface is implemented by the `ActionSupport` class, that's why
an extra layer - `TextProviderFactory` - is needed.
