Skip to content
Snippets Groups Projects

Draft: Separate Sharkey strings from Misskey (#624)

Closed piuvas silly requested to merge piuvas/Sharkey:separatedlocale into develop

What does this PR do? (Please give us a brief description of what this PR does.)

separates all sharkey strings on sharkey-locales and makes our locales synced to misskey's. this allows us to have our own translation workflow, which helps sharkey be translated to other languages and also our locales don't get wiped by theirs whenever they update something : )

then, we merge them on build time (our translations overwrite theirs). as simple as possible

considerations:

  • translations fallback in this order: Sharkey L10N -> Misskey L10N -> Sharkey English -> Misskey English. i prefer if it's in the user's native language over being in parity with sharkey.
  • had to remove the sharkey-only changes that were made through prs because i'd have to manually check each one and it would be super hellish
  • we probably want to setup a crowdin, have a cool workflow that copies misskey's for merging locales before merging this lol
  • this is as seamless as possible as we don't have to change anything on our side if upstream adds new features

todo:

  • diff en-US and rewrite changes on sharkey-locales
  • revert locales to upstream
  • merge sharkey-locales and locales on build
  • setup localization platform
  • update ui to show users where to contribute (placeholder link)
  • update contributing.md

Contribution Guidelines By submitting this merge request, you agree to follow our Contribution Guidelines

  • I agree to follow this project's Contribution Guidelines
  • I have made sure to test this pull request
Edited by piuvas silly

Merge request reports

Loading
Loading

Activity

Filter activity
  • Approvals
  • Assignees & reviewers
  • Comments (from bots)
  • Comments (from users)
  • Commits & branches
  • Edits
  • Labels
  • Lock status
  • Mentions
  • Merge request status
  • Tracking
  • awesome work with this!

  • added enhancement label

  • piuvas silly added 1 commit

    added 1 commit

    Compare with previous version

  • piuvas silly added 1 commit

    added 1 commit

    • 14ae00b5 - make en-US our crowdin source

    Compare with previous version

  • dakkar changed title from Draft: Separate Sharkey strings from Misskey (!624) to Draft: Separate Sharkey strings from Misskey (#624)

    changed title from Draft: Separate Sharkey strings from Misskey (!624) to Draft: Separate Sharkey strings from Misskey (#624)

    • Developer
      Resolved by dakkar

      I have compared the translations generated by this branch, against the translations on misskey 2024.9.0, and I'm pretty sure that the differences are correct ("boost" instead of "renote", "sharkey" instead of "misskey", plus of course all the sharkey-specific strings)

      I am a bit unsure how to merge this, because it will conflict with the 2024.9.0 merge, whichever way we do it… I'll play around a bit

  • piuvas silly added 1 commit

    added 1 commit

    • c238815a - add strings from disablewarn

    Compare with previous version

  • piuvas silly mentioned in merge request !672 (merged)

    mentioned in merge request !672 (merged)

  • dakkar mentioned in merge request !675 (merged)

    mentioned in merge request !675 (merged)

  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Loading
  • Please register or sign in to reply
    Loading