diff --git a/module/VuFind/src/VuFind/View/Helper/Root/JsTranslations.php b/module/VuFind/src/VuFind/View/Helper/Root/JsTranslations.php index bda2f1baced81a7099bce2ad9135cc96fe8d538c..27fec4d7e4c34f04da8582a0cfe0c4afc9e7a6ee 100644 --- a/module/VuFind/src/VuFind/View/Helper/Root/JsTranslations.php +++ b/module/VuFind/src/VuFind/View/Helper/Root/JsTranslations.php @@ -95,7 +95,10 @@ class JsTranslations extends AbstractHelper { $parts = []; foreach ($this->strings as $k => $v) { - $parts[] = $k . ': "' . addslashes($this->transEsc->__invoke($v)) . '"'; + $translation = is_array($v) + ? call_user_func_array(array($this->transEsc, '__invoke'), $v) + : $this->transEsc->__invoke($v); + $parts[] = $k . ': "' . addslashes($translation) . '"'; } return $this->varName . ' = {' . implode(',', $parts) . '};'; } diff --git a/themes/bootstrap3/js/facets.js b/themes/bootstrap3/js/facets.js index 1451eff2fcbfb4d51d16340359287e3da184f8fc..563638c3390feabd33f327e3ef1eca94491a9758 100644 --- a/themes/bootstrap3/js/facets.js +++ b/themes/bootstrap3/js/facets.js @@ -6,7 +6,7 @@ function buildFacetNodes(data, currentPath, allowExclude, excludeTitle, counts) $(data).each(function() { var html = ''; if (!this.isApplied && counts) { - html = '<span class="badge" style="float: right">' + this.count; + html = '<span class="badge" style="float: right">' + this.count.toString().replace(/\B(?=(\d{3})+\b)/g, vufindString.number_thousands_separator); if (allowExclude) { var excludeURL = currentPath + this.exclude; excludeURL.replace("'", "\\'"); diff --git a/themes/bootstrap3/templates/layout/layout.phtml b/themes/bootstrap3/templates/layout/layout.phtml index 8c985b6e75af2ca87fd0d4e16421a43694305e0d..a52bedcc7f1d97956248c43ca8e20f0a4e0bf19c 100644 --- a/themes/bootstrap3/templates/layout/layout.phtml +++ b/themes/bootstrap3/templates/layout/layout.phtml @@ -33,7 +33,8 @@ 'bulk_save_success' => 'bulk_save_success', 'close' => 'close', 'loading' => 'Loading', - 'sms_success' => 'sms_success' + 'sms_success' => 'sms_success', + 'number_thousands_separator' => ['number_thousands_separator', null, ','] ) ); if ($cart->isActive()) {