pleroma/pleroma
5
5
Fork 8
Code Issues 775 Pull requests 74 Projects Releases 1 Packages Wiki Activity

Draft: Multi-language posting (but rebased and adjusted for my liking) #7804

Open
mkljczk wants to merge 40 commits from gitlab-mr-iid-4427 into develop
pull from: gitlab-mr-iid-4427
merge into: pleroma:develop
Conversation 0 Commits 40 Files changed 53 +1963 -146
mkljczk commented 2026-01-17 20:26:43 +00:00
Owner
Copy link

A very work in progress rebase of #7199, with the main difference being it doesn't render text in all languages in a single field, but assumes that when composing in more than one language, one of them is the primary language. I believe this should be at most an optional, MRF-based feature (which I will likely restore in this form).

Checklist

  • Adding a changelog: In the changelog.d directory, create a file named <code>.<type>.
A very work in progress rebase of #7199, with the main difference being it doesn't render text in all languages in a single field, but assumes that when composing in more than one language, one of them is the primary language. I believe this should be at most an optional, MRF-based feature (which I will likely restore in this form). ### Checklist - [ ] Adding a changelog: In the `changelog.d` directory, create a file named `<code>.<type>`.
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
This pull request has changes conflicting with the target branch.
  • lib/pleroma/web/common_api/activity_draft.ex
  • test/pleroma/web/mastodon_api/views/poll_view_test.exs
View command line instructions

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u origin gitlab-mr-iid-4427:gitlab-mr-iid-4427
git switch gitlab-mr-iid-4427

Merge

Merge the changes and update on Forgejo.

Warning: The "Autodetect manual merge" setting is not enabled for this repository, you will have to mark this pull request as manually merged afterwards.

git switch develop
git merge --no-ff gitlab-mr-iid-4427
git switch gitlab-mr-iid-4427
git rebase develop
git switch develop
git merge --ff-only gitlab-mr-iid-4427
git switch gitlab-mr-iid-4427
git rebase develop
git switch develop
git merge --no-ff gitlab-mr-iid-4427
git switch develop
git merge --squash gitlab-mr-iid-4427
git switch develop
git merge --ff-only gitlab-mr-iid-4427
git switch develop
git merge gitlab-mr-iid-4427
git push origin develop
Sign in to join this conversation.
Reviewers
No reviewers
Labels
Clear labels   
AP C2S

   
AdminAPI

   
Breaking API

Affects clients

  
Breaks existing config

   
Check if still valid

   
Data Protection

   
Do not merge

   
Document in the changelog

   
Doing

   
Feature Request / Enhancement

   
MastoAPI

   
NL2

Improved Mobile Experience

  
NL4

Improved instance customization and QoL options

  
OStatus

   
OTP Releases

   
Refactor

   
Security

   
To Do

   
TwitterAPI

   
bug

   
complicated

   
confirmed

   
deps

   
discussion

   
documentation

   
easy

   
feature: to be merged in stable

   
fix: to be merged in stable

   
incident

Denotes a disruption to IT services and the associated issues require immediate attention

  
needs to be backported to maint

   
needs-changes

   
needs-info

   
needs-review

   
performance

   
regression

   
unclear
No labels
AP C2S
AdminAPI
Breaking API
Breaks existing config
Check if still valid
Data Protection
Do not merge
Document in the changelog
Doing
Feature Request / Enhancement
MastoAPI
NL2
NL4
OStatus
OTP Releases
Refactor
Security
To Do
TwitterAPI
bug
complicated
confirmed
deps
discussion
documentation
easy
feature: to be merged in stable
fix: to be merged in stable
incident
needs to be backported to maint
needs-changes
needs-info
needs-review
performance
regression
unclear
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
1 participant
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
pleroma/pleroma!7804
No description provided.