[Openutils-svn] SF.net SVN: openutils:[3404] trunk/openutils-mgnltagcloud/src/main/java/net /sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialog.java

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

Revision: 3404
          http://openutils.svn.sourceforge.net/openutils/?rev=3404&view=rev
Author:   diego_schivo
Date:     2011-04-01 13:40:56 +0000 (Fri, 01 Apr 2011)

Log Message:
-----------
TAGCLOUD-14 tagCloudName

Modified Paths:
--------------
    trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialog.java

Modified: trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialog.java
===================================================================
--- trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialog.java	2011-04-01 12:57:17 UTC (rev 3403)
+++ trunk/openutils-mgnltagcloud/src/main/java/net/sourceforge/openutils/mgnltagcloud/dialog/TagCloudDialog.java	2011-04-01 13:40:56 UTC (rev 3404)
@@ -20,6 +20,7 @@
 package net.sourceforge.openutils.mgnltagcloud.dialog;
 
 import info.magnolia.cms.core.Content;
+import info.magnolia.cms.i18n.I18nContentSupportFactory;
 import info.magnolia.cms.security.AccessDeniedException;
 import info.magnolia.module.admininterface.dialogs.ConfiguredDialog;
 
@@ -28,6 +29,7 @@
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.Locale;
 import java.util.Map;
 
 import javax.jcr.RepositoryException;
@@ -40,6 +42,7 @@
 import net.sourceforge.openutils.mgnltagcloud.manager.TagCloudManager;
 
 import org.apache.commons.beanutils.BeanUtils;
+import org.apache.commons.lang.LocaleUtils;
 import org.apache.commons.lang.StringUtils;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -187,12 +190,28 @@
     {
         // Get configured node
         TagCloud tagCloud = null;
-        if (StringUtils.isNotBlank(this.getConfigValue("tagCloudName")))
+        String tagCloudName = this.getConfigValue("tagCloudName");
+        if (StringUtils.isBlank(tagCloudName))
         {
-            TagCloud tagCloudOriginal = TagCloudManager.getInstance().getTagCloud(this.getConfigValue("tagCloudName"));
+            tagCloudName = this.getName();
+        }
+        else if (I18nContentSupportFactory.getI18nSupport().isEnabled() && "true".equals(this.getConfigValue("i18n")))
+        {
+            Locale locale = LocaleUtils.toLocale(this.getTopParent().getConfigValue("locale", null));
+            boolean isFallbackLanguage = locale == null
+                || I18nContentSupportFactory.getI18nSupport().getFallbackLocale().equals(locale);
+            if (!isFallbackLanguage)
+            {
+                tagCloudName += "_" + locale;
+            }
+        }
+        
+        if (StringUtils.isNotBlank(tagCloudName))
+        {
+            TagCloud tagCloudOriginal = TagCloudManager.getInstance().getTagCloud(tagCloudName);
             if (tagCloudOriginal == null)
             {
-                log.error("No tag cloud configured with name : {}", this.getConfigValue("tagCloudName"));
+                log.error("No tag cloud configured with name : {}", tagCloudName);
                 return null;
             }
             try


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