svn commit: [jahia] r17459 - /trunk/core/src/java/org/jahia/taglibs/container/ContainerDiffHighlightTag.java

[knguyen]

Author: knguyen
Date: Tue Jun  5 16:51:41 2007
New Revision: 17459

URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17459&repname=
=3Djahia
Log:
JAHIA-1947: fix compare highlighting with accent character.

Modified:
    trunk/core/src/java/org/jahia/taglibs/container/ContainerDiffHighlightT=
ag.java

Modified: trunk/core/src/java/org/jahia/taglibs/container/ContainerDiffHigh=
lightTag.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/taglibs/container/ContainerDiffHighlightTag.java&rev=3D17459&repna=
me=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/java/org/jahia/taglibs/container/ContainerDiffHighlightT=
ag.java (original)
+++ trunk/core/src/java/org/jahia/taglibs/container/ContainerDiffHighlightT=
ag.java Tue Jun  5 16:51:41 2007
@@ -338,7 +338,17 @@
                         StringBuffer buff =3D new StringBuffer(
                             "<fieldset style=3D'");
                         buff.append(style);
-                        buff.append("'><legend><b>Diff Status : ");
+                        buff.append("'><legend><b>");
+                        String diffStatus =3D JahiaResourceBundle.getEngin=
eResource(
+                            "org.jahia.services.version.difference.diffSta=
tus",
+                            jData.getProcessingContext(),
+                            jData.getProcessingContext().getLocale());
+                        if ( diffStatus =3D=3D null || "".equals(diffStatu=
s.trim())) {
+                            diffStatus =3D "diff. :";
+                        } else {
+                            diffStatus +=3D " : ";
+                        }
+                        buff.append(diffStatus);
                         buff.append(statusLabel);
                         buff.append("</b></legend>");
                         out.print(buff.toString());
@@ -395,7 +405,17 @@
         StringBuffer buff =3D new StringBuffer(
         "<fieldset style=3D'");
         buff.append(style);
-        buff.append("'><legend><b>Diff Status : ");
+        buff.append("'><legend><b>");
+        String diffStatus =3D JahiaResourceBundle.getEngineResource(
+            "org.jahia.services.version.difference.diffStatus",
+            jData.getProcessingContext(),
+            jData.getProcessingContext().getLocale());
+        if ( diffStatus =3D=3D null || "".equals(diffStatus.trim())) {
+            diffStatus =3D "diff. :";
+        } else {
+            diffStatus +=3D " : ";
+        }
+        buff.append(diffStatus);
         buff.append(statusLabel);
         buff.append("</b></legend>");
         return buff.toString();

_______________________________________________
cvs_list mailing list
cvs_list@jahia.org
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list