@c8y/ngx-components 1023.14.201 → 1023.14.202

package/fesm2022/c8y-ngx-components-upgrade.mjs

@@ -946,20 +946,37 @@ function gettextCatalogDecorator($delegate, $interpolate, c8yTranslate) {
     'ngInject';
     const gettextCatalog = $delegate;
     const originalGetString = angular.bind(gettextCatalog, gettextCatalog.getString);
+    const originalGetPlural = angular.bind(gettextCatalog, gettextCatalog.getPlural);
     function newGetString(input, scope, context) {
         if (typeof input === 'string') {
             const translatedString = originalGetString(input, scope, context);
             const interpolatedString = scope ? $interpolate(input)(scope) : input;
-            let stringToReturn = translatedString;
-            if (translatedString && translatedString === interpolatedString) {
-                const translatedServerMessage = c8yTranslate.instant(interpolatedString);
-                stringToReturn = translatedServerMessage;
-            }
-            return stringToReturn;
+            return fallBackToC8yTranslate(translatedString, interpolatedString);
         }
         return input;
     }
+    function newGetPlural(count, input, inputPlural, scope, context) {
+        const sourceString = count === 1 ? input : inputPlural;
+        if (typeof sourceString === 'string') {
+            const translatedString = originalGetPlural(count, input, inputPlural, scope, context);
+            const interpolatedString = scope ? $interpolate(sourceString)(scope) : sourceString;
+            return fallBackToC8yTranslate(translatedString, interpolatedString);
+        }
+        return sourceString;
+    }
+    /**
+     * If angular-gettext could not translate the string on its own, it returns the source string.
+     * In that case we let the Angular translate service handle it, so that server message patterns
+     * are resolved and context indicators (text in backticks) are removed in runtime.
+     */
+    function fallBackToC8yTranslate(translatedString, interpolatedString) {
+        if (translatedString && translatedString === interpolatedString) {
+            return c8yTranslate.instant(interpolatedString);
+        }
+        return translatedString;
+    }
     gettextCatalog.getString = newGetString;
+    gettextCatalog.getPlural = newGetPlural;
     return gettextCatalog;
 }