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.

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

Rename remaining article to thread #1138

Open
wants to merge 12 commits into
base: dev/new_features
Choose a base branch
from

Conversation

melroy89
Copy link
Member

Rename all the remaining keywords from article(s) to thread(s). Making the code more consistent.

Which also means I renamed the new valid link for creating a new thread: new/thread in the URL (same for the API).

This PR also finally solves the translation strings that then where still have the key article, articles, edit_article (which was always missing btw), add_new_article, etc. To the new keys: type.thread, thread, threads, add_new_thread and finally edit_thread.

To be backwards compatible with existing data in the database (specifically the type column in the entry table), we keep the article string in the resolveType() function, so t he old string "article" or "articles" are still valid. Same for some Twig templates, we extend with another or for backwards compatibly for now.

The next logical follow-up would be to rename entry as well later.

@melroy89 melroy89 added enhancement New feature or request frontend Visual issues, improvements, bugs or other aspects relating mostly to the front end backend Backend related issues and pull requests translation Translation related pull request or issue labels Sep 19, 2024
@melroy89 melroy89 added this to the v1.8.0 milestone Sep 19, 2024
templates/components/entry.html.twig Outdated Show resolved Hide resolved
config/kbin_routes/magazine_api.yaml Show resolved Hide resolved
config/kbin_routes/magazine_api.yaml Outdated Show resolved Hide resolved
@BentiGorlich
Copy link
Member

Ok I will look at it closer tomorrow. Code wise it looks good now

@melroy89
Copy link
Member Author

Ok I will look at it closer tomorrow. Code wise it looks good now

This pr is less urgent than the 1.7.x fixes. No worries here. It's not really a bug fix.

Co-authored-by: Melroy van den Berg <[email protected]>
@melroy89
Copy link
Member Author

melroy89 commented Nov 8, 2024

Rebased

@BentiGorlich BentiGorlich force-pushed the dev/new_features branch 2 times, most recently from ed923ae to 9b44612 Compare November 24, 2024 11:14
@BentiGorlich
Copy link
Member

@melroy89 do you have an idea why there are so many commits linked to this PR? Doesn't really make sense to me especially since there are multiple commits of other PRs

@melroy89
Copy link
Member Author

@melroy89 do you have an idea why there are so many commits linked to this PR? Doesn't really make sense to me especially since there are multiple commits of other PRs

yeah, I also found this weird. Maybe something went wrong with merging/rebasing?

@melroy89
Copy link
Member Author

I might need to redo this all, and revert several commits via reset hard or something. And try to rebase again. Maybe I started on the main branch initially? And later changed to the new dev/new_features branch?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backend Backend related issues and pull requests enhancement New feature or request frontend Visual issues, improvements, bugs or other aspects relating mostly to the front end translation Translation related pull request or issue
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants