From 1fbc1cd326782bd0871a07c416f3ca92b9497252 Mon Sep 17 00:00:00 2001 From: Gerhard Schlager Date: Sat, 8 Jun 2024 21:24:39 +0200 Subject: [PATCH] DEV: Remove duplicate definition of RTL locales and add Uyghur to the list (#27387) --- app/helpers/application_helper.rb | 2 +- lib/rtl.rb | 10 ++++------ 2 files changed, 5 insertions(+), 7 deletions(-) diff --git a/app/helpers/application_helper.rb b/app/helpers/application_helper.rb index b409efe2183..e0a0d22a1ef 100644 --- a/app/helpers/application_helper.rb +++ b/app/helpers/application_helper.rb @@ -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 diff --git a/lib/rtl.rb b/lib/rtl.rb index 80259f06d17..c58a57a75fc 100644 --- a/lib/rtl.rb +++ b/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