fix(rtl): Make clear that the direction is based on language

Signed-off-by: Joas Schilling <[email protected]>
nextcloud · Sep 23, 2024 · 82566c5 · 82566c5
1 parent 242f89a
commit 82566c5
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 11 deletions.
diff --git a/lib/private/L10N/Factory.php b/lib/private/L10N/Factory.php
@@ -377,9 +377,8 @@ public function languageExists($app, $lang) {
 		return in_array($lang, $languages);
 	}
 
-
-	public function getLanguageDirectionFromLocale(string $locale): string {
-		if (in_array($locale, self::RTL_LANGUAGES)) {
+	public function getLanguageDirection(string $language): string {
+		if (in_array($language, self::RTL_LANGUAGES, true)) {
 			return 'rtl';
 		}
 

diff --git a/lib/private/TemplateLayout.php b/lib/private/TemplateLayout.php
@@ -196,7 +196,7 @@ public function __construct($renderAs, $appId = '') {
 		// Send the language, locale, and direction to our layouts
 		$lang = \OC::$server->get(IFactory::class)->findLanguage();
 		$locale = \OC::$server->get(IFactory::class)->findLocale($lang);
-		$direction = \OC::$server->getL10NFactory()->getLanguageDirectionFromLocale($locale);
+		$direction = \OC::$server->getL10NFactory()->getLanguageDirection($lang);
 
 		$lang = str_replace('_', '-', $lang);
 		$this->assign('language', $lang);

diff --git a/lib/public/L10N/IFactory.php b/lib/public/L10N/IFactory.php
@@ -104,13 +104,13 @@ public function languageExists($app, $lang);
 	public function localeExists($locale);
 
 	/**
-	 * Return the current language direction from locale
+	 * Return the language direction
 	 *
-	 * @param string $locale
+	 * @param string $language
 	 * @return 'ltr'|'rtl'
 	 * @since 31.0.0
 	 */
-	public function getLanguageDirectionFromLocale(string $locale): string;
+	public function getLanguageDirection(string $language): string;
 
 	/**
 	 * iterate through language settings (if provided) in this order:

diff --git a/tests/lib/L10N/FactoryTest.php b/tests/lib/L10N/FactoryTest.php
@@ -776,7 +776,7 @@ public function testGetLanguageIterator(bool $hasSession, ?IUser $iUserMock = nu
 		self::assertInstanceOf(ILanguageIterator::class, $iterator);
 	}
 
-	public static function languagesWithRespectedDirection():array {
+	public static function dataGetLanguageDirection(): array {
 		return [
 			['en', 'ltr'],
 			['de', 'ltr'],
@@ -786,11 +786,11 @@ public static function languagesWithRespectedDirection():array {
 	}
 
 	/**
-	 * @dataProvider languagesWithRespectedDirection
+	 * @dataProvider dataGetLanguageDirection
 	 */
-	public function testDirectionOfLocales(string $locale, string $expectedDirection) {
+	public function testGetLanguageDirection(string $language, string $expectedDirection) {
 		$factory = $this->getFactory();
 
-		self::assertEquals($expectedDirection, $factory->getLanguageDirectionFromLocale($locale));
+		self::assertEquals($expectedDirection, $factory->getLanguageDirection($language));
 	}
 }