diff options
author | Claire <claire.github-309c@sitedethib.com> | 2023-02-03 19:07:58 +0100 |
---|---|---|
committer | Claire <claire.github-309c@sitedethib.com> | 2023-02-03 19:23:27 +0100 |
commit | aeacebb3d75112d0d22b9829813c388eef6ce5af (patch) | |
tree | 98fced042da7c37db7b401eb197cc44c7aa1a41c /config/application.rb | |
parent | ec26f7c1b16ca1429991212292e35e520c617485 (diff) | |
parent | 79ca19e9b2e701d98c80afd939a98c2a3ef74830 (diff) |
Merge branch 'main' into glitch-soc/merge-upstream
Conflicts: - `.github/workflows/build-image.yml`: Upstream updated `docker/build-push-action`, and we a different config for `docker/metadata-action` so the lines directly above were different, but it's not a real conflict. Upgraded `docker/build-push-action` as upstream did. - `app/javascript/mastodon/features/compose/components/compose_form.js`: Upstream changed the codestyle near a line we had modified to accommodate configurable character count. Kept our change.
Diffstat (limited to 'config/application.rb')
-rw-r--r-- | config/application.rb | 15 |
1 files changed, 15 insertions, 0 deletions
diff --git a/config/application.rb b/config/application.rb index 929a44948..c51eacd68 100644 --- a/config/application.rb +++ b/config/application.rb @@ -69,12 +69,14 @@ module Mastodon # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s] config.i18n.available_locales = [ :af, + :an, :ar, :ast, :be, :bg, :bn, :br, + :bs, :ca, :ckb, :co, @@ -84,6 +86,7 @@ module Mastodon :de, :el, :en, + :'en-GB', :eo, :es, :'es-AR', @@ -92,7 +95,9 @@ module Mastodon :eu, :fa, :fi, + :fo, :fr, + :'fr-QC', :fy, :ga, :gd, @@ -103,6 +108,7 @@ module Mastodon :hu, :hy, :id, + :ig, :io, :is, :it, @@ -113,16 +119,20 @@ module Mastodon :kn, :ko, :ku, + :kw, + :la, :lt, :lv, :mk, :ml, :mr, :ms, + :my, :nl, :nn, :no, :oc, + :pa, :pl, :'pt-BR', :'pt-PT', @@ -130,6 +140,7 @@ module Mastodon :ru, :sa, :sc, + :sco, :si, :sk, :sl, @@ -137,10 +148,14 @@ module Mastodon :sr, :'sr-Latn', :sv, + :szl, :ta, + :tai, :te, :th, :tr, + :tt, + :ug, :uk, :ur, :vi, |