Skip to content

Commit 1fb17d3

Browse files
authored
Merge pull request #10530 from JabRef/adjustIssueBugText
Adjust issue bug text
2 parents d13b570 + f79f308 commit 1fb17d3

File tree

3 files changed

+19
-12
lines changed

3 files changed

+19
-12
lines changed

src/main/java/org/jabref/gui/preferences/network/NetworkTab.fxml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@
1818
<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">
1919
<Label styleClass="titleHeader" text="%Network" />
2020
<CheckBox fx:id="versionCheck" text="%Check for latest version online"/>
21-
<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"/>
21+
<Label text="%If you encounter an issue or a bug, please check the latest version, whether the issue is still present." wrapText="true"/>
2222
<Label styleClass="sectionHeader" text="%Remote operation" />
2323
<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" />
2424
<HBox alignment="CENTER_LEFT" spacing="10.0">

src/main/resources/l10n/JabRef_en.properties

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -493,7 +493,7 @@ Incorrect\ ISSN\ format=Incorrect ISSN format
493493
Error\ accessing\ catalog=Error accessing catalog
494494

495495
Check\ for\ latest\ version\ online=Check for latest version online
496-
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.
496+
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.
497497

498498
Keep\ both=Keep both
499499

src/test/java/org/jabref/logic/l10n/LocalizationConsistencyTest.java

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@
33
import java.io.IOException;
44
import java.io.InputStream;
55
import java.io.InputStreamReader;
6+
import java.io.Serial;
67
import java.nio.charset.StandardCharsets;
78
import java.nio.file.DirectoryStream;
89
import java.nio.file.Files;
@@ -99,7 +100,7 @@ void languageKeysShouldNotContainUnderscoresForSpaces() throws IOException {
99100
quotedEntries
100101
.stream()
101102
.map(key -> String.format("\n%s (%s)\n", key.getKey(), key.getPath()))
102-
.collect(Collectors.toList()));
103+
.toList());
103104
}
104105

105106
@Test
@@ -115,23 +116,25 @@ void languageKeysShouldNotContainHtmlBrAndHtmlP() throws IOException {
115116
entriesWithHtml
116117
.stream()
117118
.map(key -> String.format("\n%s (%s)\n", key.getKey(), key.getPath()))
118-
.collect(Collectors.toList()));
119+
.toList());
119120
}
120121

121122
@Test
122123
void findMissingLocalizationKeys() throws IOException {
123-
List<LocalizationEntry> missingKeys = LocalizationParser.findMissingKeys(LocalizationBundleForTest.LANG)
124-
.stream()
125-
.collect(Collectors.toList());
124+
List<LocalizationEntry> missingKeys = new ArrayList<>(LocalizationParser.findMissingKeys(LocalizationBundleForTest.LANG));
126125
assertEquals(Collections.emptyList(), missingKeys,
127126
missingKeys.stream()
128127
.map(key -> LocalizationKey.fromKey(key.getKey()))
129128
.map(key -> String.format("%s=%s",
130129
key.getEscapedPropertiesKey(),
131130
key.getValueForEnglishPropertiesFile()))
132131
.collect(Collectors.joining("\n",
133-
"\n\nDETECTED LANGUAGE KEYS WHICH ARE NOT IN THE ENGLISH LANGUAGE FILE\n" +
134-
"PASTE THESE INTO THE ENGLISH LANGUAGE FILE\n\n",
132+
"""
133+
134+
DETECTED LANGUAGE KEYS WHICH ARE NOT IN THE ENGLISH LANGUAGE FILE
135+
PASTE THESE INTO THE ENGLISH LANGUAGE FILE
136+
137+
""",
135138
"\n\n")));
136139
}
137140

@@ -141,8 +144,12 @@ void findObsoleteLocalizationKeys() throws IOException {
141144
assertEquals(Collections.emptySet(), obsoleteKeys,
142145
obsoleteKeys.stream().collect(Collectors.joining("\n",
143146
"Obsolete keys found in language properties file: \n\n",
144-
"\n\n1. CHECK IF THE KEY IS REALLY NOT USED ANYMORE\n" +
145-
"2. REMOVE THESE FROM THE ENGLISH LANGUAGE FILE\n"))
147+
"""
148+
149+
1. CHECK IF THE KEY IS REALLY NOT USED ANYMORE
150+
2. REMOVE THESE FROM THE ENGLISH LANGUAGE FILE
151+
152+
"""))
146153
);
147154
}
148155

@@ -190,7 +197,7 @@ void languageCanBeLoaded(Language language) {
190197

191198
private static class DuplicationDetectionProperties extends Properties {
192199

193-
private static final long serialVersionUID = 1L;
200+
@Serial private static final long serialVersionUID = 1L;
194201

195202
private final List<String> duplicates = new ArrayList<>();
196203

0 commit comments

Comments
 (0)