[Yanel-commits] rev 47732 - public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/menu/impl

[michi at wyona.com]

Author: michi
Date: 2010-02-23 15:13:46 +0100 (Tue, 23 Feb 2010)
New Revision: 47732

Modified:
   public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/menu/impl/DefaultMenu.java
   public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/menu/impl/DefaultMenuV2.java
Log:
user language fixed

Modified: public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/menu/impl/DefaultMenu.java
===================================================================
--- public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/menu/impl/DefaultMenu.java	2010-02-23 14:08:44 UTC (rev 47731)
+++ public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/menu/impl/DefaultMenu.java	2010-02-23 14:13:46 UTC (rev 47732)
@@ -37,10 +37,10 @@
      * Get generic edit menu
      */
     public String getEditMenu(Resource resource) throws Exception {
-        String language = resource.getRequestedLanguage();
+        String userLanguage = getUserLanguage(resource);
         StringBuilder sb = new StringBuilder();
         sb.append("<ul><li>");
-        sb.append("<div id=\"yaneltoolbar_menutitle\">" + getLabel("y:edit", language) + "</div>");
+        sb.append("<div id=\"yaneltoolbar_menutitle\">" + getLabel("y:edit", userLanguage) + "</div>");
         sb.append("<ul>");
 
         String backToRealm = org.wyona.yanel.core.util.PathUtil.backToRealm(resource.getPath());
@@ -72,10 +72,10 @@
      * Get generic file menu
      */
     public String getFileMenu(Resource resource) throws Exception {
-        String language = resource.getRequestedLanguage();
+        String userLanguage = getUserLanguage(resource);
         StringBuilder sb = new StringBuilder();
         sb.append("<ul><li>");
-        sb.append("<div id=\"yaneltoolbar_menutitle\">" + getLabel("y:file", language) + "</div>");
+        sb.append("<div id=\"yaneltoolbar_menutitle\">" + getLabel("y:file", userLanguage) + "</div>");
         sb.append("<ul>");
         sb.append("<li><a href=\"create-new-page.html\">Create new page</a></li>");
 
@@ -83,7 +83,7 @@
         if (ResourceAttributeHelper.hasAttributeImplemented(resource, "Modifiable", "2")) {
             sb.append("<li><a href=\"?yanel.resource.usecase=delete\">Delete this page</a></li>");
         }
-        sb.append("<li><a href=\"?yanel.resource.meta\">" + getLabel("y:page-info", language) + "</a></li>");
+        sb.append("<li><a href=\"?yanel.resource.meta\">" + getLabel("y:page-info", userLanguage) + "</a></li>");
         sb.append("</ul>");
         sb.append("</li></ul>");
 

Modified: public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/menu/impl/DefaultMenuV2.java
===================================================================
--- public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/menu/impl/DefaultMenuV2.java	2010-02-23 14:08:44 UTC (rev 47731)
+++ public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/menu/impl/DefaultMenuV2.java	2010-02-23 14:13:46 UTC (rev 47732)
@@ -30,10 +30,10 @@
      * Implements the new tinymce suffix
      */
     public String getEditMenu(Resource resource) throws Exception {
-        String language = resource.getRequestedLanguage();
+        String userLanguage = getUserLanguage(resource);
         StringBuilder sb = new StringBuilder();
         sb.append("<ul><li>");
-        sb.append("<div id=\"yaneltoolbar_menutitle\">" + getLabel("y:edit", language) + "</div>");
+        sb.append("<div id=\"yaneltoolbar_menutitle\">" + getLabel("y:edit", userLanguage) + "</div>");
         sb.append("<ul>");
 
         String backToRealm = org.wyona.yanel.core.util.PathUtil.backToRealm(resource.getPath());