kikobar/mastodon
1
0
Fork 0
mirror of https://github.com/kikobar/mastodon.git synced 2024-11-17 04:32:22 +00:00
Code Issues Packages Projects Releases Wiki Activity

Only strip country code when language not listed in SUPPORTED_LOCALES (#27099)

Browse source
This commit is contained in:
gunchleoc 2023-09-28 09:13:44 +01:00 committed by GitHub
parent 57f592fed5
commit ce79caca4e
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 1 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
app/helpers/languages_helper.rb
View file

@ -254,6 +254,7 @@ module LanguagesHelper
def valid_locale_or_nil(str) def valid_locale_or_nil(str)
return if str.blank? return if str.blank?
return str if valid_locale?(str)
code, = str.to_s.split(/[_-]/) # Strip out the region from e.g. en_US or ja-JP code, = str.to_s.split(/[_-]/) # Strip out the region from e.g. en_US or ja-JP