Author: vmassol
Date: 2008-02-11 17:11:08 +0100 (Mon, 11 Feb 2008)
New Revision: 7503
Modified:
xwiki-platform/core/branches/xwiki-core-1.2/xwiki-core/src/main/java/com/xpn/xwiki/doc/XWikiDocument.java
xwiki-platform/core/branches/xwiki-core-1.2/xwiki-core/src/main/java/com/xpn/xwiki/objects/classes/PropertyClass.java
Log:
XWIKI-1980: $doc.displayTooltip should support internationalized strings
Merged from trunk (rev 6612)
Modified:
xwiki-platform/core/branches/xwiki-core-1.2/xwiki-core/src/main/java/com/xpn/xwiki/doc/XWikiDocument.java
===================================================================
---
xwiki-platform/core/branches/xwiki-core-1.2/xwiki-core/src/main/java/com/xpn/xwiki/doc/XWikiDocument.java
2008-02-11 15:56:19 UTC (rev 7502)
+++
xwiki-platform/core/branches/xwiki-core-1.2/xwiki-core/src/main/java/com/xpn/xwiki/doc/XWikiDocument.java
2008-02-11 16:11:08 UTC (rev 7503)
@@ -1299,7 +1299,7 @@
{
try {
PropertyClass pclass = (PropertyClass)
obj.getxWikiClass(context).get(fieldname);
- String tooltip = pclass.getTooltip();
+ String tooltip = pclass.getTooltip(context);
if ((tooltip != null) && (!tooltip.trim().equals(""))) {
String img = "<img src=\"" +
context.getWiki().getSkinFile("info.gif", context) +
"\" class=\"tooltip_image\" align=\"middle\" />";
Modified:
xwiki-platform/core/branches/xwiki-core-1.2/xwiki-core/src/main/java/com/xpn/xwiki/objects/classes/PropertyClass.java
===================================================================
---
xwiki-platform/core/branches/xwiki-core-1.2/xwiki-core/src/main/java/com/xpn/xwiki/objects/classes/PropertyClass.java
2008-02-11 15:56:19 UTC (rev 7502)
+++
xwiki-platform/core/branches/xwiki-core-1.2/xwiki-core/src/main/java/com/xpn/xwiki/objects/classes/PropertyClass.java
2008-02-11 16:11:08 UTC (rev 7503)
@@ -330,6 +330,24 @@
return getLargeStringValue("tooltip");
}
+ /**
+ * Gets international tooltip
+ * @param context
+ * @return
+ */
+ public String getTooltip(XWikiContext context)
+ {
+ String tooltipName = getFieldFullName() + "_tooltip";
+ String tooltip = context.getWiki().getMessage(tooltipName, context);
+ if (tooltipName.equals(tooltip)) {
+ tooltipName = getLargeStringValue("tooltip");
+ if ((tooltipName!=null)&&(!tooltipName.trim().equals(""))) {
+ tooltip = context.getWiki().getMessage(tooltipName, context);
+ }
+ }
+ return tooltip;
+ }
+
public void setTooltip(String tooltip)
{
setLargeStringValue("tooltip", tooltip);
_______________________________________________
notifications mailing list
[email protected]
http://lists.xwiki.org/mailman/listinfo/notifications
