Codeberg/org
43
101
Fork
You've already forked org
41

Fix terminology #1236

Open
jsoref wants to merge 1 commit from jsoref/Codeberg-org:german-legislation into main
pull from: jsoref/Codeberg-org:german-legislation
merge into: Codeberg:main
Codeberg:main
Codeberg:Assembly24-Change9-PrivacyPolicy
Codeberg:readme-improvements
Codeberg:Assembly24-FullDraft
Codeberg:Assembly24-Change8-FeeRegulations
Codeberg:Assembly24-Change10-ElectionRegulations
Codeberg:Assembly24-Change6-ExplicitRegulations
Codeberg:Assembly24-Change7-WrittenCommunicationByEmail
Codeberg:Assembly24-Change5-MissingEmailExpungement
Codeberg:Assembly24-Change4-DeadlinesAndOnlineVoting
Codeberg:Assembly24-Change3-BoardPayment
Codeberg:Assembly24-Change1-BoardAndPresidium
Codeberg:Assembly24-Change2-Teams
Codeberg:tos-next
Codeberg:logo-license-exemption
First-time contributor
Copy link

This aligns with

- You are legally responsible for your edits and contributions on the platform, so for your own protection you should exercise caution and avoid contributing any content that may result in criminal or civil liability under any applicable laws (e.g. copyright and patent infringements, but also things like age-restricted content without age confirmation). Both the German legislation and the legislation in your country of residence may be relevant here.

There are two possible fixes to this text:

  • by the German legislature (it looks like the original BDSG was passed by both Bundestag and Bundesrat)
  • by German legislation

The analog for the US is:

  • by the U.S. Congress / by [the U.S.] Congress / by the U.S. legislature
  • by U.S. legislation (passed by the US Congress/US legislature)
This aligns with https://codeberg.org/Codeberg/org/src/commit/639997218c5c5ae076724a8b9367942d6d3d62f6/TermsOfUse.md?display=source#L48 There are two possible fixes to this text: * `by the German legislature` (it looks like the original [BDSG](https://www.gesetze-im-internet.de/bdsg_2018/BJNR209710017.html) was passed by both Bundestag and Bundesrat) * `by German legislation` The analog for the US is: * `by the U.S. Congress` / `by [the U.S.] Congress` / `by the U.S. legislature` * `by U.S. legislation (passed by the US Congress/US legislature)` 
Signed-off-by: Josh Soref <2119212+jsoref@users.noreply.github.com>
n0toose left a comment
Owner
Copy link

Kudos for considering the context of a country across an entire ocean to back up this change.

There was a similar light "debate" in one of our meetings, where the (here: translated) sentence "People! We aren't the Bundestag!" was said. Not sure what the others think about this detail. :)

Kudos for considering the context of a country across an entire ocean to back up this change. There was a similar light "debate" in one of our meetings, where the (here: translated) sentence "People! We aren't the Bundestag!" was said. Not sure what the others think about this detail. :)
This pull request can be merged automatically.
This branch is out-of-date with the base branch
You are not authorized to merge this pull request.
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u german-legislation:jsoref-german-legislation
git switch jsoref-german-legislation
Sign in to join this conversation.
No reviewers
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
2 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
Codeberg/org!1236
Reference in a new issue
Codeberg/org
No description provided.
Delete branch "jsoref/Codeberg-org:german-legislation"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?