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

Replace old AuthorsFormatters with the correct new ones #7380

Merged
merged 6 commits into from
Feb 1, 2021
Merged

Replace old AuthorsFormatters with the correct new ones #7380

merged 6 commits into from
Feb 1, 2021

Conversation

Siedlerchr
Copy link
Member

@Siedlerchr Siedlerchr commented Jan 24, 2021 •
edited
Loading

Fixes #7356

TODO: Add tests

@k3KAW8Pnf7mkmdSMPHz27 Would be nice if you could take a look if I replaced them correctly

  • Change in CHANGELOG.md described (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 documentation: Is the information available and up to date? If not created an issue at https://github.com/JabRef/user-documentation/issues or, even better, submitted a pull request to the documentation repository.

@k3KAW8Pnf7mkmdSMPHz27
Copy link
Member

I should be able to have a look at them all today

k3KAW8Pnf7mkmdSMPHz27
k3KAW8Pnf7mkmdSMPHz27 reviewed Jan 25, 2021
View reviewed changes
Copy link
Member

@k3KAW8Pnf7mkmdSMPHz27 k3KAW8Pnf7mkmdSMPHz27 left a comment

Choose a reason for hiding this comment

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

Given that the layout files predate the GitHub migration, I have only added comments on when I'd use something different based on the previous version. I couldn't even find a good reference for din1505, which makes my review less useful 😬
If you agree with the suggested changes, I can push/pr based on this branch so you don't have to ctrl+f & copy-paste it for no good reason.

src/main/resources/resource/layout/din1505/din1505winword.conference.layout Outdated Show resolved Hide resolved
src/main/resources/resource/layout/endnote/EndNote.article.layout Outdated Show resolved Hide resolved
src/main/resources/resource/layout/html.book.layout Outdated Show resolved Hide resolved
src/main/resources/resource/layout/openoffice/openoffice-csv.layout Outdated Show resolved Hide resolved
@Siedlerchr
Copy link
Member Author

Siedlerchr commented Jan 25, 2021 •
edited
Loading

Thanks for taking a look.
Feel free to push to this branch! Your Changes seem reasonable.
for Din 1505 I only found Wikipedia with some examples

@k3KAW8Pnf7mkmdSMPHz27
Copy link
Member

Feel free to push to this branch!

I might have spoken too soon. I can only see this branch as part of JabRef/jabref.git which I don't think I have permission to, which would make sense.

I can open a PR for https://github.com/k3KAW8Pnf7mkmdSMPHz27/jabref/tree/fixlayoutauthors but at that point, it might be easier to just copy-paste it.

I'll play around with my settings and see if anything changes, but I don't think I have made a mistake.

@Siedlerchr
Copy link
Member Author

@k3KAW8Pnf7mkmdSMPHz27 I added you as contributor to this project (thought you were already) so you should be able to push to that branch

@k3KAW8Pnf7mkmdSMPHz27
Copy link
Member

Also, there are some issues with Authors.java. It should produce the wrong output for two authors using oxford and it uses the form von Last Jr., First rather than von Last, Jr., First.
I planned to look at it in the follow-up PR of #7301 (comment), but perhaps it needs attention sooner.

@Siedlerchr Siedlerchr added the status: ready-for-review Pull Requests that are ready to be reviewed by the maintainers label Jan 29, 2021
@Siedlerchr
Add changelog
720e469
@Siedlerchr
Merge remote-tracking branch 'upstream/master' into fixlayoutauthors
a44f589 
* upstream/master:
  Bump archunit-junit5-api from 0.15.0 to 0.16.0 (#7407)
  Bump classgraph from 4.8.98 to 4.8.102 (#7401)
  Bump archunit-junit5-engine from 0.15.0 to 0.16.0 (#7402)
  Bump mariadb-java-client from 2.7.1 to 2.7.2 (#7406)
  Bump org.beryx.jlink from 2.23.2 to 2.23.3 (#7400)
  Bump checkstyle from 8.39 to 8.40 (#7404)
  Ignore codecov status for automerge
  Fixes issue of Changing font size makes font size field too small (#7398)
  fix "Alt + keyboard shortcuts do not work" (#7379)
  Fixed invisible file path in the dark theme (#7396)
  Fix File Filter and some layout issues (#7385)
  Feature/implement complex queries (#7350)
  Change format for study definition to yaml (#7126)
  Fix handling of URL in file field (#7347)
  Fix expansion of bracketed expressions in RegExpBasedFileFinder (#7338)
@Siedlerchr
fix braces
3952f8a
@Siedlerchr
Merge branch 'fixlayoutauthors' of github.com:JabRef/jabref into fixl…
76b0143 
…ayoutauthors

* 'fixlayoutauthors' of github.com:JabRef/jabref:
  Fix some calls to Authors formatter
koppor
koppor approved these changes Feb 1, 2021
View reviewed changes
Copy link
Member

@koppor koppor left a comment

Choose a reason for hiding this comment

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

(DevCall) We accept that we did not add tests here.

@koppor koppor merged commit 6ace80f into master Feb 1, 2021
@koppor koppor deleted the fixlayoutauthors branch February 1, 2021 20:36
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@k3KAW8Pnf7mkmdSMPHz27 k3KAW8Pnf7mkmdSMPHz27 k3KAW8Pnf7mkmdSMPHz27 left review comments

@koppor koppor koppor approved these changes

Assignees
No one assigned
Labels
status: ready-for-review Pull Requests that are ready to be reviewed by the maintainers
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Convert layout resources to new authors formatter
3 participants
@Siedlerchr @k3KAW8Pnf7mkmdSMPHz27 @koppor