diff --git a/package.json b/package.json index 4755606e..c213b6f4 100644 --- a/package.json +++ b/package.json @@ -32,6 +32,7 @@ "jquery-serializejson": "^2.9.0", "moment": "^2.27.0", "nosleep.js": "^0.12.0", + "sprintf-js": "^1.1.2", "summernote": "^0.8.18", "swagger-ui-dist": "^4.10.3", "tempusdominus-bootstrap-4": "^5.39.2", diff --git a/public/js/grocy.js b/public/js/grocy.js index 02cad7bb..efb466b6 100644 --- a/public/js/grocy.js +++ b/public/js/grocy.js @@ -249,7 +249,7 @@ __t = function(text, ...placeholderValues) } } - return Grocy.Translator.__(text, ...placeholderValues) + return sprintf(Grocy.Translator.__(text, ...placeholderValues), ...placeholderValues); } __n = function(number, singularForm, pluralForm, isQu = false) { diff --git a/views/layout/default.blade.php b/views/layout/default.blade.php index 863049a4..b1b7e0b4 100644 --- a/views/layout/default.blade.php +++ b/views/layout/default.blade.php @@ -700,6 +700,7 @@ + @if(!empty($__t('summernote_locale') && $__t('summernote_locale') != 'x'))@endif diff --git a/yarn.lock b/yarn.lock index 22279c8b..06d8f4cf 100644 --- a/yarn.lock +++ b/yarn.lock @@ -625,6 +625,11 @@ safer-buffer@^2.0.2, safer-buffer@^2.1.0, safer-buffer@~2.1.0: resolved "https://registry.yarnpkg.com/safer-buffer/-/safer-buffer-2.1.2.tgz#44fa161b0187b9549dd84bb91802f9bd8385cd6a" integrity sha512-YZo3K82SD7Riyi0E1EQPojLz7kpepnSQI9IyPbHHg1XXXevb5dJI7tpyN2ADxGcQbHG7vcyRHk0cbwqcQriUtg== +sprintf-js@^1.1.2: + version "1.1.2" + resolved "https://registry.yarnpkg.com/sprintf-js/-/sprintf-js-1.1.2.tgz#da1765262bf8c0f571749f2ad6c26300207ae673" + integrity sha512-VE0SOVEHCk7Qc8ulkWw3ntAzXuqf7S2lvwQaDLRnUeIEaKNQJzV6BwmLKhOqT61aGhfUMrXeaBk+oDGCzvhcug== + sshpk@^1.7.0: version "1.17.0" resolved "https://registry.yarnpkg.com/sshpk/-/sshpk-1.17.0.tgz#578082d92d4fe612b13007496e543fa0fbcbe4c5"