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

8785: replace project overview with kiezradar #5972

Merged
merged 2 commits into from
Jan 28, 2025
Merged

8785: replace project overview with kiezradar #5972

merged 2 commits into from
Jan 28, 2025

Conversation

partizipation
Copy link

@partizipation partizipation commented Jan 23, 2025 •
edited
Loading

Describe your changes

  • All variants of "Projektübersicht" and "Project Overview" text replaced with Kiezradar (for both German and English versions of site).
  • /projekte route changed to /kiezradar
  • along the way, fixed a couple templates that the linter didn't like

Separate PR with localisation so it's easier to read: #5973

8785 ACCEPTANCE CRITERIA

  • Change the URL path from /projekte to /kiezradar.
  • Ensure existing links to /projekte redirect to /kiezradar with a 301 redirect (SEO and avoiding broken links)
  • Update translations for all supported languages to reflect the name change

Tasks

  • PR name contains story or task reference
  • Steps to recreate and test the changes
  • Documentation (docs and inline)
  • Tests (including n+1 and django_assert_num_queries where applicable)
  • Changelog

@partizipation partizipation mentioned this pull request Jan 23, 2025
Closed
5 tasks
goapunk
goapunk reviewed Jan 23, 2025
View reviewed changes
Copy link
Contributor

@goapunk goapunk left a comment

Choose a reason for hiding this comment

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

Nice, thanks! Left a small comment for wording

meinberlin/apps/plans/templates/meinberlin_plans/includes/plan_form.html Outdated Show resolved Hide resolved
@partizipation partizipation force-pushed the jp-2501-projekte-kiezradar-url branch 2 times, most recently from 4ecfe75 to 575665f Compare January 23, 2025 15:33
@goapunk
Copy link
Contributor

goapunk commented Jan 27, 2025

@partizipation could you move the locale-src changes back into a separate commit ? Thanks!

@partizipation partizipation force-pushed the jp-2501-projekte-kiezradar-url branch from 575665f to 16792f2 Compare January 27, 2025 15:54
partizipation
partizipation commented Jan 27, 2025
View reviewed changes
changelog/_0003.md Outdated
Copy link
Author

Choose a reason for hiding this comment

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

not sure how this file made it in there tbh

Copy link
Contributor

@goapunk goapunk Jan 28, 2025 •
edited
Loading

Choose a reason for hiding this comment

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

@partizipation why delete this file? It's supposed to be in the changelog folder, right? I pulled over most new commits from main to dev a couple of days ago, including your fix for imghdr

partizipation
partizipation commented Jan 27, 2025
View reviewed changes
meinberlin/apps/bplan/serializers.py Outdated
Copy link
Author

Choose a reason for hiding this comment

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

same with this file, fixing this

@partizipation
Copy link
Author

Okay @goapunk those are separated out on 16792f2 and 87b636c

@partizipation partizipation requested a review from goapunk January 27, 2025 16:18
@goapunk
Copy link
Contributor

goapunk commented Jan 28, 2025 •
edited
Loading

Okay @goapunk those are separated out on 16792f2 and 87b636c

Thanks! I left a comment regarding the third commit (I don't think we need it) and a small not regarding commit wording: I'd call the main commit doing the changes replace project overview with kiezradar, no need to put the story number again, in the pr title is enough. And then call the translation update commit simply update translations as it also updates some translations from previous changes, not just from this PR.

goapunk
goapunk requested changes Jan 28, 2025
View reviewed changes
Copy link
Contributor

@goapunk goapunk left a comment

Choose a reason for hiding this comment

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

see above

@partizipation partizipation force-pushed the jp-2501-projekte-kiezradar-url branch 2 times, most recently from 0a06126 to 9e0f8ad Compare January 28, 2025 13:07
@partizipation
Copy link
Author

@goapunk changed commit messages and removed 3rd commit. Can't figure out why github says the changelog and serializer have changes. Locally when I checkout/reset these files against dev, or diff against dev, there are no changes. Spent a while spinning on this, do you think we should just let this be or keep investigating?

@goapunk
Copy link
Contributor

goapunk commented Jan 28, 2025

@partizipation thanks! I think rebasing on latest dev will fix it

@partizipation partizipation requested a review from goapunk January 28, 2025 13:31
@partizipation partizipation force-pushed the jp-2501-projekte-kiezradar-url branch from 9e0f8ad to ecb166c Compare January 28, 2025 13:52
goapunk
goapunk approved these changes Jan 28, 2025
View reviewed changes
Copy link
Contributor

@goapunk goapunk left a comment

Choose a reason for hiding this comment

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

Thanks!

@goapunk goapunk enabled auto-merge (rebase) January 28, 2025 13:54
@goapunk goapunk merged commit c377cbc into dev Jan 28, 2025
2 checks passed
@goapunk goapunk deleted the jp-2501-projekte-kiezradar-url branch January 28, 2025 14:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@goapunk goapunk goapunk approved these changes

@vellip vellip Awaiting requested review from vellip

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

Successfully merging this pull request may close these issues.
2 participants
@partizipation @goapunk