Support hebrew language

ONLYOFFICE · Sep 18, 2024 · 4635af4 · 4635af4
1 parent 384bfb6
commit 4635af4
Show file tree

Hide file tree

Showing 8 changed files with 7 additions and 12 deletions.
diff --git a/apps/common/locale.js b/apps/common/locale.js
@@ -172,7 +172,7 @@ Common.Locale = new(function() {
     } else _requireLang();
 
     const _isCurrentRtl = function () {
-        return currentLang && (/^(ar)$/i.test(currentLang));
+        return currentLang && (/^(ar|he)$/i.test(currentLang));
     };
 
     return {

diff --git a/apps/common/main/lib/util/htmlutils.js b/apps/common/main/lib/util/htmlutils.js
@@ -48,7 +48,7 @@ if (!window.lang) {
 window.lang && (window.lang = window.lang.split(/[\-\_]/)[0].toLowerCase());
 
 var isLangRtl = function (lang) {
-    return lang.lastIndexOf('ar', 0) === 0;
+    return lang.lastIndexOf('ar', 0) === 0 || lang.lastIndexOf('he', 0) === 0;
 }
 
 var ui_rtl = false;
@@ -68,6 +68,7 @@ if ( ui_rtl && !isIE ) {
 if ( isLangRtl(lang) ) {
     document.body.classList.add('rtl-font');
 }
+document.body.setAttribute('applang', lang);
 
 function checkScaling() {
     var matches = {

diff --git a/apps/common/main/resources/less/variables.less b/apps/common/main/resources/less/variables.less
@@ -66,7 +66,9 @@
 // -------------------------
 
 .rtl-font {
-    --font-family-base-custom: system-ui, -apple-system, "Geeza Pro", "Segoe UI", "Traditional Arabic", "Noto Sans";
+    &[applang=ar] {
+        --font-family-base-custom: system-ui, -apple-system, "Geeza Pro", "Segoe UI", "Traditional Arabic", "Noto Sans";
+    }
 }
 
 @font-family-sans-serif:  Arial, Helvetica, "Helvetica Neue", sans-serif;

diff --git a/apps/common/mobile/utils/htmlutils.js b/apps/common/mobile/utils/htmlutils.js
@@ -28,7 +28,7 @@ function isLocalStorageAvailable() {
     let lang = (/(?:&|^)lang=([^&]+)&?/i).exec(window.location.search.substring(1));
     lang = ((lang && lang[1]) || window.Common.Locale.defaultLang).split(/[\-\_]/)[0];
     Common.Locale.currentLang = lang;
-    Common.Locale.isCurrentLangRtl = lang.lastIndexOf('ar', 0) === 0;
+    Common.Locale.isCurrentLangRtl = lang.lastIndexOf('ar', 0) === 0 || lang.lastIndexOf('he', 0) === 0;
 }
 
 {

diff --git a/apps/documenteditor/main/app/controller/Viewport.js b/apps/documenteditor/main/app/controller/Viewport.js
@@ -164,8 +164,6 @@ define([
             var $filemenu = $('.toolbar-fullview-panel');
             $filemenu.css('top', Common.UI.LayoutManager.isElementVisible('toolbar') ? _intvars.get('toolbar-height-tabs') : 0);
 
-            me.viewport.$el.attr('applang', me.appConfig.lang.split(/[\-_]/)[0]);
-
             if ( !(config.isEdit || config.isRestrictedEdit && config.canFillForms && config.isFormCreator) ||
                 ( !Common.localStorage.itemExists("de-compact-toolbar") &&
                 config.customization && config.customization.compactToolbar )) {

diff --git a/apps/pdfeditor/main/app/controller/Viewport.js b/apps/pdfeditor/main/app/controller/Viewport.js
@@ -171,8 +171,6 @@ define([
             var $filemenu = $('.toolbar-fullview-panel');
             $filemenu.css('top', Common.UI.LayoutManager.isElementVisible('toolbar') ? _intvars.get('toolbar-height-tabs') : 0);
 
-            me.viewport.$el.attr('applang', config.lang.split(/[\-_]/)[0]);
-
             if ( !(config.isEdit || config.isRestrictedEdit) || ( !Common.localStorage.itemExists("pdfe-compact-toolbar") &&
                     config.customization && config.customization.compactToolbar )) {
                 var panel = me.viewport.vlayout.getItem('toolbar');

diff --git a/apps/presentationeditor/main/app/controller/Viewport.js b/apps/presentationeditor/main/app/controller/Viewport.js
@@ -163,8 +163,6 @@ define([
             var $filemenu = $('.toolbar-fullview-panel');
             $filemenu.css('top', Common.UI.LayoutManager.isElementVisible('toolbar') ? _intvars.get('toolbar-height-tabs') : 0);
 
-            me.viewport.$el.attr('applang', me.appConfig.lang.split(/[\-_]/)[0]);
-
             if ( !config.isEdit ||
                 ( !Common.localStorage.itemExists("pe-compact-toolbar") &&
                     config.customization && config.customization.compactToolbar ))

diff --git a/apps/spreadsheeteditor/main/app/controller/Viewport.js b/apps/spreadsheeteditor/main/app/controller/Viewport.js
@@ -140,8 +140,6 @@ define([
             var $filemenu = $('.toolbar-fullview-panel');
             $filemenu.css('top', Common.UI.LayoutManager.isElementVisible('toolbar') ? _intvars.get('toolbar-height-tabs') : 0);
 
-            me.viewport.$el.attr('applang', me.appConfig.lang.split(/[\-_]/)[0]);
-
             if ( !config.isEdit ||
                     ( !Common.localStorage.itemExists("sse-compact-toolbar") &&
                         config.customization && config.customization.compactToolbar ))