From 575dd4f3a9e6bb725120df99fa904babfd02ea57 Mon Sep 17 00:00:00 2001 From: Lucas Freund <127773292+Luggas4you@users.noreply.github.com> Date: Mon, 28 Aug 2023 16:42:26 +0200 Subject: [PATCH 1/7] Add computer science to protected terms --- .../jabref/logic/protectedterms/ProtectedTermsLoader.java | 1 + src/main/resources/protectedterms/computer_science.terms | 5 +++++ 2 files changed, 6 insertions(+) create mode 100644 src/main/resources/protectedterms/computer_science.terms diff --git a/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsLoader.java b/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsLoader.java index c57095e26fb..9f74b266ead 100644 --- a/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsLoader.java +++ b/src/main/java/org/jabref/logic/protectedterms/ProtectedTermsLoader.java @@ -28,6 +28,7 @@ public class ProtectedTermsLoader { INTERNAL_LISTS.put("/protectedterms/months_weekdays.terms", () -> Localization.lang("Months and weekdays in English")); INTERNAL_LISTS.put("/protectedterms/countries_territories.terms", () -> Localization.lang("Countries and territories in English")); INTERNAL_LISTS.put("/protectedterms/electrical_engineering.terms", () -> Localization.lang("Electrical engineering terms")); + INTERNAL_LISTS.put("/protectedterms/computer_science.terms", () -> Localization.lang("Computer science")); } public ProtectedTermsLoader(ProtectedTermsPreferences preferences) { diff --git a/src/main/resources/protectedterms/computer_science.terms b/src/main/resources/protectedterms/computer_science.terms new file mode 100644 index 00000000000..b9b4fe9d750 --- /dev/null +++ b/src/main/resources/protectedterms/computer_science.terms @@ -0,0 +1,5 @@ +JabRef +LaTeX +BPMN +BPEL +OpenTOSCA From 23e86593052f8de8441acfd98515c59bacb4b260 Mon Sep 17 00:00:00 2001 From: Lucas Freund <127773292+Luggas4you@users.noreply.github.com> Date: Mon, 28 Aug 2023 17:27:05 +0200 Subject: [PATCH 2/7] Add Computer science to en.properties --- src/main/resources/l10n/JabRef_en.properties | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/resources/l10n/JabRef_en.properties b/src/main/resources/l10n/JabRef_en.properties index 35300de1883..e1072bdd8c2 100644 --- a/src/main/resources/l10n/JabRef_en.properties +++ b/src/main/resources/l10n/JabRef_en.properties @@ -1656,6 +1656,7 @@ Note\:\ Use\ the\ placeholder\ %DIR%\ for\ the\ location\ of\ the\ opened\ libra Error\ occurred\ while\ executing\ the\ command\ \"%0\".=Error occurred while executing the command \"%0\". Reformat\ ISSN=Reformat ISSN +Computer\ science=Computer science Countries\ and\ territories\ in\ English=Countries and territories in English Electrical\ engineering\ terms=Electrical engineering terms Enabled=Enabled From 7602a37a36aa416eb38d461517cb20db2076aead Mon Sep 17 00:00:00 2001 From: Lucas Freund <127773292+Luggas4you@users.noreply.github.com> Date: Mon, 28 Aug 2023 17:34:42 +0200 Subject: [PATCH 3/7] Add change in CHANGELOG.md --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 15fa38c07f6..529b844b791 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -41,6 +41,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve - We added support for pushing citations to Sublime Text 3 [#10098](https://github.com/JabRef/jabref/issues/10098) - We added support for the Finnish language. [#10183](https://github.com/JabRef/jabref/pull/10183) - We added the option to automatically repleaces illegal characters in the filename when adding a file to JabRef. [#10182](https://github.com/JabRef/jabref/issues/10182) +- We added protected terms described as "Computer science". [#10222](https://github.com/JabRef/jabref/pull/10222#issuecomment-1695855103) ### Changed From dfb4df364980ad8c92893ffb0343bdacb35d61aa Mon Sep 17 00:00:00 2001 From: Oliver Kopp Date: Tue, 29 Aug 2023 01:47:03 +0200 Subject: [PATCH 4/7] Fix link to pull request --- CHANGELOG.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 529b844b791..d113af33f23 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -41,7 +41,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve - We added support for pushing citations to Sublime Text 3 [#10098](https://github.com/JabRef/jabref/issues/10098) - We added support for the Finnish language. [#10183](https://github.com/JabRef/jabref/pull/10183) - We added the option to automatically repleaces illegal characters in the filename when adding a file to JabRef. [#10182](https://github.com/JabRef/jabref/issues/10182) -- We added protected terms described as "Computer science". [#10222](https://github.com/JabRef/jabref/pull/10222#issuecomment-1695855103) +- We added protected terms described as "Computer science". [#10222](https://github.com/JabRef/jabref/pull/10222) ### Changed From 3b71e51346ff6d9975fdcf86e668c62fc887da51 Mon Sep 17 00:00:00 2001 From: Lucas Freund <127773292+Luggas4you@users.noreply.github.com> Date: Wed, 30 Aug 2023 14:10:04 +0200 Subject: [PATCH 5/7] Fix sortation --- src/main/resources/protectedterms/computer_science.terms | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/resources/protectedterms/computer_science.terms b/src/main/resources/protectedterms/computer_science.terms index b9b4fe9d750..219c5058018 100644 --- a/src/main/resources/protectedterms/computer_science.terms +++ b/src/main/resources/protectedterms/computer_science.terms @@ -1,5 +1,5 @@ +BPEL +BPMN JabRef LaTeX -BPMN -BPEL OpenTOSCA From 08acf99c4552d114c6b1c15ac0c10832f4817878 Mon Sep 17 00:00:00 2001 From: Lucas Freund <127773292+Luggas4you@users.noreply.github.com> Date: Wed, 30 Aug 2023 14:11:45 +0200 Subject: [PATCH 6/7] Add BibTex to computer science --- src/main/resources/protectedterms/computer_science.terms | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/resources/protectedterms/computer_science.terms b/src/main/resources/protectedterms/computer_science.terms index 219c5058018..936df3b7ebc 100644 --- a/src/main/resources/protectedterms/computer_science.terms +++ b/src/main/resources/protectedterms/computer_science.terms @@ -1,3 +1,4 @@ +BibTeX BPEL BPMN JabRef From fab32c1b19e14040dcfc741511fec6d0ab8bdd2e Mon Sep 17 00:00:00 2001 From: Siedlerchr Date: Sat, 2 Sep 2023 12:47:30 +0200 Subject: [PATCH 7/7] fix test --- CHANGELOG.md | 2 +- .../logic/formatter/casechanger/ProtectTermsFormatterTest.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 7d285b3870f..157c767ab28 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -12,6 +12,7 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve ### Added - We added an error-specific message for when a download from a URL fails[#9826](https://github.com/JabRef/jabref/issues/9826). +- We added protected terms described as "Computer science". [#10222](https://github.com/JabRef/jabref/pull/10222) ### Changed @@ -53,7 +54,6 @@ Note that this project **does not** adhere to [Semantic Versioning](http://semve - We added support for showing journal information, via info buttons next to the `Journal` and `ISSN` fields in the entry editor. [#6189](https://github.com/JabRef/jabref/issues/6189) - We added support for pushing citations to Sublime Text 3 [#10098](https://github.com/JabRef/jabref/issues/10098) - We added support for the Finnish language. [#10183](https://github.com/JabRef/jabref/pull/10183) -- We added protected terms described as "Computer science". [#10222](https://github.com/JabRef/jabref/pull/10222) - We added the option to automatically replaces illegal characters in the filename when adding a file to JabRef. [#10182](https://github.com/JabRef/jabref/issues/10182) - We added a privacy policy. [#10064](https://github.com/JabRef/jabref/issues/10064) - We added a tooltip to show the number of entries in a group [#10208](https://github.com/JabRef/jabref/issues/10208) diff --git a/src/test/java/org/jabref/logic/formatter/casechanger/ProtectTermsFormatterTest.java b/src/test/java/org/jabref/logic/formatter/casechanger/ProtectTermsFormatterTest.java index 5840c12a4c6..f0b5e71811b 100644 --- a/src/test/java/org/jabref/logic/formatter/casechanger/ProtectTermsFormatterTest.java +++ b/src/test/java/org/jabref/logic/formatter/casechanger/ProtectTermsFormatterTest.java @@ -53,7 +53,7 @@ public void testCorrectOrderingOfTerms() { public void test() { assertEquals("{VLSI} {VLSI}", formatter.format("VLSI {VLSI}")); assertEquals("{BPEL}", formatter.format("{BPEL}")); - assertEquals("{Testing BPEL Engine Performance: A Survey}", + assertEquals("{Testing {BPEL} Engine Performance: A Survey}", formatter.format("{Testing BPEL Engine Performance: A Survey}")); } }