Merge pull request #8683 from ehuelsmann/fix/master/8663

Remove double-encoding from labels; fix setup.pl with French (due to quoting)
ledgersmb · Feb 26, 2025 · 86fecd8 · 86fecd8
2 parents 47c253b + 93b422c
commit 86fecd8
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/UI/lib/elements.html b/UI/lib/elements.html
@@ -336,7 +336,7 @@
         ELSE;
            label_class = "";
         END;
-     "<label $label_id $label_for $label_class >" _ text(element_data.label) _ "</label>";
+     "<label $label_id $label_for $label_class >" _ element_data.label _ "</label>";
      END;
    END;
 

diff --git a/UI/setup/credentials.html b/UI/setup/credentials.html
@@ -33,7 +33,7 @@ <h2 align="center" style="margin-top: 0">
                       style="margin-top:1em">
                   <input type="hidden" id="csrf-token" name="csrf_token" value="[% csrf_token %]" />
                   <div class="login_form">
-                    [% select_hint = text('Select or Enter User');
+                    [% select_hint = text('Select or Enter User').replace('&quot;','\\&quot;');
                        INCLUDE select element_data = {
                                    name = 's_user'
                                    id = 's-user'
@@ -45,7 +45,7 @@ <h2 align="center" style="margin-top: 0">
                                    tabindex = 1
                                    label = text('DB admin login')
                                    "data-dojo-type" = "dijit/form/ComboBox"
-                                   "data-dojo-props" = "value:'$s_user', placeHolder:'$select_hint'"
+                                   "data-dojo-props" = "value:&quot;$s_user&quot;, placeHolder:&quot;$select_hint&quot;"
                                     attributes = { autocomplete = 'off'}
                        };
                        INCLUDE input element_data = {
-Original file line number
+Diff line change
@@ Expand Up / @@ -336,7 +336,7 @@ @@
             ELSE;
                label_class = "";
             END;
-         "<label $label_id $label_for $label_class >" _ text(element_data.label) _ "</label>";
+         "<label $label_id $label_for $label_class >" _ element_data.label _ "</label>";
          END;
        END;
@@ Expand Down @@