[Openutils-svn] SF.net SVN: openutils:[3256] trunk/openutils-mgnlmedia/src/main/java/net/ sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java

[<die...@us...>]

Revision: 3256
          http://openutils.svn.sourceforge.net/openutils/?rev=3256&view=rev
Author:   diego_schivo
Date:     2011-01-21 10:08:40 +0000 (Fri, 21 Jan 2011)

Log Message:
-----------
PIRMEDIA-201 fallback locale

Modified Paths:
--------------
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java

Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java	2011-01-21 10:05:15 UTC (rev 3255)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/playlist/pages/PlaylistView.java	2011-01-21 10:08:40 UTC (rev 3256)
@@ -48,6 +48,7 @@
 import net.sourceforge.openutils.mgnlmedia.media.tags.el.MediaEl;
 import net.sourceforge.openutils.mgnlmedia.playlist.PlaylistConstants;
 
+import org.apache.commons.lang.LocaleUtils;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -179,9 +180,13 @@
                 propNames.put("tags", "tags");
                 if (!StringUtils.isEmpty(locale))
                 {
-                    for (Entry<String, String> entry : propNames.entrySet())
+                    Locale l = LocaleUtils.toLocale(locale);
+                    if (!I18nContentSupportFactory.getI18nSupport().getFallbackLocale().equals(l))
                     {
-                        entry.setValue(entry.getValue() + "_" + locale);
+                        for (Entry<String, String> entry : propNames.entrySet())
+                        {
+                            entry.setValue(entry.getValue() + "_" + l);
+                        }
                     }
                 }
 


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.