[Openutils-svn] SF.net SVN: openutils:[1311] trunk/openutils-mgnlmedia/src/main/java/net/ sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java

[<mol...@us...>]

Revision: 1311
          http://openutils.svn.sourceforge.net/openutils/?rev=1311&view=rev
Author:   molaschi
Date:     2009-08-25 16:15:20 +0000 (Tue, 25 Aug 2009)

Log Message:
-----------
fix language handling for title and description

Modified Paths:
--------------
    trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java

Modified: trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java
===================================================================
--- trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java	2009-08-25 13:38:59 UTC (rev 1310)
+++ trunk/openutils-mgnlmedia/src/main/java/net/sourceforge/openutils/mgnlmedia/media/types/impl/BaseTypeHandler.java	2009-08-25 16:15:20 UTC (rev 1311)
@@ -51,15 +51,26 @@
         Locale locale = MgnlContext.getLocale();
         String language = locale.getLanguage().toLowerCase();
         String languageCountry = language + "_" + locale.getCountry().toLowerCase();
-        if (LANGUAGES.contains(languageCountry))
+        try
         {
-            return NodeDataUtil.getString(media, property + "-" + languageCountry);
+            if (LANGUAGES.contains(languageCountry) && media.hasNodeData(property + "-" + languageCountry))
+            {
+                return NodeDataUtil.getString(media, property + "-" + languageCountry);
+            }
+            else if (LANGUAGES.contains(language) && media.hasNodeData(property + "-" + language))
+            {
+                return NodeDataUtil.getString(media, property + "-" + language);
+            }
+            else if (LANGUAGES.contains(language) && media.hasNodeData(property + "-en"))
+            {
+                return NodeDataUtil.getString(media, property + "-" + language);
+            }
         }
-        else if (LANGUAGES.contains(language))
+        catch (RepositoryException ex)
         {
-            return NodeDataUtil.getString(media, property + "-" + language);
+            log.error(ex.getMessage(), ex);
         }
-        return NodeDataUtil.getString(media, property + "-en");
+        return NodeDataUtil.getString(media, property);
     }
 
     /**


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