pleroma/pleroma
4
6
Fork 12
Code Issues 720 Pull requests 83 Projects Releases 1 Packages Wiki Activity

Multi-language posting (but rebased and adjusted for my liking) #7823

Open
mkljczk wants to merge 59 commits from mkljczk/pleroma:rebase-multilang into develop
pull from: mkljczk/pleroma:rebase-multilang
merge into: pleroma:develop
Conversation 1 Commits 59 Files changed 58 +2651 -159
mkljczk commented 2026-02-15 20:47:33 +00:00
Owner
Copy link
No description provided. 
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>
improvements and test fixes
Some checks are pending
ci/woodpecker/pr/woodpecker Pipeline is pending
Details
4b4b35778d 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
Assisted-by: your mother
Merge remote-tracking branch 'origin/develop' into rebase-multilang
Some checks are pending
ci/woodpecker/pr/woodpecker Pipeline is pending approval
Details
f91e507438 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
Assisted-by: your mother
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
Assisted-by: your mother
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
Assisted-by: your mother
fixes
Some checks are pending
ci/woodpecker/pr/woodpecker Pipeline is pending approval
Details
ed76c54c0d 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
Assisted-by: your mother
add initial, untested NormalizeLanguageMapPolicy MRF
Some checks are pending
ci/woodpecker/pr/woodpecker Pipeline is pending approval
Details
d5b1864ce1 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
Assisted-by: your mother
Make MRF work, add a test
Some checks are pending
ci/woodpecker/pr/woodpecker Pipeline is pending approval
Details
961556ffe8 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
Assisted-by: your mother
Merge remote-tracking branch 'origin/develop' into rebase-multilang
Some checks are pending
ci/woodpecker/pr/woodpecker Pipeline is pending approval
Details
1ab541fda2 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
Assisted-by: your mother
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
Assisted-by: your mother
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
Assisted-by: your mother
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
Assisted-by: your mother
Merge remote-tracking branch 'mkljczk-pleroma/rebase-multilang' into rebase-multilang
Some checks are pending
ci/woodpecker/pr/woodpecker Pipeline is pending approval
Details
9a356f0a7a 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
Allow updating multilanguage statuses
Some checks failed
ci/woodpecker/pr/woodpecker Pipeline failed
Details
cb8c8e9657 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
Assisted-by: your mother
mkljczk changed title from WIP: Multi-language posting (but rebased and adjusted for my liking) to Multi-language posting (but rebased and adjusted for my liking) 2026-03-28 13:48:53 +00:00
format
Some checks failed
ci/woodpecker/pr/woodpecker Pipeline failed
Details
5c73dda0ab 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
Assisted-by: your mother
Merge remote-tracking branch 'origin/develop' into rebase-multilang
Some checks failed
ci/woodpecker/pr/changelog Pipeline failed
Details
ci/woodpecker/pr/lint Pipeline was successful
Details
ci/woodpecker/pr/unit-testing-elixir-1.15 Pipeline was successful
Details
ci/woodpecker/pr/unit-testing-elixir-1.18 Pipeline was successful
Details
0590f59f7c
Add changelog
All checks were successful
ci/woodpecker/pr/changelog Pipeline was successful
Details
4724fc4fa4 
Signed-off-by: nicole mikołajczyk <git@mkljczk.pl>
Assisted-by: your mother
mkljczk commented 2026-04-01 21:08:14 +00:00
Author
Owner
Copy link

I forked the #7199 PR but made some changes. Most importantly, moved rendering posts with multiple languages to a single string to a MRF and added requirement for each multi-language post to have a primary language.

I forked the #7199 PR but made some changes. Most importantly, moved rendering posts with multiple languages to a single string to a MRF and added requirement for each multi-language post to have a primary language.
All checks were successful
ci/woodpecker/pr/changelog Pipeline was successful
Details
This pull request has changes conflicting with the target branch.
  • lib/pleroma/web/common_api/activity_draft.ex
View command line instructions

Manual merge helper

Use this merge commit message when completing the merge manually.

Checkout

From your project repository, check out a new branch and test the changes.
git fetch -u rebase-multilang:mkljczk-rebase-multilang
git switch mkljczk-rebase-multilang

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 mkljczk-rebase-multilang
git switch mkljczk-rebase-multilang
git rebase develop
git switch develop
git merge --ff-only mkljczk-rebase-multilang
git switch mkljczk-rebase-multilang
git rebase develop
git switch develop
git merge --no-ff mkljczk-rebase-multilang
git switch develop
git merge --squash mkljczk-rebase-multilang
git switch develop
git merge --ff-only mkljczk-rebase-multilang
git switch develop
git merge mkljczk-rebase-multilang
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!7823
No description provided.