Merge 25.3 to 25.7

Author: labkey-teamcity

snd/src/org/labkey/snd/SNDManager.java

@@ -3420,7 +3420,12 @@ private String generateEventDataNarrative(Container c, User u, Event event, Even
                         value = "<span class='" + AttributeData.ATTRIBUTE_DATA_CSS_CLASS + "'>" + value + "</span>";
                     }
 
-                    eventDataNarrative = new StringBuilder(eventDataNarrative.toString().replace("{" + pd.getName() + "}", value));
+                    // Trim any spaces immediately inside '{' and '}' to make tokens like "{ route 2}" -> "{route 2}"
+                    String normalized = eventDataNarrative.toString()
+                            .replaceAll("\\{\\s+", "{")
+                            .replaceAll("\\s+\\}", "}");
+
+                    eventDataNarrative = new StringBuilder(normalized.replace("{" + pd.getName() + "}", value));
                 }
             }