[Yanel-commits] rev 47480 - in
public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/menu:
. impl
michi at wyona.com
michi at wyona.com
Mon Feb 8 12:39:32 CET 2010
Author: michi
Date: 2010-02-08 12:39:31 +0100 (Mon, 08 Feb 2010)
New Revision: 47480
Modified:
public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/menu/Menu.java
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:
some more i18n added and order of editing tools changed
Modified: public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/menu/Menu.java
===================================================================
--- public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/menu/Menu.java 2010-02-08 09:45:48 UTC (rev 47479)
+++ public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/menu/Menu.java 2010-02-08 11:39:31 UTC (rev 47480)
@@ -153,10 +153,14 @@
* @param key I18n key
* @param language Language
*/
- private static String getLabel(String key, String language) {
+ protected static String getLabel(String key, String language) {
if (language.equals("de")) {
if(key.equals("y:help")) {
return "Hilfe";
+ } else if(key.equals("y:edit")) {
+ return "Bearbeiten";
+ } else if(key.equals("y:file")) {
+ return "Datei";
} else if(key.equals("y:about-yanel")) {
return "Ueber Yanel";
} else if(key.equals("y:about-realm")) {
@@ -193,6 +197,10 @@
} else if (language.equals("en")) {
if(key.equals("y:help")) {
return "Help";
+ } else if(key.equals("y:edit")) {
+ return "Edit";
+ } else if(key.equals("y:file")) {
+ return "File";
} else if(key.equals("y:about-yanel")) {
return "About Yanel";
} else if(key.equals("y:about-realm")) {
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-08 09:45:48 UTC (rev 47479)
+++ public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/menu/impl/DefaultMenu.java 2010-02-08 11:39:31 UTC (rev 47480)
@@ -37,26 +37,28 @@
* Get generic edit menu
*/
public String getEditMenu(Resource resource) throws Exception {
+ String language = resource.getRequestedLanguage();
StringBuilder sb = new StringBuilder();
sb.append("<ul><li>");
- sb.append("<div id=\"yaneltoolbar_menutitle\">Edit</div>");
+ sb.append("<div id=\"yaneltoolbar_menutitle\">" + getLabel("y:edit", language) + "</div>");
sb.append("<ul>");
String backToRealm = org.wyona.yanel.core.util.PathUtil.backToRealm(resource.getPath());
sb.append("<li class=\"haschild\">Open with   ");
- sb.append("<ul><li>Source editor</li>");
+ sb.append("<ul>");
sb.append("<li class=\"haschild\">WYSIWYG editor   ");
sb.append("<ul>");
if (ResourceAttributeHelper.hasAttributeImplemented(resource, "Modifiable", "2")) {
+ sb.append("<li><a href=\"" + backToRealm + "usecases/tinymce.html?edit-path=" + resource.getPath() + "\">Edit page with tinyMCE   </a></li>");
sb.append("<li><a href=\"" + backToRealm + "usecases/xinha.html?edit-path=" + resource.getPath() + "\">Edit page with Xinha   </a></li>");
- sb.append("<li><a href=\"" + backToRealm + "usecases/tinymce.html?edit-path=" + resource.getPath() + "\">Edit page with tinyMCE   </a></li>");
} else {
+ sb.append("<li>Edit page with tinyMCE   </li>");
sb.append("<li><a>Edit page with Xinha   </a></li>");
- sb.append("<li>Edit page with tinyMCE   </li>");
}
sb.append("<li><a href=\"http://www.yulup.org\">Edit page with Yulup   </a></li>");
sb.append("</ul>");
sb.append("</li>");
+ sb.append("<li>Source editor</li>");
sb.append("</ul>");
sb.append("</li>");
@@ -70,9 +72,10 @@
* Get generic file menu
*/
public String getFileMenu(Resource resource) throws Exception {
+ String language = resource.getRequestedLanguage();
StringBuilder sb = new StringBuilder();
sb.append("<ul><li>");
- sb.append("<div id=\"yaneltoolbar_menutitle\">File</div>");
+ sb.append("<div id=\"yaneltoolbar_menutitle\">" + getLabel("y:file", language) + "</div>");
sb.append("<ul>");
sb.append("<li><a href=\"create-new-page.html\">Create new page</a></li>");
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-08 09:45:48 UTC (rev 47479)
+++ public/yanel/trunk/src/webapp/src/java/org/wyona/yanel/servlet/menu/impl/DefaultMenuV2.java 2010-02-08 11:39:31 UTC (rev 47480)
@@ -30,26 +30,28 @@
* Implements the new tinymce suffix
*/
public String getEditMenu(Resource resource) throws Exception {
+ String language = resource.getRequestedLanguage();
StringBuilder sb = new StringBuilder();
sb.append("<ul><li>");
- sb.append("<div id=\"yaneltoolbar_menutitle\">Edit</div>");
+ sb.append("<div id=\"yaneltoolbar_menutitle\">" + getLabel("y:edit", language) + "</div>");
sb.append("<ul>");
String backToRealm = org.wyona.yanel.core.util.PathUtil.backToRealm(resource.getPath());
sb.append("<li class=\"haschild\">Open with   ");
- sb.append("<ul><li>Source editor</li>");
+ sb.append("<ul>");
sb.append("<li class=\"haschild\">WYSIWYG editor   ");
sb.append("<ul>");
if (ResourceAttributeHelper.hasAttributeImplemented(resource, "Modifiable", "2")) {
+ sb.append("<li><a href=\"" + backToRealm + resource.getPath().substring(1) + ".tinymce-edit.html\">Edit page with tinyMCE   </a></li>");
sb.append("<li><a href=\"" + backToRealm + "usecases/xinha.html?edit-path=" + resource.getPath() + "\">Edit page with Xinha   </a></li>");
- sb.append("<li><a href=\"" + backToRealm + resource.getPath().substring(1) + ".tinymce-edit.html\">Edit page with tinyMCE   </a></li>");
} else {
+ sb.append("<li>Edit page with tinyMCE   </li>");
sb.append("<li><a>Edit page with Xinha   </a></li>");
- sb.append("<li>Edit page with tinyMCE   </li>");
}
sb.append("<li><a href=\"http://www.yulup.org\">Edit page with Yulup   </a></li>");
sb.append("</ul>");
sb.append("</li>");
+ sb.append("<li>Source editor</li>");
sb.append("</ul>");
sb.append("</li>");
More information about the Yanel-commits
mailing list