Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add computer science to protected terms #10222

Merged
merged 10 commits into from
Sep 2, 2023
Merged

Add computer science to protected terms #10222

merged 10 commits into from
Sep 2, 2023

Conversation

Luggas4you
Copy link
Contributor

@Luggas4you Luggas4you commented Aug 28, 2023 •
edited
Loading

This fixes https://github.com/JabRef/jabref-issue-melting-pot/issues/236.

grafik

Mandatory checks

  • Change in CHANGELOG.md described in a way that is understandable for the average user (if applicable)
  • Tests created for changes (if applicable)
  • Manually tested changed features in running JabRef (always required)
  • Screenshots added in PR description (for UI changes)
  • Checked developer's documentation: Is the information available and up to date? If not, I outlined it in this pull request.
  • Checked documentation: Is the information available and up to date? If not, I created an issue at https://github.com/JabRef/user-documentation/issues or, even better, I submitted a pull request to the documentation repository.

@Luggas4you Luggas4you mentioned this pull request Aug 28, 2023
Closed
6 tasks
@Luggas4you
Copy link
Contributor Author

Should I write the addition in the CHANGELOG.md?

@Siedlerchr
Copy link
Member

Siedlerchr commented Aug 28, 2023 •
edited
Loading

Yep, changelog and have a look at the failing tests -> LocalizationConsistencyTest

@Luggas4you
Copy link
Contributor Author

Luggas4you commented Aug 28, 2023 •
edited
Loading

Yep, changelog and have a look at the failing tests -> LocalizationConsistencyTest

I fixed the problems of the test Add Computer science to en.properties and added a description to the CHANGELOG.md Add change in CHANGELOG.md

I hope the CHANGELOG entry is OK

@Siedlerchr
Copy link
Member

Ah the ProtectedTermsFormatter test is now failing because it recognizes the new terms

@Siedlerchr Siedlerchr added this to the 5.11 milestone Aug 28, 2023
koppor
koppor reviewed Aug 28, 2023
View reviewed changes
src/main/resources/protectedterms/computer_science.terms
@@ -0,0 +1,5 @@
JabRef
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This list should be sorted alphabetically. BibTeX should be added, too.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I fixed the sortation and added BibTeX to the list.

koppor and others added 5 commits August 29, 2023 01:48
@koppor
Merge branch 'main' into protectedtermcs
d550e14
@Luggas4you
Fix sortation
3b71e51
@Luggas4you
Add BibTex to computer science
08acf99
@Siedlerchr
Merge remote-tracking branch 'upstream/main' into protectedtermcs
2aa5b79 
* upstream/main: (53 commits)
  Update CHANGELOG.md
  Update CHANGELOG.md
  Update CHANGELOG.md
  adjust snapcraft
  Show development information
  Add merge_group trigger on tests and deployment
  fix changelog link
  change to release
  Update CHANGELOG.md
  Updated external-libraries.md (JabRef#10272)
  Update Java Keyring dependency (JabRef#10252)
  New translations JabRef_en.properties (Dutch)
  Remove CCS as it is no longer available (JabRef#10270)
  New translations JabRef_en.properties (Dutch)
  Fixed saving radio button choice under specified keywords (JabRef#10255)
  Unlocalize LOGGER output (and change log level)
  Squashed 'buildres/csl/csl-styles/' changes from 795ad0c772..2a122e3fa0
  Update CHANGELOG.md
  Update CHANGELOG.md
  Fixed not showing selected group properties
  ...
@Siedlerchr
fix test
fab32c1
@Siedlerchr Siedlerchr added this pull request to the merge queue Sep 2, 2023
Merged via the queue into JabRef:main with commit 3b40bba Sep 2, 2023
13 checks passed
Siedlerchr added a commit that referenced this pull request Sep 3, 2023
@Siedlerchr
Merge remote-tracking branch 'upstream/main' into min-http-api
9299917 
* upstream/main: (737 commits)
  Use OpenRewrite UseStringReplace (#10299)
  Add ReplaceStringBuilderWithString (#10302)
  Apply ShortenFullyQualifiedTypeReferences (#10301)
  Apply StaticMethodNotFinal (#10300)
  Apply exit early pattern (#10297)
  Avoid GH_TOKEN_UPDATE_GRADLE_WRAPPER at refresh-csl-subtrees
  Update snapcraft.yaml
  Fix exception when opening preferences (#10294)
  gnome-42-2204
  use gnome 4.2
  Use gnome
  Update base 22
  Add method for detecting journal abbrev delimiter (#10281)
  Update bug_report.yml
  Fix selection of table sort order (#10250)
  Fix mixup with YAML tags (#10287)
  More guards for upload (#10282)
  Reduced calls to Globals.prefs and Globals.entryTypesManager (#10177)
  Update jmh plugin (#10279)
  Add computer science to protected terms (#10222)
  ...

# Conflicts:
#	build.gradle
#	src/main/java/module-info.java
#	src/main/java/org/jabref/cli/Launcher.java
#	src/main/java/org/jabref/preferences/JabRefPreferences.java
#	src/main/resources/tinylog.properties
Siedlerchr added a commit that referenced this pull request Sep 4, 2023
@Siedlerchr
Merge remote-tracking branch 'upstream/main' into tryToCreateMergedTr…
5370b7e 
…ustStore

* upstream/main: (295 commits)
  Use OpenRewrite UseStringReplace (#10299)
  Add ReplaceStringBuilderWithString (#10302)
  Apply ShortenFullyQualifiedTypeReferences (#10301)
  Apply StaticMethodNotFinal (#10300)
  Apply exit early pattern (#10297)
  Avoid GH_TOKEN_UPDATE_GRADLE_WRAPPER at refresh-csl-subtrees
  Update snapcraft.yaml
  Fix exception when opening preferences (#10294)
  gnome-42-2204
  use gnome 4.2
  Use gnome
  Update base 22
  Add method for detecting journal abbrev delimiter (#10281)
  Update bug_report.yml
  Fix selection of table sort order (#10250)
  Fix mixup with YAML tags (#10287)
  More guards for upload (#10282)
  Reduced calls to Globals.prefs and Globals.entryTypesManager (#10177)
  Update jmh plugin (#10279)
  Add computer science to protected terms (#10222)
  ...
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@koppor koppor koppor left review comments

@Siedlerchr Siedlerchr Siedlerchr approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
5.11
Development

Successfully merging this pull request may close these issues.
3 participants
@Luggas4you @Siedlerchr @koppor