mirror of
https://github.com/discourse/discourse.git
synced 2024-11-22 04:11:33 +08:00
DEV: Remove duplicate definition of RTL locales and add Uyghur to the list (#27387)
This commit is contained in:
parent
c13f64d35b
commit
1fbc1cd326
|
@ -259,7 +259,7 @@ module ApplicationHelper
|
|||
end
|
||||
|
||||
def rtl?
|
||||
%w[ar ur fa_IR he].include? I18n.locale.to_s
|
||||
Rtl::LOCALES.include? I18n.locale.to_s
|
||||
end
|
||||
|
||||
def html_lang
|
||||
|
|
10
lib/rtl.rb
10
lib/rtl.rb
|
@ -1,6 +1,8 @@
|
|||
# frozen_string_literal: true
|
||||
|
||||
class Rtl
|
||||
LOCALES = %w[ar fa_IR he ug ur]
|
||||
|
||||
attr_reader :user
|
||||
|
||||
def initialize(user)
|
||||
|
@ -12,15 +14,11 @@ class Rtl
|
|||
end
|
||||
|
||||
def current_user_rtl?
|
||||
SiteSetting.allow_user_locale && (user&.locale || SiteSetting.default_locale).in?(rtl_locales)
|
||||
SiteSetting.allow_user_locale && (user&.locale || SiteSetting.default_locale).in?(LOCALES)
|
||||
end
|
||||
|
||||
def site_locale_rtl?
|
||||
!SiteSetting.allow_user_locale && SiteSetting.default_locale.in?(rtl_locales)
|
||||
end
|
||||
|
||||
def rtl_locales
|
||||
%w[he ar ur fa_IR]
|
||||
!SiteSetting.allow_user_locale && SiteSetting.default_locale.in?(LOCALES)
|
||||
end
|
||||
|
||||
def css_class
|
||||
|
|
Loading…
Reference in New Issue
Block a user