Merge pull request #623 from ONLYOFFICE/develop

Release/7.3.4

CHANGELOG.md

@@ -1,5 +1,13 @@
 # Change Log
 
+## 7.3.4
+## Added
+- Turkish and Galician empty file templates
+
+## Changed
+- Nextcloud v21 is no longer supported
+- compatible with Nextcloud 24
+
 ## 7.3.2
 ## Changed
 - Nextcloud v20 is no longer supported

appinfo/info.xml

@@ -6,7 +6,7 @@
     <description>ONLYOFFICE connector allows you to view, edit and collaborate on text documents, spreadsheets and presentations within Nextcloud using ONLYOFFICE Docs. This will create a new Edit in ONLYOFFICE action within the document library for Office documents. This allows multiple users to co-author documents in real time from the familiar web interface and save the changes back to your file storage.</description>
     <licence>apache</licence>
     <author mail="[email protected]" homepage="https://www.onlyoffice.com/">Ascensio System SIA</author>
-    <version>7.3.2</version>
+    <version>7.3.4</version>
     <namespace>Onlyoffice</namespace>
     <types>
         <prevent_group_restriction/>
@@ -29,7 +29,7 @@
     <screenshot>https://raw.githubusercontent.com/ONLYOFFICE/onlyoffice-nextcloud/master/screenshots/new.png</screenshot>
     <screenshot>https://raw.githubusercontent.com/ONLYOFFICE/onlyoffice-nextcloud/master/screenshots/open.png</screenshot>
     <dependencies>
-        <nextcloud min-version="21" max-version="23"/>
+        <nextcloud min-version="22" max-version="24"/>
     </dependencies>
     <settings>
         <admin>OCA\Onlyoffice\AdminSettings</admin>
@@ -38,9 +38,4 @@
     <commands>
         <command>OCA\Onlyoffice\Command\DocumentServer</command>
     </commands>
-    <repair-steps>
-        <post-migration>
-            <step>OCA\Onlyoffice\Migration\MimeRepair</step>
-        </post-migration>
-    </repair-steps>
 </info>

controller/editorapicontroller.php

@@ -310,7 +310,15 @@ public function config($fileId, $filePath = null, $shareToken = null, $directTok
             try {
                 $lockService = \OC::$server->get(LockService::class);
                 $lock = $lockService->getLockFromFileId($file->getId());
-                $lockOwner = $lock->getUserId();
+
+                $lockOwner = null;
+                if (method_exists($lock, "getUserId")) {
+                    $lockOwner = $lock->getUserId();
+                }
+                else if(method_exists($lock, "getOwner")) {
+                    $lockOwner = $lock->getOwner();
+                }
+
                 if ($userId !== $lockOwner) {
                     $isTempLock = true;
                     $this->logger->debug("File" . $file->getId() . "is locked by $lockOwner", ["app" => $this->appName]);

l10n/bg.js

@@ -108,7 +108,7 @@ OC.L10N.register(
     "Failed to send notification": "Неуспешно изпращане на известие",
     "Notification sent successfully": "Успешно изпратено известие",
     "%1\$s mentioned in the %2\$s: \"%3\$s\".": "%1\$s, споменат във %2\$s: \"%3\$s\".",
-    "{notifier} mentioned in the {file}: \"%1\$s\".": "{notifier} споменат във {file}: \"%1\$s\".",
+    "{notifier} mentioned in the {file}: \"%1\$s\".": "{notifier} Ви спомена във {file}: \"%1\$s\".",
     "Choose a format to convert {fileName}": "Изберете формат за конвертиране {fileName}",
     "New form template": "Нов шаблон на формуляр",
     "Blank": "Празно",

l10n/de.js

@@ -108,7 +108,7 @@ OC.L10N.register(
     "Failed to send notification": "Fehler beim Senden einer Benachrichtigung",
     "Notification sent successfully": "Benachrichtigung erfolgreich gesendet",
     "%1\$s mentioned in the %2\$s: \"%3\$s\".": "%1\$s hat in %2\$s erwähnt: \"%3\$s\".",
-    "{notifier} mentioned in the {file}: \"%1\$s\".": "{notifier} hat in {file} erwähnt: \"%1\$s\".",
+    "{notifier} mentioned in the {file}: \"%1\$s\".": "{notifier} hat dich in {file} erwähnt: \"%1\$s\".",
     "Choose a format to convert {fileName}": "Wählen Sie das Format für {fileName} aus",
     "New form template": "Neue Formularvorlage",
     "Blank": "Leer",

l10n/de.json

@@ -106,7 +106,7 @@
     "Failed to send notification": "Fehler beim Senden einer Benachrichtigung",
     "Notification sent successfully": "Benachrichtigung erfolgreich gesendet",
     "%1$s mentioned in the %2$s: \"%3$s\".": "%1$s hat in %2$s erwähnt: \"%3$s\".",
-    "{notifier} mentioned in the {file}: \"%1$s\".": "{notifier} hat in {file} erwähnt: \"%1$s\".",
+    "{notifier} mentioned in the {file}: \"%1$s\".": "{notifier} hat dich in {file} erwähnt: \"%1$s\".",
     "Choose a format to convert {fileName}": "Wählen Sie das Format für {fileName} aus",
     "New form template": "Neue Formularvorlage",
     "Blank": "Leer",

l10n/de_DE.js

@@ -108,7 +108,7 @@ OC.L10N.register(
     "Failed to send notification": "Fehler beim Senden einer Benachrichtigung",
     "Notification sent successfully": "Benachrichtigung erfolgreich gesendet",
     "%1\$s mentioned in the %2\$s: \"%3\$s\".": "%1\$s hat in %2\$s erwähnt: \"%3\$s\".",
-    "{notifier} mentioned in the {file}: \"%1\$s\".": "{notifier} hat in {file} erwähnt: \"%1\$s\".",
+    "{notifier} mentioned in the {file}: \"%1\$s\".": "{notifier} hat dich in {file} erwähnt: \"%1\$s\".",
     "Choose a format to convert {fileName}": "Wählen Sie das Format für {fileName} aus",
     "New form template": "Neue Formularvorlage",
     "Blank": "Leer",

l10n/de_DE.json

@@ -106,7 +106,7 @@
     "Failed to send notification": "Fehler beim Senden einer Benachrichtigung",
     "Notification sent successfully": "Benachrichtigung erfolgreich gesendet",
     "%1$s mentioned in the %2$s: \"%3$s\".": "%1$s hat in %2$s erwähnt: \"%3$s\".",
-    "{notifier} mentioned in the {file}: \"%1$s\".": "{notifier} hat in {file} erwähnt: \"%1$s\".",
+    "{notifier} mentioned in the {file}: \"%1$s\".": "{notifier} hat dich in {file} erwähnt: \"%1$s\".",
     "Choose a format to convert {fileName}": "Wählen Sie das Format für {fileName} aus",
     "New form template": "Neue Formularvorlage",
     "Blank": "Leer",

l10n/es.js

@@ -108,7 +108,7 @@ OC.L10N.register(
     "Failed to send notification": "Error al enviar la notificación",
     "Notification sent successfully": "Notificación enviada correctamente",
     "%1\$s mentioned in the %2\$s: \"%3\$s\".": "%1\$s ha mencionado en %2\$s: \"%3\$s\".",
-    "{notifier} mentioned in the {file}: \"%1\$s\".": "{notifier} ha mencionado en {file}: \"%1\$s\".",
+    "{notifier} mentioned in the {file}: \"%1\$s\".": "{notifier} le ha mencionado en {file}: \"%1\$s\".",
     "Choose a format to convert {fileName}": "Elija un formato para convertir {fileName}",
     "New form template": "Nueva plantilla de formulario",
     "Blank": "En blanco",

l10n/es.json

@@ -106,7 +106,7 @@
     "Failed to send notification": "Error al enviar la notificación",
     "Notification sent successfully": "Notificación enviada correctamente",
     "%1$s mentioned in the %2$s: \"%3$s\".": "%1$s ha mencionado en %2$s: \"%3$s\".",
-    "{notifier} mentioned in the {file}: \"%1$s\".": "{notifier} ha mencionado en {file}: \"%1$s\".",
+    "{notifier} mentioned in the {file}: \"%1$s\".": "{notifier} le ha mencionado en {file}: \"%1$s\".",
     "Choose a format to convert {fileName}": "Elija un formato para convertir {fileName}",
     "New form template": "Nueva plantilla de formulario",
     "Blank": "En blanco",

l10n/fr.js

@@ -108,7 +108,7 @@ OC.L10N.register(
     "Failed to send notification": "Échec de l’envoi de la notification",
     "Notification sent successfully": "Notification a été envoyée avec succès",
     "%1\$s mentioned in the %2\$s: \"%3\$s\".": "%1\$s a mentionné dans %2\$s: \"%3\$s\".",
-    "{notifier} mentioned in the {file}: \"%1\$s\".": "{notifier}  a mentionné dans {file}: \"%1\$s\".",
+    "{notifier} mentioned in the {file}: \"%1\$s\".": "{notifier} vous a mentionné dans {file}: \"%1\$s\".",
     "Choose a format to convert {fileName}": "Choisissez un format à convertir {fileName}",
     "New form template": "Nouveau modèle de formulaire",
     "Blank": "Vide",

l10n/fr.json

@@ -106,7 +106,7 @@
     "Failed to send notification": "Échec de l’envoi de la notification",
     "Notification sent successfully": "Notification a été envoyée avec succès",
     "%1$s mentioned in the %2$s: \"%3$s\".": "%1$s a mentionné dans %2$s: \"%3$s\".",
-    "{notifier} mentioned in the {file}: \"%1$s\".": "{notifier}  a mentionné dans {file}: \"%1$s\".",
+    "{notifier} mentioned in the {file}: \"%1$s\".": "{notifier} vous a mentionné dans {file}: \"%1$s\".",
     "Choose a format to convert {fileName}": "Choisissez un format à convertir {fileName}",
     "New form template": "Nouveau modèle de formulaire",
     "Blank": "Vide",

l10n/it.js

@@ -108,7 +108,7 @@ OC.L10N.register(
     "Failed to send notification": "Invio di notifica non riuscito",
     "Notification sent successfully": "Notifica è stata inviata con successo",
     "%1\$s mentioned in the %2\$s: \"%3\$s\".": "%1\$s ha menzionato in %2\$s: \"%3\$s\".",
-    "{notifier} mentioned in the {file}: \"%1\$s\".": "{notifier} ha menzionato nel {file}: \"%1\$s\".",
+    "{notifier} mentioned in the {file}: \"%1\$s\".": "{notifier} ti ha menzionato nel {file}: \"%1\$s\".",
     "Choose a format to convert {fileName}": "Scegli un formato per convertire {fileName}",
     "New form template": "Nuovo modello di modulo",
     "Blank": "Vuoto",

l10n/it.json

@@ -106,7 +106,7 @@
     "Failed to send notification": "Invio di notifica non riuscito",
     "Notification sent successfully": "Notifica è stata inviata con successo",
     "%1$s mentioned in the %2$s: \"%3$s\".": "%1$s ha menzionato in %2$s: \"%3$s\".",
-    "{notifier} mentioned in the {file}: \"%1$s\".": "{notifier} ha menzionato nel {file}: \"%1$s\".",
+    "{notifier} mentioned in the {file}: \"%1$s\".": "{notifier} ti ha menzionato nel {file}: \"%1$s\".",
     "Choose a format to convert {fileName}": "Scegli un formato per convertire {fileName}",
     "New form template": "Nuovo modello di modulo",
     "Blank": "Vuoto",

l10n/ja.js

@@ -108,7 +108,7 @@ OC.L10N.register(
     "Failed to send notification": "通知を送信できませんでした",
     "Notification sent successfully": "通知を送信しました",
     "%1\$s mentioned in the %2\$s: \"%3\$s\".": "%1\$s は %2\$s: \"%3\$s\"に記載されました。",
-    "{notifier} mentioned in the {file}: \"%1\$s\".": "{notifier} は {file}: \"%1\$s\"に記載しました。",
+    "{notifier} mentioned in the {file}: \"%1\$s\".": "{notifier} は あなたを {file}: \"%1\$s\"に記載しました。",
     "Choose a format to convert {fileName}": "{fileName}を変換する形式を選択してください",
     "New form template": "新しいフォームテンプレート",
     "Blank": "空白",

l10n/ja.json

@@ -106,7 +106,7 @@
     "Failed to send notification": "通知を送信できませんでした",
     "Notification sent successfully": "通知を送信しました",
     "%1$s mentioned in the %2$s: \"%3$s\".": "%1$s は %2$s: \"%3$s\"に記載されました。",
-    "{notifier} mentioned in the {file}: \"%1$s\".": "{notifier} は {file}: \"%1$s\"に記載しました。",
+    "{notifier} mentioned in the {file}: \"%1$s\".": "{notifier} は あなたを {file}: \"%1$s\"に記載しました。",
     "Choose a format to convert {fileName}": "{fileName}を変換する形式を選択してください",
     "New form template": "新しいフォームテンプレート",
     "Blank": "空白",

l10n/pl.js

@@ -108,7 +108,7 @@ OC.L10N.register(
     "Failed to send notification": "Nie udało się wysłać powiadomienia",
     "Notification sent successfully": "Powiadomienie zostało wysłane",
     "%1\$s mentioned in the %2\$s: \"%3\$s\".": "%1\$s dodał(a) w %2\$s następujący komentarz: \"%3\$s\".",
-    "{notifier} mentioned in the {file}: \"%1\$s\".": "{notifier} dodał(a) w {file} następujący komentarz: \"%1\$s\".",
+    "{notifier} mentioned in the {file}: \"%1\$s\".": "{notifier} dodał(a) Cię w {file} następujący komentarz: \"%1\$s\".",
     "Choose a format to convert {fileName}": "Wybierz format, do którego chcesz przekonwertować {fileName}",
     "New form template": "Nowy szablon formularza",
     "Blank": "Pusty",

l10n/pl.json

@@ -106,7 +106,7 @@
     "Failed to send notification": "Nie udało się wysłać powiadomienia",
     "Notification sent successfully": "Powiadomienie zostało wysłane",
     "%1$s mentioned in the %2$s: \"%3$s\".": "%1$s dodał(a) w %2$s następujący komentarz: \"%3$s\".",
-    "{notifier} mentioned in the {file}: \"%1$s\".": "{notifier} dodał(a) w {file} następujący komentarz: \"%1$s\".",
+    "{notifier} mentioned in the {file}: \"%1$s\".": "{notifier} dodał(a) Cię w {file} następujący komentarz: \"%1$s\".",
     "Choose a format to convert {fileName}": "Wybierz format, do którego chcesz przekonwertować {fileName}",
     "New form template": "Nowy szablon formularza",
     "Blank": "Pusty",

l10n/pt_BR.js

@@ -108,7 +108,7 @@ OC.L10N.register(
     "Failed to send notification": "Falha ao enviar notificação",
     "Notification sent successfully": "Notificação enviada com sucesso",
     "%1\$s mentioned in the %2\$s: \"%3\$s\".": "%1\$s mencionado em %2\$s: \"%3\$s\".",
-    "{notifier} mentioned in the {file}: \"%1\$s\".": "{notifier}  mencionado em {file}: \"%1\$s\".",
+    "{notifier} mentioned in the {file}: \"%1\$s\".": "{notifier} mencionado você em {file}: \"%1\$s\".",
     "Choose a format to convert {fileName}": "Escolha um formato para converter {fileName}",
     "New form template": "Novo modelo de formulário",
     "Blank": "Em branco",

l10n/pt_BR.json

@@ -106,7 +106,7 @@
     "Failed to send notification": "Falha ao enviar notificação",
     "Notification sent successfully": "Notificação enviada com sucesso",
     "%1$s mentioned in the %2$s: \"%3$s\".": "%1$s mencionado em %2$s: \"%3$s\".",
-    "{notifier} mentioned in the {file}: \"%1$s\".": "{notifier}  mencionado em {file}: \"%1$s\".",
+    "{notifier} mentioned in the {file}: \"%1$s\".": "{notifier} mencionado você em {file}: \"%1$s\".",
     "Choose a format to convert {fileName}": "Escolha um formato para converter {fileName}",
     "New form template": "Novo modelo de formulário",
     "Blank": "Em branco",

l10n/ru.js

@@ -108,7 +108,7 @@ OC.L10N.register(
     "Failed to send notification": "Ошибка отправки оповещения",
     "Notification sent successfully": "Оповещение успешно отправлено",
     "%1\$s mentioned in the %2\$s: \"%3\$s\".": "%1\$s упомянул в %2\$s: \"%3\$s\".",
-    "{notifier} mentioned in the {file}: \"%1\$s\".": "{notifier} упомянул в {file}: \"%1\$s\".",
+    "{notifier} mentioned in the {file}: \"%1\$s\".": "{notifier} упомянул вас в {file}: \"%1\$s\".",
     "Choose a format to convert {fileName}": "Выберите формат для {fileName}",
     "New form template": "Новый шаблон формы",
     "Blank": "Пустой",

l10n/ru.json

@@ -106,7 +106,7 @@
     "Failed to send notification": "Ошибка отправки оповещения",
     "Notification sent successfully": "Оповещение успешно отправлено",
     "%1$s mentioned in the %2$s: \"%3$s\".": "%1$s упомянул в %2$s: \"%3$s\".",
-    "{notifier} mentioned in the {file}: \"%1$s\".": "{notifier} упомянул в {file}: \"%1$s\".",
+    "{notifier} mentioned in the {file}: \"%1$s\".": "{notifier} упомянул вас в {file}: \"%1$s\".",
     "Choose a format to convert {fileName}": "Выберите формат для {fileName}",
     "New form template": "Новый шаблон формы",
     "Blank": "Пустой",

l10n/sv.js

@@ -108,7 +108,7 @@ OC.L10N.register(
     "Failed to send notification": "Det gick inte att skicka aviseringen",
     "Notification sent successfully": "Aviseringen har skickats",
     "%1\$s mentioned in the %2\$s: \"%3\$s\".": "%1\$s har nämnt i %2\$s: \"%3\$s\".",
-    "{notifier} mentioned in the {file}: \"%1\$s\".": "{notifier} har nämnt i {file}: \"%1\$s\".",
+    "{notifier} mentioned in the {file}: \"%1\$s\".": "{notifier} nämnde dig i {file}: \"%1\$s\".",
     "Choose a format to convert {fileName}": "Välj det filformat som {fileName} ska konverteras till.",
     "New form template": "Ny formulärmall",
     "Blank": "Töm",

l10n/sv.json

@@ -106,7 +106,7 @@
     "Failed to send notification": "Det gick inte att skicka aviseringen",
     "Notification sent successfully": "Aviseringen har skickats",
     "%1$s mentioned in the %2$s: \"%3$s\".": "%1$s har nämnt i %2$s: \"%3$s\".",
-    "{notifier} mentioned in the {file}: \"%1$s\".": "{notifier} har nämnt i {file}: \"%1$s\".",
+    "{notifier} mentioned in the {file}: \"%1$s\".": "{notifier} nämnde dig i {file}: \"%1$s\".",
     "Choose a format to convert {fileName}": "Välj det filformat som {fileName} ska konverteras till.",
         "New form template": "Ny formulärmall",
     "Blank": "Töm",

l10n/zh_CN.js

@@ -108,7 +108,7 @@ OC.L10N.register(
     "Failed to send notification": "发送通知失败",
     "Notification sent successfully": "通知发送成功",
     "%1\$s mentioned in the %2\$s: \"%3\$s\".": "%1\$s 提到 %2\$s: \"%3\$s\".",
-    "{notifier} mentioned in the {file}: \"%1\$s\".": "{notifier} 提到 {file}: \"%1\$s\".",
+    "{notifier} mentioned in the {file}: \"%1\$s\".": "{notifier} 在 {file}: \"%1\$s\"中提到了您.",
     "Choose a format to convert {fileName}": "选择要转换{fileName}的格式",
     "New form template": "新表单模板",
     "Blank": "空白",

l10n/zh_CN.json

@@ -106,7 +106,7 @@
     "Failed to send notification": "发送通知失败",
     "Notification sent successfully": "通知发送成功",
     "%1$s mentioned in the %2$s: \"%3$s\".": "%1$s 提到 %2$s: \"%3$s\".",
-    "{notifier} mentioned in the {file}: \"%1$s\".": "{notifier} 提到 {file}: \"%1$s\".",
+    "{notifier} mentioned in the {file}: \"%1$s\".": "{notifier} 在 {file}: \"%1$s\"中提到了您.",
     "Choose a format to convert {fileName}": "选择要转换{fileName}的格式",
     "New form template": "新表单模板",
     "Blank": "空白",