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

fix: homogenize authoring format and place #7034

Merged
merged 12 commits into from
Sep 2, 2022
Merged

fix: homogenize authoring format and place #7034

merged 12 commits into from
Sep 2, 2022

Conversation

davorpa
Copy link
Member

@davorpa davorpa commented Aug 22, 2022 •
edited
Loading

What does this PR do?

Add info | Improve repo

For resources

Description

  • use colon as unique author delimiter (replaces &, and, y, e, et...)
  • ensures is placed after resource title, not part of itself title - author. Strip by
  • et al. as special author/token to group many
  • remove author role title/acronyms
  • use trad. trl. as traducer notation instead remove it (needs review all added resources) Definition list: https://loc.gov/marc/relators/relaterm.html
  • remove delimiters when denotes an empty text author: ,, - ( , (...

Checklist:

  • Read our contributing guidelines.
  • Include author(s) and platform where appropriate.
  • Put lists in alphabetical order, correct spacing.
  • Add needed indications (PDF, access notes, under construction).
  • Used an informative name for this pull request.

Follow-up

  • Check the status of GitHub Actions and resolve any reported warnings!

@davorpa
fix: homogenize authors format and place
027e469 
- use colon as author separator (replaces `&`, `and`, `y`, `e`, `et`...)
- ensures is placed after resource title, not part of itself `title - author`
- `et al.` as special author/token to group many
@davorpa davorpa self-assigned this Aug 22, 2022
@davorpa davorpa added conflicts Conflict(s) need to be resolved and removed conflicts Conflict(s) need to be resolved labels Aug 22, 2022
@davorpa
Copy link
Member Author

davorpa commented Aug 22, 2022

31dc7bb resolves conflicts with #7032 merge

@davorpa davorpa added 🗣️ locale:en Resources addressing "English" language 🗣️ locale:es Resources addressing "Spanish / español" language 🗣️ locale:fr Resources addressing "French / français" language 🗣️ locale:de Resources addressing "German / Deutsch" language 🗣️ locale:it Resources addressing "Italian / italiano" language 🗣️ locale:pt Resources addressing "Portuguese / Brazilian" language 🗣️ locale:zh Resources addressing "Chinese" language 🗣️ locale:ja Resources addressing "Japanese / 日本語" language 🗣️ locale:id Resources addressing "Indonesian" language 🗣️ locale:th Resources addressing "Thai / ไทย" language 🗣️ locale:pl Resources addressing "Polish / polski" language 🗣️ locale:ar Resources addressing "Arabic / العربية" language 🗣️ locale:ko Resources addressing "Korean / 한국어 [韓國語]" language 🗣️ locale:tr Resources addressing "Turkish / Türkçe" language 🗣️ locale:fa_IR Resources addressing "Persian / Farsi (Iran) / فارسى" language 🗣️ locale:hu Resources addressing "Hungarian / magyar / magyar nyelv" language labels Aug 22, 2022
@davorpa davorpa marked this pull request as ready for review August 22, 2022 23:43
@davorpa davorpa added the conflicts Conflict(s) need to be resolved label Aug 24, 2022
@davorpa
Copy link
Member Author

davorpa commented Aug 24, 2022

Conflicts are with #7033 merge which add a new QT resource which uses some modified line as hunk

@davorpa
Merge EbookFoundation#7033 into normalize-authoring-format
b2aedc0 
Solve conflicts with branch 'upstream/main' until this PR/commit adding theirs resources too behind conflictive hunk
@davorpa davorpa marked this pull request as ready for review August 24, 2022 17:53
@davorpa davorpa requested a review from eshellman August 24, 2022 17:54
@davorpa davorpa removed the conflicts Conflict(s) need to be resolved label Aug 24, 2022
@davorpa davorpa marked this pull request as draft August 25, 2022 03:55
@davorpa davorpa marked this pull request as ready for review August 25, 2022 06:01
@davorpa
Copy link
Member Author

davorpa commented Aug 25, 2022

Looks fine after merge with #7026 in 9f49314

@davorpa davorpa requested review from eshellman and removed request for eshellman August 25, 2022 15:14
@davorpa davorpa added the conflicts Conflict(s) need to be resolved label Aug 31, 2022
@davorpa davorpa removed the conflicts Conflict(s) need to be resolved label Aug 31, 2022
@davorpa davorpa requested review from eshellman and removed request for eshellman August 31, 2022 20:13
@eshellman eshellman merged commit 9bfd191 into EbookFoundation:main Sep 2, 2022
@davorpa davorpa mentioned this pull request Sep 2, 2022
Merged
5 tasks
davorpa added a commit to davorpa/free-programming-books that referenced this pull request Sep 2, 2022
@davorpa
Merge EbookFoundation#7034 into maintenance/homogenize-in-process-notes
cf03bd0 
Cherry picked until commit 9bfd191 + f7fea66
davorpa added a commit to davorpa/free-programming-books that referenced this pull request Sep 2, 2022
@davorpa
Merge EbookFoundation#7034 into maintenance/shell-scripting-section t…
b328827 
…o solve conflicts

Cherry picked until 9bfd191 + f7fea66
@davorpa davorpa mentioned this pull request Sep 9, 2022
Closed
4 tasks
@davorpa davorpa mentioned this pull request Sep 18, 2022
Merged
6 tasks
@davorpa davorpa deleted the normalize-authoring-format branch September 21, 2022 05:30
@davorpa davorpa mentioned this pull request Sep 23, 2022
Merged
18 tasks
@eshellman eshellman mentioned this pull request Jul 14, 2023
Closed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@eshellman eshellman Awaiting requested review from eshellman

Assignees

@davorpa davorpa

Labels
🗣️ locale:ar Resources addressing "Arabic / العربية" language 🗣️ locale:de Resources addressing "German / Deutsch" language 🗣️ locale:en Resources addressing "English" language 🗣️ locale:es Resources addressing "Spanish / español" language 🗣️ locale:fa_IR Resources addressing "Persian / Farsi (Iran) / فارسى" language 🗣️ locale:fr Resources addressing "French / français" language 🗣️ locale:hu Resources addressing "Hungarian / magyar / magyar nyelv" language 🗣️ locale:id Resources addressing "Indonesian" language 🗣️ locale:it Resources addressing "Italian / italiano" language 🗣️ locale:ja Resources addressing "Japanese / 日本語" language 🗣️ locale:ko Resources addressing "Korean / 한국어 [韓國語]" language 🗣️ locale:pl Resources addressing "Polish / polski" language 🗣️ locale:pt Resources addressing "Portuguese / Brazilian" language 🗣️ locale:th Resources addressing "Thai / ไทย" language 🗣️ locale:tr Resources addressing "Turkish / Türkçe" language 🗣️ locale:zh Resources addressing "Chinese" language
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.
2 participants
@davorpa @eshellman