Upstream commit triage

[Plastikmensch]

No guarantee of correctness. (Changes got quite interdependent...)

Checked commits up to: N/a

Can be ported:

• N/A

Can be postponed:

• N/A

Can be skipped:

• N/A

Fixes:

• N/A

The following command was used in a local copy of a fork of this repo to show commits needing triage: \ git fetch vanilla && git log -p refs/remotes/upstream/main..refs/remotes/vanilla/main -- app/javascript/mastodon/ app/javascript/styles ':!app/javascript/mastodon/locales' The -p can be omitted from git log to see commits without changes. Remoteupstream points to this repo and vanilla to upstream repo. Adjust remotes as needed.

I currently don't have the energy to do this anymore and want to focus my remaining energy on my own fork.

[ClearlyClaire]

Would you mind if I pinned this issue? And if you don't mind, could you stick to editing one issue rather than closing the older one and re-opening a new one? Thanks again for your work!

[Plastikmensch]

Would you mind if I pinned this issue?

Not at all!

And if you don't mind, could you stick to editing one issue rather than closing the older one and re-opening a new one? Thanks again for your work!

Can do going forward!

[Plastikmensch]

The next triage will be a bit delayed. I'm not doing well currently and I keep missing stuff.

[ClearlyClaire]

No worries, take care!

[ClearlyClaire]

I'm going to unpin the issue for now, but let me know if you ever feel like doing that again! Thank you again for your work!

[Plastikmensch]

That thanks means a lot, thank you! I was thinking about doing it one more time, since it looks like the compose refactor with its unwelcome locale changes will block merges for a while. But I'll see.

[ClearlyClaire]

The issue is that it will probably block all merges for a while. The easiest way forward is probably go give up and include the redesign including the weird string changes, but even that will take a lot of work.

[Plastikmensch]

Yeah :/ It would be unfortunate to include the string changes, but understandable. I guess replacing the strings with glitch-soc variants which keeps the old text is not worth the effort? I would expect most downstream forks to reject that change anyway.

[ClearlyClaire]

The alternative is to have our own string identifiers for visibility options throughout the code base, it's doable but will increase code changes with upstream across the whole front-end and will prevent us from benefiting from upstream translations.

[Plastikmensch]

Decided to do this one last time until that awful compose change is dealt with. Can't make any promises of keeping this up to date, but I hope it helps anyway.

Regarding the string identifiers: Yeah, I dunno. This just sucks. The extra info made renaming "unlisted" obsolete and the new description is even worse. That should've never been merged. But I'm not sure it's worth the overhead to keep the old text. However you decide to deal with that, I won't hold it against you.