Merge pull request #309 from ONLYOFFICE/release/1.4.0

Release/1.4.0

CHANGELOG.md

@@ -6,6 +6,10 @@
 - offline viewer for anonymous
 - added hy, eu, zh-TW, ms, pt-PT
 
+## 1.3.1
+- charp: fix references
+- ruby: update rails 
+
 ## 1.3.0
 - update empty files
 - anonymous without chat

web/documentserver-example/java-spring/pom.xml

@@ -61,10 +61,15 @@
 			<version>1.18.20</version>
 			<scope>provided</scope>
 		</dependency>
+		<dependency>
+			<groupId>com.fasterxml.jackson.core</groupId>
+			<artifactId>jackson-core</artifactId>
+			<version>2.13.4</version>
+		</dependency>
 		<dependency>
 			<groupId>com.fasterxml.jackson.core</groupId>
 			<artifactId>jackson-databind</artifactId>
-			<version>2.12.6.1</version>
+			<version>2.13.4.2</version>
 		</dependency>
 		<dependency>
 			<groupId>org.modelmapper</groupId>

web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/controllers/EditorController.java

@@ -26,7 +26,6 @@ import com.onlyoffice.integration.documentserver.models.enums.Action;
 import com.onlyoffice.integration.documentserver.storage.FileStoragePathBuilder;
 import com.onlyoffice.integration.entities.User;
 import com.onlyoffice.integration.dto.Mentions;
-import com.onlyoffice.integration.documentserver.models.enums.Language;
 import com.onlyoffice.integration.documentserver.models.enums.Type;
 import com.onlyoffice.integration.documentserver.models.filemodel.FileModel;
 import com.onlyoffice.integration.services.UserServices;
@@ -53,6 +52,9 @@ public class EditorController {
     @Value("${files.docservice.url.api}")
     private String docserviceApiUrl;
 
+    @Value("${files.docservice.languages}")
+    private String langs;
+
     @Autowired
     private FileStoragePathBuilder storagePathBuilder;
 
@@ -82,11 +84,19 @@ public class EditorController {
                         Model model) throws JsonProcessingException {
         Action action = Action.edit;
         Type type = Type.desktop;
-        Language language = Language.en;
+        Locale locale = new Locale("en");
 
         if(actionParam != null) action = Action.valueOf(actionParam);
         if(typeParam != null) type = Type.valueOf(typeParam);
-        if(lang != null) language = Language.valueOf(lang);
+
+        List<String> langsAndKeys = Arrays.asList(langs.split("\\|"));
+        for (String langAndKey : langsAndKeys) {
+            String[] couple = langAndKey.split(":");
+            if (couple[0].equals(lang)) {
+                String[] langAndCountry = couple[0].split("-");
+                locale = new Locale(langAndCountry[0], langAndCountry.length > 1 ? langAndCountry[1] : "");
+            }
+        }
 
         Optional<User> optionalUser = userService.findUserById(Integer.parseInt(uid));
 
@@ -101,7 +111,7 @@ public class EditorController {
                         .builder()
                         .fileName(fileName)
                         .type(type)
-                        .lang(language)
+                        .lang(locale.toLanguageTag())
                         .action(action)
                         .user(user)
                         .actionData(actionLink)

web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/models/enums/Language.java

@@ -1,55 +0,0 @@
-/**
- *
- * (c) Copyright Ascensio System SIA 2021
- *
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *     http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- *
- */
-
-package com.onlyoffice.integration.documentserver.models.enums;
-
-public enum Language {
-    en,
-    de,
-    ru,
-    pl,
-    be,
-    bg,
-    ca,
-    zh,
-    cs,
-    da,
-    nl,
-    fi,
-    fr,
-    el,
-    hu,
-    id,
-    it,
-    ja,
-    ko,
-    lv,
-    lo,
-    nb,
-    pt,
-    ro,
-    sk,
-    sl,
-    sv,
-    es,
-    tr,
-    uk,
-    vi,
-    gl,
-    az
-}

web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/documentserver/models/filemodel/EditorConfig.java

@@ -20,7 +20,6 @@ package com.onlyoffice.integration.documentserver.models.filemodel;
 
 import com.onlyoffice.integration.documentserver.models.configurations.Customization;
 import com.onlyoffice.integration.documentserver.models.configurations.Embedded;
-import com.onlyoffice.integration.documentserver.models.enums.Language;
 import com.onlyoffice.integration.documentserver.models.enums.Mode;
 import lombok.*;
 import org.springframework.beans.factory.annotation.Autowired;
@@ -44,7 +43,7 @@ public class EditorConfig {  // the parameters pertaining to the editor interfac
     private Customization customization;  // the parameters which allow to customize the editor interface so that it looked like your other products (if there are any) and change the presence or absence of the additional buttons, links, change logos and editor owner details
     @Autowired
     private Embedded embedded;  // the parameters which allow to change the settings which define the behavior of the buttons in the embedded mode
-    private Language lang;  // the editor interface language
+    private String lang;  // the editor interface language
     private Mode mode;  // the editor opening mode
     @Autowired
     private User user;  // the user currently viewing or editing the document

web/documentserver-example/java-spring/src/main/java/com/onlyoffice/integration/services/configurers/wrappers/DefaultFileWrapper.java

@@ -20,7 +20,6 @@ package com.onlyoffice.integration.services.configurers.wrappers;
 
 import com.onlyoffice.integration.documentserver.models.enums.Action;
 import com.onlyoffice.integration.entities.User;
-import com.onlyoffice.integration.documentserver.models.enums.Language;
 import com.onlyoffice.integration.documentserver.models.enums.Type;
 import lombok.Builder;
 import lombok.Getter;
@@ -33,7 +32,7 @@ public class DefaultFileWrapper {
     private String fileName;
     private Type type;
     private User user;
-    private Language lang;
+    private String lang;
     private Action action;
     private String actionData;
     private Boolean canEdit;

web/documentserver-example/java-spring/src/main/resources/templates/index.html

@@ -318,8 +318,19 @@
     <script type="text/javascript" src="scripts/jscript.js"></script>
     <script type="text/javascript" src="scripts/converter.js"></script>
     <script type="text/javascript">
-        document.addEventListener('DOMContentLoaded', function(){
-	        document.getElementById("language").value="en";
+        document.addEventListener('DOMContentLoaded', function() {
+            var lang = document.cookie
+                    .split('; ')
+                    .find((row) => row.startsWith('ulang='))
+                    ?.split('=')[1];
+
+            var languages = Array.from(document.getElementById("language").options).map(e => e.value)
+
+            if (!languages.includes(lang)) {
+                lang = "en";
+            }
+
+            document.getElementById("language").value=lang;
         });
     </script>
 </body>

web/documentserver-example/java/src/main/webapp/index.jsp

@@ -349,8 +349,19 @@
             var UrlConverter = "IndexServlet?type=convert";
             var UrlEditor = "EditorServlet";
 
-            document.addEventListener('DOMContentLoaded', function(){
-                document.getElementById("language").value="en";
+            document.addEventListener('DOMContentLoaded', function() {
+                var lang = document.cookie
+                        .split('; ')
+                        .find((row) => row.startsWith('ulang='))
+                        ?.split('=')[1];
+
+                var languages = Array.from(document.getElementById("language").options).map(e => e.value)
+
+                if (!languages.includes(lang)) {
+                    lang = "en";
+                }
+
+                document.getElementById("language").value=lang;
             });
         </script>
     </body>

web/documentserver-example/python/readme.md

@@ -35,7 +35,7 @@ See the detailed guide to learn how to install Document Server [for Windows](htt
     ```
     pip install Django==3.1.3
     pip install requests==2.25.0
-    pip install pyjwt==2.3.0
+    pip install pyjwt==2.6.0
     pip install python-magic
     ```
 

web/documentserver-example/ruby/Gemfile.lock

@@ -88,6 +88,7 @@ GEM
     digest (3.1.0)
     erubi (1.11.0)
     execjs (2.8.1)
+    ffi (1.15.5)
     ffi (1.15.5-x64-mingw-ucrt)
     globalid (1.0.0)
       activesupport (>= 5.0)
@@ -127,7 +128,9 @@ GEM
       net-protocol
       timeout
     nio4r (2.5.8)
-    nokogiri (1.13.8-x64-mingw-ucrt)
+    nokogiri (1.13.9-x64-mingw-ucrt)
+      racc (~> 1.4)
+    nokogiri (1.13.9-x86_64-linux)
       racc (~> 1.4)
     psych (4.0.5)
       stringio
@@ -216,6 +219,7 @@ GEM
 
 PLATFORMS
   x64-mingw-ucrt
+  x86_64-linux
 
 DEPENDENCIES
   byebug