From: <die...@us...> - 2011-08-25 17:56:33
|
Revision: 3635 http://openutils.svn.sourceforge.net/openutils/?rev=3635&view=rev Author: diego_schivo Date: 2011-08-25 17:56:27 +0000 (Thu, 25 Aug 2011) Log Message: ----------- MESSAGES-14 avaiable locales Modified Paths: -------------- trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.java Modified: trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.java =================================================================== --- trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.java 2011-08-25 17:47:16 UTC (rev 3634) +++ trunk/openutils-mgnlmessages/src/main/java/net/sourceforge/openutils/mgnlmessages/pages/MessagesEditPage.java 2011-08-25 17:56:27 UTC (rev 3635) @@ -30,9 +30,11 @@ import java.io.IOException; import java.util.ArrayList; import java.util.Collections; +import java.util.HashSet; import java.util.Iterator; import java.util.List; import java.util.Locale; +import java.util.Set; import javax.jcr.PathNotFoundException; import javax.jcr.RepositoryException; @@ -226,18 +228,27 @@ @SuppressWarnings("unchecked") public String search() { - Messages messages = MgnlContext.getMessages(); - Iterator<String> it = messages.keys(); - keys = new ArrayList<String>(); - while (it.hasNext()) + Locale locBk = MgnlContext.getLocale(); + Set<String> set = new HashSet<String>(); + for (Locale newLoc : MessagesConfigurationManager.getAvaiableLocales()) { - String curKey = it.next(); - String curText = messages.get(curKey); - if (StringUtils.contains(curText, text)) + MgnlContext.setLocale(newLoc); + Messages messages = MgnlContext.getMessages(); + Iterator<String> it = messages.keys(); + while (it.hasNext()) { - keys.add(curKey); + String curKey = it.next(); + String curText = messages.get(curKey); + if (StringUtils.contains(curText, text)) + { + set.add(curKey); + } } } + MgnlContext.setLocale(locBk); + + keys = new ArrayList<String>(set); + Collections.sort(keys); StringBuilder sb = new StringBuilder("[ "); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |