Anonymous avatar Anonymous committed f078714

i18n now looks for hierarchy of package.properties as well

git-svn-id: http://svn.opensymphony.com/svn/xwork/trunk@234 e221344d-f017-0410-9bd5-d282ab1896d7

Comments (0)

Files changed (1)

src/java/com/opensymphony/xwork/util/LocalizedTextUtil.java

             }
         }
 
+        // nothing still? alright, search the package hierarchy now
+        clazz = aClass;
+
+        do {
+            try {
+                String packageName = clazz.getPackage().getName();
+                ResourceBundle bundle = findResourceBundle(packageName + ".package", locale);
+                reloadBundles(bundle);
+                String message = TextParseUtil.translateVariables(bundle.getString(aTextName), valueStack);
+
+                return MessageFormat.format(message, args);
+            } catch (MissingResourceException ex) {
+                clazz = clazz.getSuperclass();
+            }
+        } while (!clazz.equals(Object.class));
+
+
         return getDefaultText(aTextName, locale, valueStack, args, defaultMessage);
     }
 
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.