fix: use string pluralization and remove unneeded style

dhis2 · Dec 13, 2024 · 2dce45e · 2dce45e
1 parent a01587e
commit 2dce45e
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 8 deletions.
diff --git a/i18n/en.pot b/i18n/en.pot
@@ -5,8 +5,8 @@ msgstr ""
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=(n != 1)\n"
-"POT-Creation-Date: 2024-12-12T16:07:57.017Z\n"
-"PO-Revision-Date: 2024-12-12T16:07:57.018Z\n"
+"POT-Creation-Date: 2024-12-13T09:34:43.221Z\n"
+"PO-Revision-Date: 2024-12-13T09:34:43.221Z\n"
 
 msgid "Untitled dashboard"
 msgstr "Untitled dashboard"
@@ -490,8 +490,10 @@ msgstr "No, cancel"
 msgid "Yes, remove filters"
 msgstr "Yes, remove filters"
 
-msgid "{{totalFilterCount}} filters active"
-msgstr "{{totalFilterCount}} filters active"
+msgid "{{count}} filters active"
+msgid_plural "{{count}} filters active"
+msgstr[0] "{{count}} filter active"
+msgstr[1] "{{count}} filters active"
 
 msgid "The dashboard couldn't be made available offline. Try again."
 msgstr "The dashboard couldn't be made available offline. Try again."

diff --git a/src/pages/view/SlideshowFiltersInfo.js b/src/pages/view/SlideshowFiltersInfo.js
@@ -53,8 +53,10 @@ export const SlideshowFiltersInfo = () => {
                 className={styles.filterButton}
                 onClick={() => setIsOpen(true)}
             >
-                {i18n.t('{{totalFilterCount}} filters active', {
-                    totalFilterCount,
+                {i18n.t('{{count}} filters active', {
+                    count: totalFilterCount,
+                    defaultValue: '{{count}} filter active',
+                    defaultValue_plural: '{{count}} filters active',
                 })}
             </button>
             {isOpen && (

diff --git a/src/pages/view/styles/SlideshowControlbar.module.css b/src/pages/view/styles/SlideshowControlbar.module.css
@@ -15,7 +15,7 @@
 .end {
     display: flex;
     align-items: center;
-    width: calc(100% / 3);
+    inline-size: calc(100% / 3);
 }
 
 .start {
@@ -55,7 +55,6 @@
 
 .controls {
     padding: 4px;
-    border-radius: 5px;
     display: flex;
     align-items: center;
     justify-content: center;