From f1d0ba2fc40cb5e7272d5e3aa27e7b282af720c7 Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Fri, 20 Oct 2023 22:57:40 +0200
Subject: [PATCH 1/6] adjust text for issue/bug reporting

---
 .../java/org/jabref/gui/preferences/network/NetworkTab.fxml     | 2 +-
 src/main/resources/l10n/JabRef_en.properties                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/jabref/gui/preferences/network/NetworkTab.fxml b/src/main/java/org/jabref/gui/preferences/network/NetworkTab.fxml
index 8f765eb061f..3926debd038 100644
--- a/src/main/java/org/jabref/gui/preferences/network/NetworkTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/network/NetworkTab.fxml
@@ -18,7 +18,7 @@
 <fx:root spacing="10.0" type="VBox" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.preferences.network.NetworkTab">
     <Label styleClass="titleHeader" text="%Network" />
     <CheckBox fx:id="versionCheck" text="%Check for latest version online"/>
-    <Label text="%Please use the latest version of JabRef if you run into a bug. If you encounter an issue or a bug, check the latest version, if the issue is still present." wrapText="true"/>
+    <Label text="%If you encounter an issue or a bug, please check the latest version, if the issue is still present." wrapText="true"/>
     <Label styleClass="sectionHeader" text="%Remote operation" />
     <Label fx:id="remoteLabel" text="%This feature lets new files be opened or imported into an already running instance of JabRef instead of opening a new instance. For instance, this is useful when you open a file in JabRef from your web browser. Note that this will prevent you from running more than one instance of JabRef at a time." textOverrun="CLIP" wrapText="true" />
     <HBox alignment="CENTER_LEFT" spacing="10.0">
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 89407c66944..52caa526be2 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -493,7 +493,7 @@ Incorrect\ ISSN\ format=Incorrect ISSN format
 Error\ accessing\ catalog=Error accessing catalog
 
 Check\ for\ latest\ version\ online=Check for latest version online
-Please\ use\ the\ latest\ version\ of\ JabRef\ if\ you\ run\ into\ a\ bug.\ If\ you\ encounter\ an\ issue\ or\ a\ bug,\ check\ the\ latest\ version,\ if\ the\ issue\ is\ still\ present.=Please use the latest version of JabRef if you run into a bug. If you encounter an issue or a bug, check the latest version, if the issue is still present.
+If\ you\ encounter\ an\ issue\ or\ a\ bug,\ please\ check\ the\ latest\ version,\ if\ the\ issue\ is\ still\ present.=If you encounter an issue or a bug, please check the latest version, if the issue is still present.
 
 Keep\ both=Keep both
 

From c87d4c988fb82d04c4301f6e34353cbdd4f1b8d4 Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Fri, 20 Oct 2023 22:58:43 +0200
Subject: [PATCH 2/6] use textblock

---
 .../l10n/LocalizationConsistencyTest.java     | 26 ++++++++++++-------
 1 file changed, 17 insertions(+), 9 deletions(-)

diff --git a/src/test/java/org/jabref/logic/l10n/LocalizationConsistencyTest.java b/src/test/java/org/jabref/logic/l10n/LocalizationConsistencyTest.java
index 5166ff54d5a..0f36c8dae8a 100644
--- a/src/test/java/org/jabref/logic/l10n/LocalizationConsistencyTest.java
+++ b/src/test/java/org/jabref/logic/l10n/LocalizationConsistencyTest.java
@@ -3,6 +3,7 @@
 import java.io.IOException;
 import java.io.InputStream;
 import java.io.InputStreamReader;
+import java.io.Serial;
 import java.nio.charset.StandardCharsets;
 import java.nio.file.DirectoryStream;
 import java.nio.file.Files;
@@ -115,14 +116,12 @@ void languageKeysShouldNotContainHtmlBrAndHtmlP() throws IOException {
                         entriesWithHtml
                                 .stream()
                                 .map(key -> String.format("\n%s (%s)\n", key.getKey(), key.getPath()))
-                                .collect(Collectors.toList()));
+                                .toList());
     }
 
     @Test
     void findMissingLocalizationKeys() throws IOException {
-        List<LocalizationEntry> missingKeys = LocalizationParser.findMissingKeys(LocalizationBundleForTest.LANG)
-                                                                .stream()
-                                                                .collect(Collectors.toList());
+        List<LocalizationEntry> missingKeys = new ArrayList<>(LocalizationParser.findMissingKeys(LocalizationBundleForTest.LANG));
         assertEquals(Collections.emptyList(), missingKeys,
                 missingKeys.stream()
                            .map(key -> LocalizationKey.fromKey(key.getKey()))
@@ -130,8 +129,13 @@ void findMissingLocalizationKeys() throws IOException {
                                    key.getEscapedPropertiesKey(),
                                    key.getValueForEnglishPropertiesFile()))
                            .collect(Collectors.joining("\n",
-                                   "\n\nDETECTED LANGUAGE KEYS WHICH ARE NOT IN THE ENGLISH LANGUAGE FILE\n" +
-                                           "PASTE THESE INTO THE ENGLISH LANGUAGE FILE\n\n",
+                                   """
+
+
+                                           DETECTED LANGUAGE KEYS WHICH ARE NOT IN THE ENGLISH LANGUAGE FILE
+                                           PASTE THESE INTO THE ENGLISH LANGUAGE FILE
+
+                                           """,
                                    "\n\n")));
     }
 
@@ -141,8 +145,12 @@ void findObsoleteLocalizationKeys() throws IOException {
         assertEquals(Collections.emptySet(), obsoleteKeys,
                 obsoleteKeys.stream().collect(Collectors.joining("\n",
                         "Obsolete keys found in language properties file: \n\n",
-                        "\n\n1. CHECK IF THE KEY IS REALLY NOT USED ANYMORE\n" +
-                                "2. REMOVE THESE FROM THE ENGLISH LANGUAGE FILE\n"))
+                        """
+
+
+                                1. CHECK IF THE KEY IS REALLY NOT USED ANYMORE
+                                2. REMOVE THESE FROM THE ENGLISH LANGUAGE FILE
+                                """))
         );
     }
 
@@ -190,7 +198,7 @@ void languageCanBeLoaded(Language language) {
 
     private static class DuplicationDetectionProperties extends Properties {
 
-        private static final long serialVersionUID = 1L;
+        @Serial private static final long serialVersionUID = 1L;
 
         private final List<String> duplicates = new ArrayList<>();
 

From 6ed1cc16f9cc92a421360647d11d5a3b0d9a528a Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Fri, 20 Oct 2023 22:59:25 +0200
Subject: [PATCH 3/6] toList

---
 .../java/org/jabref/logic/l10n/LocalizationConsistencyTest.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/test/java/org/jabref/logic/l10n/LocalizationConsistencyTest.java b/src/test/java/org/jabref/logic/l10n/LocalizationConsistencyTest.java
index 0f36c8dae8a..1f6846b61a2 100644
--- a/src/test/java/org/jabref/logic/l10n/LocalizationConsistencyTest.java
+++ b/src/test/java/org/jabref/logic/l10n/LocalizationConsistencyTest.java
@@ -100,7 +100,7 @@ void languageKeysShouldNotContainUnderscoresForSpaces() throws IOException {
                         quotedEntries
                                 .stream()
                                 .map(key -> String.format("\n%s (%s)\n", key.getKey(), key.getPath()))
-                                .collect(Collectors.toList()));
+                                .toList());
     }
 
     @Test

From d6e015ac82c7e238fd43c1783f33323e0bd596e5 Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Fri, 20 Oct 2023 23:03:00 +0200
Subject: [PATCH 4/6] whether

---
 .../java/org/jabref/gui/preferences/network/NetworkTab.fxml     | 2 +-
 src/main/resources/l10n/JabRef_en.properties                    | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/org/jabref/gui/preferences/network/NetworkTab.fxml b/src/main/java/org/jabref/gui/preferences/network/NetworkTab.fxml
index 3926debd038..41e03497727 100644
--- a/src/main/java/org/jabref/gui/preferences/network/NetworkTab.fxml
+++ b/src/main/java/org/jabref/gui/preferences/network/NetworkTab.fxml
@@ -18,7 +18,7 @@
 <fx:root spacing="10.0" type="VBox" xmlns="http://javafx.com/javafx/17" xmlns:fx="http://javafx.com/fxml/1" fx:controller="org.jabref.gui.preferences.network.NetworkTab">
     <Label styleClass="titleHeader" text="%Network" />
     <CheckBox fx:id="versionCheck" text="%Check for latest version online"/>
-    <Label text="%If you encounter an issue or a bug, please check the latest version, if the issue is still present." wrapText="true"/>
+    <Label text="%If you encounter an issue or a bug, please check the latest version, whether the issue is still present." wrapText="true"/>
     <Label styleClass="sectionHeader" text="%Remote operation" />
     <Label fx:id="remoteLabel" text="%This feature lets new files be opened or imported into an already running instance of JabRef instead of opening a new instance. For instance, this is useful when you open a file in JabRef from your web browser. Note that this will prevent you from running more than one instance of JabRef at a time." textOverrun="CLIP" wrapText="true" />
     <HBox alignment="CENTER_LEFT" spacing="10.0">
diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties
index 52caa526be2..40289ee779a 100644
--- a/src/main/resources/l10n/JabRef_en.properties
+++ b/src/main/resources/l10n/JabRef_en.properties
@@ -493,7 +493,7 @@ Incorrect\ ISSN\ format=Incorrect ISSN format
 Error\ accessing\ catalog=Error accessing catalog
 
 Check\ for\ latest\ version\ online=Check for latest version online
-If\ you\ encounter\ an\ issue\ or\ a\ bug,\ please\ check\ the\ latest\ version,\ if\ the\ issue\ is\ still\ present.=If you encounter an issue or a bug, please check the latest version, if the issue is still present.
+If\ you\ encounter\ an\ issue\ or\ a\ bug,\ please\ check\ the\ latest\ version,\ whether\ the\ issue\ is\ still\ present.=If you encounter an issue or a bug, please check the latest version, whether the issue is still present.
 
 Keep\ both=Keep both
 

From fa22e07cb5d605cf259324e903bb529df7a9ece8 Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Fri, 20 Oct 2023 23:05:24 +0200
Subject: [PATCH 5/6] checkstyle?

---
 .../org/jabref/logic/l10n/LocalizationConsistencyTest.java   | 5 -----
 1 file changed, 5 deletions(-)

diff --git a/src/test/java/org/jabref/logic/l10n/LocalizationConsistencyTest.java b/src/test/java/org/jabref/logic/l10n/LocalizationConsistencyTest.java
index 1f6846b61a2..7768cefce65 100644
--- a/src/test/java/org/jabref/logic/l10n/LocalizationConsistencyTest.java
+++ b/src/test/java/org/jabref/logic/l10n/LocalizationConsistencyTest.java
@@ -130,11 +130,8 @@ void findMissingLocalizationKeys() throws IOException {
                                    key.getValueForEnglishPropertiesFile()))
                            .collect(Collectors.joining("\n",
                                    """
-
-
                                            DETECTED LANGUAGE KEYS WHICH ARE NOT IN THE ENGLISH LANGUAGE FILE
                                            PASTE THESE INTO THE ENGLISH LANGUAGE FILE
-
                                            """,
                                    "\n\n")));
     }
@@ -146,8 +143,6 @@ void findObsoleteLocalizationKeys() throws IOException {
                 obsoleteKeys.stream().collect(Collectors.joining("\n",
                         "Obsolete keys found in language properties file: \n\n",
                         """
-
-
                                 1. CHECK IF THE KEY IS REALLY NOT USED ANYMORE
                                 2. REMOVE THESE FROM THE ENGLISH LANGUAGE FILE
                                 """))

From f79f3080bb4a38da3fe7ded79d3ac336c4c485a3 Mon Sep 17 00:00:00 2001
From: Siedlerchr <siedlerkiller@gmail.com>
Date: Fri, 20 Oct 2023 23:18:51 +0200
Subject: [PATCH 6/6] one empty line is okay

---
 .../org/jabref/logic/l10n/LocalizationConsistencyTest.java    | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/src/test/java/org/jabref/logic/l10n/LocalizationConsistencyTest.java b/src/test/java/org/jabref/logic/l10n/LocalizationConsistencyTest.java
index 7768cefce65..d68f9b1f2ec 100644
--- a/src/test/java/org/jabref/logic/l10n/LocalizationConsistencyTest.java
+++ b/src/test/java/org/jabref/logic/l10n/LocalizationConsistencyTest.java
@@ -130,8 +130,10 @@ void findMissingLocalizationKeys() throws IOException {
                                    key.getValueForEnglishPropertiesFile()))
                            .collect(Collectors.joining("\n",
                                    """
+
                                            DETECTED LANGUAGE KEYS WHICH ARE NOT IN THE ENGLISH LANGUAGE FILE
                                            PASTE THESE INTO THE ENGLISH LANGUAGE FILE
+
                                            """,
                                    "\n\n")));
     }
@@ -143,8 +145,10 @@ void findObsoleteLocalizationKeys() throws IOException {
                 obsoleteKeys.stream().collect(Collectors.joining("\n",
                         "Obsolete keys found in language properties file: \n\n",
                         """
+
                                 1. CHECK IF THE KEY IS REALLY NOT USED ANYMORE
                                 2. REMOVE THESE FROM THE ENGLISH LANGUAGE FILE
+
                                 """))
         );
     }