You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@empire-db.apache.org by do...@apache.org on 2026/06/03 10:53:27 UTC

(empire-db) branch master updated: EMPIREDB-493 TagEncodingHelper: Resolve label text

This is an automated email from the ASF dual-hosted git repository.

asf-gitbox-commits pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/empire-db.git


The following commit(s) were added to refs/heads/master by this push:
     new 7184d009 EMPIREDB-493 TagEncodingHelper: Resolve label text
7184d009 is described below

commit 7184d00908f6e2ac43c2e97d180617280f4552e5
Author: Rainer Döbele <do...@apache.org>
AuthorDate: Wed Jun 3 12:53:22 2026 +0200

    EMPIREDB-493
    TagEncodingHelper: Resolve label text
---
 .../apache/empire/jakarta/utils/TagEncodingHelper.java  | 17 +++++++++++++----
 .../org/apache/empire/jsf2/utils/TagEncodingHelper.java | 17 +++++++++++++----
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/utils/TagEncodingHelper.java b/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/utils/TagEncodingHelper.java
index 9bd44d89..66838efc 100644
--- a/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/utils/TagEncodingHelper.java
+++ b/empire-db-jakarta-faces/src/main/java/org/apache/empire/jakarta/utils/TagEncodingHelper.java
@@ -1735,9 +1735,14 @@ public class TagEncodingHelper implements NamingContainer
             // translate
             label = getDisplayText(column, label);
         }
-        else if (label.endsWith(":"))
-        {   // already has a colon
-            colon = false;
+        else 
+        {   // resolve
+            if (textResolver==null)
+                getTextResolver(FacesContext.getCurrentInstance());
+            label = textResolver.resolveText(label);
+            // already has a colon
+            if (label.endsWith(":"))
+                colon = false;
         }
         // handle empty string
         if (StringUtils.isEmpty(label) || label.equals("-"))
@@ -1873,7 +1878,11 @@ public class TagEncodingHelper implements NamingContainer
         if (labelText!=null)
         {   // Label has changed
             if (!labelText.equals("-"))
-            {   // add a colon?
+            {   // resolve
+                if (textResolver==null)
+                    getTextResolver(FacesContext.getCurrentInstance());
+                labelText = textResolver.resolveText(labelText);
+                // add a colon?
                 boolean colon = (!labelText.endsWith(":") ? ObjectUtils.getBoolean(getTagAttributeValue("colon"), true) : false);
                 if (colon)
                     labelText = labelText.trim() + ":";
diff --git a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/utils/TagEncodingHelper.java b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/utils/TagEncodingHelper.java
index f9cb7c83..de344037 100644
--- a/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/utils/TagEncodingHelper.java
+++ b/empire-db-jsf2/src/main/java/org/apache/empire/jsf2/utils/TagEncodingHelper.java
@@ -1735,9 +1735,14 @@ public class TagEncodingHelper implements NamingContainer
             // translate
             label = getDisplayText(column, label);
         }
-        else if (label.endsWith(":"))
-        {   // already has a colon
-            colon = false;
+        else 
+        {   // resolve
+            if (textResolver==null)
+                getTextResolver(FacesContext.getCurrentInstance());
+            label = textResolver.resolveText(label);
+            // already has a colon
+            if (label.endsWith(":"))
+                colon = false;
         }
         // handle empty string
         if (StringUtils.isEmpty(label) || label.equals("-"))
@@ -1873,7 +1878,11 @@ public class TagEncodingHelper implements NamingContainer
         if (labelText!=null)
         {   // Label has changed
             if (!labelText.equals("-"))
-            {   // add a colon?
+            {   // resolve
+                if (textResolver==null)
+                    getTextResolver(FacesContext.getCurrentInstance());
+                labelText = textResolver.resolveText(labelText);
+                // add a colon?
                 boolean colon = (!labelText.endsWith(":") ? ObjectUtils.getBoolean(getTagAttributeValue("colon"), true) : false);
                 if (colon)
                     labelText = labelText.trim() + ":";