Leatherface/mastodon
1
0
Fork 0
mirror of https://github.com/glitch-soc/mastodon.git synced 2025-12-24 19:37:26 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge commit '1fc165de02d79294c8a218f5fa82bcd477484ca1' into glitch-soc/merge-upstream

Browse Source 
Conflicts:
- `.env.production.sample`:
  Upstream added a block of three environment variables, while glitch-soc
  has a different version of the file overall.
  Added upstream's changes.
- `app/helpers/application_helper.rb`:
  Upstream added a helper, while glitch-soc had extra helpers.
  Added upstream's helper.
This commit is contained in:
Claire
2024-10-19 19:13:32 +02:00
parent 92771e5afb 1fc165de02
commit 6281c4dedd
283 changed files with 2777 additions and 1360 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
app/controllers/api/v1/statuses/translations_controller.rb
View File

@@ -23,6 +23,6 @@ class Api::V1::Statuses::TranslationsController < Api::V1::Statuses::BaseControl
private
def set_translation
@translation = TranslateStatusService.new.call(@status, content_locale)
@translation = TranslateStatusService.new.call(@status, I18n.locale.to_s)
end
end