post/nas
1
0
Fork 0
forked from gitea/nas
Code Pull requests Activity

Merge remote-tracking branch 'parent/main' into upstream-20231221

Browse source
This commit is contained in:
KMY 2023-12-21 08:37:12 +09:00
commit a6b57e3890
154 changed files with 7762 additions and 1748 deletions
Download patch file Download diff file Expand all files Collapse all files

2
app/mailers/application_mailer.rb
View file

@ -12,7 +12,7 @@ class ApplicationMailer < ActionMailer::Base
protected
def locale_for_account(account, &block)
I18n.with_locale(account.user_locale || I18n.default_locale, &block)
I18n.with_locale(account.user_locale || I18n.locale || I18n.default_locale, &block)
end
def set_autoreply_headers!

2
app/mailers/user_mailer.rb
View file

@ -202,6 +202,6 @@ class UserMailer < Devise::Mailer
end
def locale
@resource.locale.presence || I18n.default_locale
@resource.locale.presence || I18n.locale || I18n.default_locale
end
end