Merge branch 'develop' of https://github.com/ONLYOFFICE/desktop-apps …

…into develop
ONLYOFFICE · Dec 27, 2023 · 254e8c5 · 254e8c5
2 parents 3d1c470 + c5e85b1
commit 254e8c5
Show file tree

Hide file tree

Showing 67 changed files with 1,701 additions and 95 deletions.
diff --git a/common/loginpage/build/Gruntfile.js b/common/loginpage/build/Gruntfile.js
@@ -52,9 +52,7 @@ module.exports = function(grunt) {
                         compress: true,
                         ieCompat: false
                     },
-                    files: {
-                        "<%= pkg.desktop.less.files.dest %>": packageFile['desktop']['less']['files']['src']
-                    }
+                    files: packageFile.desktop.less.files
                 }
             },
 

diff --git a/common/loginpage/build/startpage.json b/common/loginpage/build/startpage.json
@@ -54,10 +54,13 @@
             ]
         },
         "less": {
-            "files": {
+            "files": [{
                 "src": "../src/styles.less",
                 "dest": "../deploy/styles.css"
-            }
+            },{
+                "src": "../src/css/rtl.less",
+                "dest": "../deploy/rtl.css"
+            }]
         },
         "concat": {
             "files": {

diff --git a/common/loginpage/src/index.html b/common/loginpage/src/index.html
@@ -9,6 +9,7 @@
 
     <!-- debug begin -->
     <link rel="stylesheet/less" type="text/css" href="styles.less" />
+    <link rel="stylesheet/less" type="text/css" href="css/rtl.less" />
     <!-- debug end -->
     <link rel="stylesheet/less" href="../noconnect/styles.css" />
 

diff --git a/common/loginpage/src/index.html.deploy b/common/loginpage/src/index.html.deploy
@@ -5,6 +5,7 @@
     <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
 
     <link rel="stylesheet" type="text/css" href="styles.css">
+    <link rel="stylesheet" type="text/css" href="rtl.css">
     <link rel="stylesheet" type="text/css" href="noconnect.css">
 
     <style type="text/css">

diff --git a/common/loginpage/src/panelsettings.js b/common/loginpage/src/panelsettings.js
@@ -176,6 +176,12 @@
                                                 </section>
                                             </div>
                                         </div>
+                                        <div class='settings-field' style='display:none;'>
+                                            <section class='switch-labeled hbox' id='sett-box-rtl-mode'>
+                                                <input type="checkbox" class="checkbox" id="sett-rtl-mode">
+                                                <label for="sett-rtl-mode" class='sett__caption' l10n>RTL Interface *</label>
+                                            </section>
+                                        </div>
                                         <div class='settings-field' id='opts-ui-scaling' style='display:none'>
                                             <label class='sett__caption' l10n>${_lang.settScaling}</label><label class='sett__caption'> *</label>
                                             <div class='sett--label-lift-top hbox'>
@@ -270,7 +276,7 @@
                                 </div>
                                 <div class="spacer" />
                             </div>
-                            <p id="caption-restart" class="sett__caption" style="display:none;text-align:left;margin-block-start:0.5em;"><label>* - </label><label l10n>${_lang.settAfterRestart}</label></p>
+                            <p id="caption-restart" class="sett__caption" style="display:none;"><label>* - </label><label l10n>${_lang.settAfterRestart}</label></p>
                         </div>
                     </div>`;
 
@@ -299,6 +305,7 @@
             $optsSpellcheckMode,
             $optsLaunchMode,
             $optsAutoupdateMode;
+        let $chRtl;
 
         function _set_user_name(name) {
             let me = this;
@@ -408,6 +415,10 @@
                     $optsSpellcheckMode.selectpicker('refresh');
                 }
 
+                if ( $chRtl ) {
+                    _new_settings.rtl = $chRtl.prop("checked");
+                }
+
                 sdk.command("settings:apply", JSON.stringify(_new_settings));
                 $btnApply.disable(true);
 
@@ -427,6 +438,10 @@
                 $btnApply.disable(false);
         };
 
+        function _is_lang_rtl(code) {
+            return code == 'ar-SA';
+        }
+
         function _on_lang_change(e) {
             let l = $optsLang.find('select').val(),
                 c = utils.Lang.tr('setBtnApply', l);
@@ -435,6 +450,10 @@
                 $btnApply.disable(false);
             }
 
+            if ( $chRtl ) {
+                $chRtl.prop("checked", _is_lang_rtl(l));
+            }
+
             $optsLang.toggleClass('notted', true);
         };
 
@@ -607,6 +626,19 @@
                         }
                     }
 
+                    if ( opts.rtl !== undefined ) {
+                        $chRtl = $('#sett-box-rtl-mode', $panel).parent().show().find('#sett-rtl-mode');
+                        $chRtl.prop('checked', !!opts.rtl)
+                            .on('change', e => {
+                                $btnApply.prop('disabled') && $btnApply.prop('disabled', false);
+                            });
+
+                        if ( opts.rtl ) {
+                            document.body.setAttribute('dir', 'rtl');
+                            document.body.classList.add('rtl');
+                        }
+                    }
+
                     $('.settings-field:visible:last').css('margin-bottom','0');
                 } else
                 if (/updates/.test(cmd)) {

diff --git a/common/loginpage/src/styles.less b/common/loginpage/src/styles.less
@@ -1175,7 +1175,7 @@ li.menu-item {
     }
 }
 
-#sett-preview-mode {
+.checkbox {
     width: 12px;
     height: 18px;
     margin-right: 16px;
@@ -1296,6 +1296,11 @@ li.menu-item {
     margin-left: 10px;
 }
 
+#caption-restart {
+    text-align:left;
+    margin-block-start:0.5em;
+}
+
 .about-field {
     margin-bottom: 10px;
 }

diff --git a/macos/ONLYOFFICE.xcodeproj/project.pbxproj b/macos/ONLYOFFICE.xcodeproj/project.pbxproj
@@ -781,6 +781,15 @@
 		5AAFF0A62989B70400D433B5 /* si */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = si; path = si.lproj/InfoPlist.strings; sourceTree = "<group>"; };
 		5AB20F5D274D35F2003732A0 /* file-docxf.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = "file-docxf.icns"; sourceTree = "<group>"; };
 		5AB20F61274D360A003732A0 /* file-oform.icns */ = {isa = PBXFileReference; lastKnownFileType = image.icns; path = "file-oform.icns"; sourceTree = "<group>"; };
+		5ABE02512B22699F0031328E /* ar-SA */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "ar-SA"; path = "ar-SA.lproj/Document-Sign.strings"; sourceTree = "<group>"; };
+		5ABE02522B22699F0031328E /* ar-SA */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "ar-SA"; path = "ar-SA.lproj/Localizable.strings"; sourceTree = "<group>"; };
+		5ABE02532B22699F0031328E /* ar-SA */ = {isa = PBXFileReference; lastKnownFileType = text.plist.stringsdict; name = "ar-SA"; path = "ar-SA.lproj/Localizable.stringsdict"; sourceTree = "<group>"; };
+		5ABE02542B22699F0031328E /* ar-SA */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "ar-SA"; path = "ar-SA.lproj/Main.strings"; sourceTree = "<group>"; };
+		5ABE02552B22699F0031328E /* ar-SA */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "ar-SA"; path = "ar-SA.lproj/MoveApplication.strings"; sourceTree = "<group>"; };
+		5ABE02562B22699F0031328E /* ar-SA */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "ar-SA"; path = "ar-SA.lproj/Presentation-Reporter.strings"; sourceTree = "<group>"; };
+		5ABE02572B22699F0031328E /* ar-SA */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "ar-SA"; path = "ar-SA.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
+		5ABE02582B22699F0031328E /* ar-SA */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "ar-SA"; path = "ar-SA.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
+		5ABE02592B22699F0031328E /* ar-SA */ = {isa = PBXFileReference; lastKnownFileType = text.plist.strings; name = "ar-SA"; path = "ar-SA.lproj/InfoPlist.strings"; sourceTree = "<group>"; };
 		5AD24E292902AE3C00748926 /* Sparkle.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Sparkle.framework; path = Vendor/Sparkle/Sparkle.framework; sourceTree = SOURCE_ROOT; };
 		BE6251B922BD089100656116 /* dictionaries */ = {isa = PBXFileReference; lastKnownFileType = folder; name = dictionaries; path = ../../../../dictionaries; sourceTree = "<group>"; };
 		BE95F0A623E9FF590045E0CB /* mac_cefview.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = mac_cefview.h; sourceTree = "<group>"; };
@@ -1919,6 +1928,7 @@
 				si,
 				nb,
 				"zh-Hant-TW",
+				"ar-SA",
 			);
 			mainGroup = FCBC425F1B9D650400405301;
 			productRefGroup = FCBC42691B9D650400405301 /* Products */;
@@ -2536,6 +2546,7 @@
 				5AAFF0A32989B70400D433B5 /* si */,
 				5A9AC2A929AEB1E100B6A250 /* nb */,
 				5A4ECA6A2AA88CB900286D52 /* zh-Hant-TW */,
+				5ABE02562B22699F0031328E /* ar-SA */,
 			);
 			name = "Presentation-Reporter.storyboard";
 			sourceTree = "<group>";
@@ -2583,6 +2594,7 @@
 				5AAFF0A22989B70400D433B5 /* si */,
 				5A9AC2A829AEB1E100B6A250 /* nb */,
 				5A4ECA692AA88CB900286D52 /* zh-Hant-TW */,
+				5ABE02552B22699F0031328E /* ar-SA */,
 			);
 			name = MoveApplication.strings;
 			sourceTree = "<group>";
@@ -2670,7 +2682,7 @@
 				5A7F872D27A346DA006B6E27 /* uk-UA */,
 				5A7F874227A3478C006B6E27 /* ja-JP */,
 				5AAFF0A62989B70400D433B5 /* si */,
-				5AC517712AA7D8DE00556F12 /* en */,
+				5ABE02592B22699F0031328E /* ar-SA */,
 			);
 			name = InfoPlist.strings;
 			sourceTree = "<group>";
@@ -2758,7 +2770,7 @@
 				5A7F870A27A340D5006B6E27 /* uk-UA */,
 				5A7F874327A348BB006B6E27 /* ja-JP */,
 				5AAFF0A52989B70400D433B5 /* si */,
-				5AC517702AA7D8DE00556F12 /* en */,
+				5ABE02582B22699F0031328E /* ar-SA */,
 			);
 			name = InfoPlist.strings;
 			sourceTree = "<group>";
@@ -2847,6 +2859,7 @@
 				5A7F874827A34A06006B6E27 /* ja-JP */,
 				5AAFF0A42989B70400D433B5 /* si */,
 				5A9AC2AA29AEB1F000B6A250 /* nb */,
+				5ABE02572B22699F0031328E /* ar-SA */,
 			);
 			name = InfoPlist.strings;
 			sourceTree = "<group>";
@@ -2894,6 +2907,7 @@
 				5AAFF0A12989B70400D433B5 /* si */,
 				5A9AC2A729AEB1E100B6A250 /* nb */,
 				5A4ECA682AA88CB900286D52 /* zh-Hant-TW */,
+				5ABE02542B22699F0031328E /* ar-SA */,
 			);
 			name = Main.storyboard;
 			sourceTree = "<group>";
@@ -2941,6 +2955,7 @@
 				5AAFF0A02989B70400D433B5 /* si */,
 				5A9AC2A629AEB1E100B6A250 /* nb */,
 				5A4ECA672AA88CB900286D52 /* zh-Hant-TW */,
+				5ABE02532B22699F0031328E /* ar-SA */,
 			);
 			name = Localizable.stringsdict;
 			sourceTree = "<group>";
@@ -2988,6 +3003,7 @@
 				5AAFF09E2989B70400D433B5 /* si */,
 				5A9AC2A429AEB1E100B6A250 /* nb */,
 				5A4ECA652AA88CB900286D52 /* zh-Hant-TW */,
+				5ABE02512B22699F0031328E /* ar-SA */,
 			);
 			name = "Document-Sign.storyboard";
 			sourceTree = "<group>";
@@ -3035,6 +3051,7 @@
 				5AAFF09F2989B70400D433B5 /* si */,
 				5A9AC2A529AEB1E100B6A250 /* nb */,
 				5A4ECA662AA88CB900286D52 /* zh-Hant-TW */,
+				5ABE02522B22699F0031328E /* ar-SA */,
 			);
 			name = Localizable.strings;
 			sourceTree = "<group>";

diff --git a/macos/ONLYOFFICE/Resources/ONLYOFFICE-arm/ar-SA.lproj/InfoPlist.strings b/macos/ONLYOFFICE/Resources/ONLYOFFICE-arm/ar-SA.lproj/InfoPlist.strings
@@ -0,0 +1,6 @@
+/* Bundle name */
+"CFBundleName" = "أونلي أوفيس";
+
+/* Copyright (human-readable) */
+"NSHumanReadableCopyright" = "الحقوق جميعها محفوظة 2023 © أسينسو سيستم.";
+
diff --git a/macos/ONLYOFFICE/Resources/ONLYOFFICE-v8/ar-SA.lproj/InfoPlist.strings b/macos/ONLYOFFICE/Resources/ONLYOFFICE-v8/ar-SA.lproj/InfoPlist.strings
@@ -0,0 +1,6 @@
+/* Bundle name */
+"CFBundleName" = "أونلي أوفيس";
+
+/* Copyright (human-readable) */
+"NSHumanReadableCopyright" = "الحقوق جميعها محفوظة 2023 © أسينسو سيستم.";
+
diff --git a/macos/ONLYOFFICE/Resources/ONLYOFFICE-x86_64/ar-SA.lproj/InfoPlist.strings b/macos/ONLYOFFICE/Resources/ONLYOFFICE-x86_64/ar-SA.lproj/InfoPlist.strings
@@ -0,0 +1,6 @@
+/* Bundle name */
+"CFBundleName" = "أونلي أوفيس";
+
+/* Copyright (human-readable) */
+"NSHumanReadableCopyright" = "الحقوق جميعها محفوظة 2023 © أسينسو سيستم.";
+
diff --git a/macos/ONLYOFFICE/ar-SA.lproj/Document-Sign.strings b/macos/ONLYOFFICE/ar-SA.lproj/Document-Sign.strings
@@ -0,0 +1,39 @@
+/* Class = "NSTextFieldCell"; title = "Enter the password for the private key."; ObjectID = "1dL-nN-bJI"; */
+"1dL-nN-bJI.title" = "ادخل كلمة مرور مفتاح التشفير الخاص";
+
+/* Class = "NSTextFieldCell"; title = "Enter the password for the digital signature."; ObjectID = "1Fy-mg-aq9"; */
+"1Fy-mg-aq9.title" = "ادخل كلمة مرور التوقيع الرقمي.";
+
+/* Class = "NSTextFieldCell"; title = "Specify the digital signature file for the document."; ObjectID = "2Ck-6y-ygx"; */
+"2Ck-6y-ygx.title" = "حدّد ملف التوقيع الرقمي للمستند.";
+
+/* Class = "NSSecureTextFieldCell"; placeholderString = "Enter Password"; ObjectID = "4gA-s8-Lne"; */
+"4gA-s8-Lne.placeholderString" = "ادخل كلمة المرور";
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "GOU-av-TC1"; */
+"GOU-av-TC1.title" = "إلغاء";
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "jpH-3g-Gt5"; */
+"jpH-3g-Gt5.title" = "إلغاء";
+
+/* Class = "NSButtonCell"; title = "Load a Private Key"; ObjectID = "P3k-kI-w22"; */
+"P3k-kI-w22.title" = "فتح مفتاح التشفير الخاص";
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "qZ4-0O-L0G"; */
+"qZ4-0O-L0G.title" = "إلغاء";
+
+/* Class = "NSButtonCell"; title = "Cancel"; ObjectID = "RbM-Dq-A3K"; */
+"RbM-Dq-A3K.title" = "إلغاء";
+
+/* Class = "NSTextFieldCell"; title = "Specify a private key for the digital signature."; ObjectID = "Tfc-EF-VnS"; */
+"Tfc-EF-VnS.title" = "حدّد مفتاح التشفير الخاص للتوقيع الرقمي";
+
+/* Class = "NSButtonCell"; title = "Load Signature"; ObjectID = "tTF-wa-eJp"; */
+"tTF-wa-eJp.title" = "فتح التوقيع";
+
+/* Class = "NSWindow"; title = "Window"; ObjectID = "uKp-p4-6uB"; */
+"uKp-p4-6uB.title" = "نافذة";
+
+/* Class = "NSSecureTextFieldCell"; placeholderString = "Enter Password"; ObjectID = "Zj5-0h-hpW"; */
+"Zj5-0h-hpW.placeholderString" = "ادخل كلمة المرور";
+