luna/mastodon
0
0
Fork 0
mirror of https://github.com/lunaisnotaboy/mastodon.git synced 2024-11-16 03:43:08 +00:00
Code Issues Projects Releases Wiki Activity
16728 commits 1 branch 0 tags 248 MiB
Commit graph

3 commits

Author SHA1 Message Date
Claire 18bcabf26a
Change i18n-tasks config to consider glitch-soc translation files (#2027) 
* Change i18n-tasks config to consider glitch-soc translation files

* Normalize locales-glitch YML files

* Consider upstream Rails translations as external

* Add simple_form.glitch_only to ignore_unused

* Remove unused keybase-related strings
 2022-12-21 22:13:04 +01:00
Claire 9b861d56a9 Merge branch 'main' into glitch-soc/merge-upstream 
Conflicts:
- `.env.production.sample`:
  Copied upstream changes.
- `app/controllers/settings/identity_proofs_controller.rb`:
  Minor conflict due to glitch-soc's extra “enable_keybase” setting.
  Upstream removed keybase support altogether, so did the same.
- `app/controllers/well_known/keybase_proof_config_controller.rb`:
  Minor conflict due to glitch-soc's extra “enable_keybase” setting.
  Upstream removed keybase support altogether, so did the same.
- `lib/mastodon/statuses_cli.rb`:
  Minor conflict due to an optimization that wasn't shared between
  the two versions. Copied upstream's version.
 2021-11-26 22:53:55 +01:00
Julianne420 ebb4de7d3e Add zh-CN translations 2021-10-07 23:40:18 +02:00