Skip to content

Conversation

@hongquan
Copy link
Member

@hongquan hongquan commented Apr 19, 2025

Resolve part of #326.

This is the first step, which merge until commit e4449e6.

The number of conflict blocks in PO (translation) files are so big that I cannot resolve one by one. I decided to overwrite the files with the content from upstream, it means that we lose the translations made in our repo. We will recover the missing translations afterward.

How has this been tested?

Checklist

  • I have added tests to cover my changes.

rixx and others added 30 commits October 12, 2024 00:52
Currently translated at 100.0% (1528 of 1528 strings)

Co-authored-by: Tobias Kunze <[email protected]>
Translate-URL: http://translate.pretalx.com/projects/pretalx/pretalx/de/
Translation: pretalx/pretalx
Currently translated at 100.0% (1528 of 1528 strings)

Co-authored-by: Tobias Kunze <[email protected]>
Translate-URL: http://translate.pretalx.com/projects/pretalx/pretalx/de_FORMAL/
Translation: pretalx/pretalx
@sourcery-ai
Copy link

sourcery-ai bot commented Apr 19, 2025

Reviewer's Guide by Sourcery

This pull request removes the schedule app, the orga urls, the cfp views, the common middleware, the orga views, the cfp templates, the common text, the cfp views, the orga forms, the agenda templates, the common templates, the orga css, the cfp css, the common js, the agenda js, the orga js, the api views, the api serializers, the orga utils, the schedule exporters, the cfp phrases, the common templatetags, the common text, the person forms, the static files, the tests, and the settings.

No diagrams generated as the changes look simple and do not need a visual representation.


Tips and commands

Interacting with Sourcery

  • Trigger a new review: Comment @sourcery-ai review on the pull request.
  • Continue discussions: Reply directly to Sourcery's review comments.
  • Generate a GitHub issue from a review comment: Ask Sourcery to create an
    issue from a review comment by replying to it. You can also reply to a
    review comment with @sourcery-ai issue to create an issue from it.
  • Generate a pull request title: Write @sourcery-ai anywhere in the pull
    request title to generate a title at any time. You can also comment
    @sourcery-ai title on the pull request to (re-)generate the title at any time.
  • Generate a pull request summary: Write @sourcery-ai summary anywhere in
    the pull request body to generate a PR summary at any time exactly where you
    want it. You can also comment @sourcery-ai summary on the pull request to
    (re-)generate the summary at any time.
  • Generate reviewer's guide: Comment @sourcery-ai guide on the pull
    request to (re-)generate the reviewer's guide at any time.
  • Resolve all Sourcery comments: Comment @sourcery-ai resolve on the
    pull request to resolve all Sourcery comments. Useful if you've already
    addressed all the comments and don't want to see them anymore.
  • Dismiss all Sourcery reviews: Comment @sourcery-ai dismiss on the pull
    request to dismiss all existing Sourcery reviews. Especially useful if you
    want to start fresh with a new review - don't forget to comment
    @sourcery-ai review to trigger a new review!
  • Generate a plan of action for an issue: Comment @sourcery-ai plan on
    an issue to generate a plan of action for it.

Customizing Your Experience

Access your dashboard to:

  • Enable or disable review features such as the Sourcery-generated pull request
    summary, the reviewer's guide, and others.
  • Change the review language.
  • Add, remove or edit custom review instructions.
  • Adjust other review settings.

Getting Help

@hongquan hongquan changed the title Feature/merge upstream jan 2025 Merge from upstream Jan 2025 Apr 19, 2025
@hongquan
Copy link
Member Author

hongquan commented May 5, 2025

Replaced by #332 , due to losing a lot of code.

@hongquan hongquan closed this May 5, 2025
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants