Skip to content

Add bidirectional text support - Backend #47349

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
nickvergessen merged 5 commits into from
Sep 24, 2024
Merged

Add bidirectional text support - Backend #47349

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
2b7efd6
feat(rtl): Set layout direction based on language
ghorbani-ali Dec 15, 2023
d947452
fix(rtl): Add unittest for language direction
ahangarha Dec 17, 2023
ae06ab5
fix(rtl): Fix list of RTL languages
nickvergessen Aug 20, 2024
242f89a
ci: Restrict RTL characters to RTL languages
nickvergessen Sep 18, 2024
82566c5
fix(rtl): Make clear that the direction is based on language
nickvergessen Sep 18, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
feat(rtl): Set layout direction based on language 
Signed-off-by: ali ghorbani <[email protected]>
  • Loading branch information
@ghorbani-ali @nickvergessen
ghorbani-ali authored and nickvergessen committed Sep 23, 2024
commit 2b7efd66b6deb7fca62046a54b8ca0fe0310fe34
2 changes: 1 addition & 1 deletion core/templates/layout.user.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@
<?php emit_script_loading_tags($_); ?>
<?php print_unescaped($_['headers']); ?>
</head>
<body id="<?php p($_['bodyid']);?>" <?php foreach ($_['enabledThemes'] as $themeId) {
<body dir="<?php p($_['direction']); ?>" id="<?php p($_['bodyid']);?>" <?php foreach ($_['enabledThemes'] as $themeId) {
p("data-theme-$themeId ");
}?> data-themes=<?php p(join(',', $_['enabledThemes'])) ?>>
<?php include 'layout.noscript.warning.php'; ?>
Expand Down
16 changes: 16 additions & 0 deletions lib/private/L10N/Factory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,12 @@ class Factory implements IFactory {
'pt_BR', 'pt_PT', 'da', 'fi_FI', 'nb_NO', 'sv', 'tr', 'zh_CN', 'ko'
];

public const RTL_LANGUAGES = [
'ae', 'ar', 'arc', 'arz', 'bcc', 'bqi', 'ckb', 'dv', 'fa', 'glk',
'ha', 'he', 'khw', 'ks', 'ku', 'mzn', 'nqo', 'pnb', 'ps', 'sd', 'ug',
'ur', 'uzs', 'yi',
];

private ICache $cache;

public function __construct(
Expand Down Expand Up @@ -364,6 +370,16 @@ public function languageExists($app, $lang) {
return in_array($lang, $languages);
}


public function getLanguageDirectionFromLocale(string $locale): string
{
if (in_array($locale, self::RTL_LANGUAGES)) {
return 'rtl';
}

return 'ltr';
}

public function getLanguageIterator(?IUser $user = null): ILanguageIterator {
$user = $user ?? $this->userSession->getUser();
if ($user === null) {
Expand Down
4 changes: 3 additions & 1 deletion lib/private/TemplateLayout.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -193,13 +193,15 @@ public function __construct($renderAs, $appId = '') {
} else {
parent::__construct('core', 'layout.base');
}
// Send the language and the locale to our layouts
// 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);

$lang = str_replace('_', '-', $lang);
$this->assign('language', $lang);
$this->assign('locale', $locale);
$this->assign('direction', $direction);

if (\OC::$server->getSystemConfig()->getValue('installed', false)) {
if (empty(self::$versionHash)) {
Expand Down
9 changes: 9 additions & 0 deletions lib/public/L10N/IFactory.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -103,6 +103,15 @@ public function languageExists($app, $lang);
*/
public function localeExists($locale);

/**
* Return the current language direction from locale
*
* @param string $locale
* @return 'ltr'|'rtl'
* @since 31.0.0
*/
public function getLanguageDirectionFromLocale(string $locale): string;

/**
* iterate through language settings (if provided) in this order:
* 1. returns the forced language or:
Expand Down