Merge branch 'maintenance-3.1.x' into 2023-snapshot-gnerate

nuxeo · Dec 12, 2024 · 807e0e0 · 807e0e0
2 parents 3cee50a + 02309ee
commit 807e0e0
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/elements/nuxeo-results/nuxeo-results.js b/elements/nuxeo-results/nuxeo-results.js
@@ -455,9 +455,17 @@ Polymer({
   },
 
   _computeCountLabel() {
-    return this.resultsCount < 0
-      ? this.i18n('results.heading.count.unknown')
-      : this.i18n('results.heading.count', this.resultsCount);
+    // Fetch the property value from web-ui-properties.xml
+    const isNumberFormattingEnabled =
+      (Nuxeo && Nuxeo.UI && Nuxeo.UI.config && Nuxeo.UI.config.numberFormattingEnabled) || false;
+    if (this.resultsCount < 0) {
+      return this.i18n('results.heading.count.unknown');
+    }
+    if (isNumberFormattingEnabled) {
+      const formattedCount = new Intl.NumberFormat().format(this.resultsCount);
+      return this.i18n('results.heading.count', formattedCount);
+    }
+    return this.i18n('results.heading.count', this.resultsCount);
   },
 
   _sortOptions() {

diff --git a/plugin/web-ui/addon/src/main/resources/OSGI-INF/web-ui-properties.xml b/plugin/web-ui/addon/src/main/resources/OSGI-INF/web-ui-properties.xml
@@ -56,5 +56,8 @@
     <!-- allowed url to redirect -->
    <property name="org.nuxeo.web.ui.trustedDomains">${org.nuxeo.web.ui.trustedDomains:=}</property>
 
+   <!-- Search result numberFormatting -->
+  <property name="org.nuxeo.web.ui.numberFormatting.enabled">${org.nuxeo.web.ui.numberFormatting.enabled:=}</property>
+
   </extension>
 </component>