From 9b5e8b1d67d63ddaa811a95bdb4e4dc4cef834b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Tarik=20G=C3=BCrsoy?= <tarik.guersoy@cloudogu.com>
Date: Wed, 16 Aug 2023 13:53:46 +0200
Subject: [PATCH] Bugfix Typo in Diff Load Lines

A typo was fixed by adding an additional check to see if we have 1 or more than 1 lines to load

Committed-by: Eduard Heimbuch <eduard.heimbuch@cloudogu.com>
Co-authored-by: tarik-guersoy <tarik.guersoy@cloudogu.com>
---
 gradle/changelog/hunk_typo.yaml                    | 2 ++
 scm-ui/ui-components/src/repos/diff/HunkHeader.tsx | 3 ++-
 scm-ui/ui-webapp/public/locales/de/repos.json      | 8 ++++----
 scm-ui/ui-webapp/public/locales/en/repos.json      | 8 ++++----
 4 files changed, 12 insertions(+), 9 deletions(-)
 create mode 100644 gradle/changelog/hunk_typo.yaml

diff --git a/gradle/changelog/hunk_typo.yaml b/gradle/changelog/hunk_typo.yaml
new file mode 100644
index 0000000000..053581f756
--- /dev/null
+++ b/gradle/changelog/hunk_typo.yaml
@@ -0,0 +1,2 @@
+- type: bugfix
+  description: A typo on a button for loading more lines in the diff tab has been fixed
diff --git a/scm-ui/ui-components/src/repos/diff/HunkHeader.tsx b/scm-ui/ui-components/src/repos/diff/HunkHeader.tsx
index be22127977..dee606c12a 100644
--- a/scm-ui/ui-components/src/repos/diff/HunkHeader.tsx
+++ b/scm-ui/ui-components/src/repos/diff/HunkHeader.tsx
@@ -47,7 +47,8 @@ const HunkHeader: FC<Props> = ({ expandableHunk, diffExpanded, diffExpansionFail
           <HunkExpandLink
             icon={"fa-angle-double-up"}
             onClick={expandHead(expandableHunk, expandableHunk.maxExpandHeadRange)}
-            text={t("diff.expandComplete", { count: expandableHunk.maxExpandHeadRange })}
+            text={t("diff.expandComplete", { count: expandableHunk.maxExpandHeadRange })
+            }
           />
         </HunkExpandDivider>
       );
diff --git a/scm-ui/ui-webapp/public/locales/de/repos.json b/scm-ui/ui-webapp/public/locales/de/repos.json
index 20c0234ede..8452d50014 100644
--- a/scm-ui/ui-webapp/public/locales/de/repos.json
+++ b/scm-ui/ui-webapp/public/locales/de/repos.json
@@ -528,10 +528,10 @@
     "sideBySide": "Zur zweispaltigen Ansicht wechseln",
     "combined": "Zur kombinierten Ansicht wechseln",
     "noDiffFound": "Kein Diff zwischen den ausgewählten Branches gefunden.",
-    "expandByLines": "{{count}} weitere Zeile laden",
-    "expandByLines_plural": "{{count}} weitere Zeilen laden",
-    "expandComplete": "{{count}} verbleibende Zeile laden",
-    "expandComplete_plural": "Alle {{count}} verbleibenden Zeilen laden",
+    "expandByLines_one": "{{count}} weitere Zeile laden",
+    "expandByLines_other": "{{count}} weitere Zeilen laden",
+    "expandComplete_one": "{{count}} verbleibende Zeile laden",
+    "expandComplete_other": "Alle {{count}} verbleibenden Zeilen laden",
     "expandLastBottomByLines": "Bis zu {{count}} weitere Zeilen laden",
     "expandLastBottomComplete": "Alle verbleibenden Zeilen laden",
     "expanding": "Zeilen werden geladen ...",
diff --git a/scm-ui/ui-webapp/public/locales/en/repos.json b/scm-ui/ui-webapp/public/locales/en/repos.json
index e86a6baa72..16beaeceaf 100644
--- a/scm-ui/ui-webapp/public/locales/en/repos.json
+++ b/scm-ui/ui-webapp/public/locales/en/repos.json
@@ -535,10 +535,10 @@
     "sideBySide": "Switch to side-by-side view",
     "combined": "Switch to combined view",
     "noDiffFound": "No Diff between the selected branches found.",
-    "expandByLines": "load {{count}} more line",
-    "expandByLines_plural": "load {{count}} more lines",
-    "expandComplete": "load {{count}} remaining line",
-    "expandComplete_plural": "load all {{count}} remaining lines",
+    "expandByLines_one": "load {{count}} more line",
+    "expandByLines_other": "load {{count}} more lines",
+    "expandComplete_one": "load {{count}} remaining line",
+    "expandComplete_other": "load all {{count}} remaining lines",
     "expandLastBottomByLines": "load up to {{count}} more lines",
     "expandLastBottomComplete": "load all remaining lines",
     "expanding": "loading lines ...",