From cf06f671bbed9c2ac2f1a687d0a1ec586ec16900 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Wed, 17 Nov 2021 10:19:49 +0100 Subject: [PATCH 01/24] Do not load the full file content into memory MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- controller/callbackcontroller.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/controller/callbackcontroller.php b/controller/callbackcontroller.php index 63aab6d8..6b5023ad 100644 --- a/controller/callbackcontroller.php +++ b/controller/callbackcontroller.php @@ -23,6 +23,7 @@ use OCP\AppFramework\Http; use OCP\AppFramework\Http\DataDownloadResponse; use OCP\AppFramework\Http\JSONResponse; +use OCP\AppFramework\Http\StreamResponse; use OCP\AppFramework\QueryException; use OCP\Files\File; use OCP\Files\Folder; @@ -177,7 +178,7 @@ public function __construct($AppName, * * @param string $doc - verification token with the file identifier * - * @return DataDownloadResponse|JSONResponse + * @return StreamResponse|JSONResponse * * @NoAdminRequired * @NoCSRFRequired @@ -294,7 +295,10 @@ public function download($doc) { } try { - return new DataDownloadResponse($file->getContent(), $file->getName(), $file->getMimeType()); + $response = new StreamResponse($file->fopen('rb')); + $response->addHeader('Content-Disposition', 'attachment; filename="' . rawurldecode($file->getName()) . '"'); + $response->addHeader('Content-Type', $file->getMimeType()); + return $response; } catch (NotPermittedException $e) { $this->logger->logException($e, ["message" => "Download Not permitted: $fileId ($version)", "app" => $this->appName]); return new JSONResponse(["message" => $this->trans->t("Not permitted")], Http::STATUS_FORBIDDEN); From d1f454053f575d9bf527637e2f7c7ceae77366e7 Mon Sep 17 00:00:00 2001 From: Sergey Linnik Date: Sun, 5 Dec 2021 13:54:33 +0300 Subject: [PATCH 02/24] nc 20 is not supported --- CHANGELOG.md | 3 +++ appinfo/info.xml | 2 +- 2 files changed, 4 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ea137571..6e75a247 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Change Log +## Changed +- Nextcloud v20 is no longer supported + ## 7.2.1 ## Added - check document server version diff --git a/appinfo/info.xml b/appinfo/info.xml index fbbda0df..31d2cc86 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -29,7 +29,7 @@ https://raw.githubusercontent.com/ONLYOFFICE/onlyoffice-nextcloud/master/screenshots/new.png https://raw.githubusercontent.com/ONLYOFFICE/onlyoffice-nextcloud/master/screenshots/open.png - + OCA\Onlyoffice\AdminSettings From 1fa1c3385e5964e78156669865977aa8119de71c Mon Sep 17 00:00:00 2001 From: Antipkin-A Date: Mon, 6 Dec 2021 20:03:30 +0300 Subject: [PATCH 03/24] don't support file create when nc < 21 --- js/main.js | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/js/main.js b/js/main.js index 027b61e8..565d96cb 100644 --- a/js/main.js +++ b/js/main.js @@ -466,8 +466,7 @@ OCA.Onlyoffice.GetSettings(initSharedButton); } else { - if ($("#isPublic").val() === "1" && !!$("#filestable").length - || OC.config.version.split(".")[0] < 21) { + if ($("#isPublic").val() === "1" && !!$("#filestable").length) { //folder by shared link OC.Plugins.register("OCA.Files.NewFileMenu", OCA.Onlyoffice.NewFileMenu); } From 773d860e8d41b35c4a0936e9761619e01b61a132 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Mon, 13 Dec 2021 13:11:24 +0100 Subject: [PATCH 04/24] Use proper methods to fetch language/locale code --- controller/editorapicontroller.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/controller/editorapicontroller.php b/controller/editorapicontroller.php index e7c25ae7..e3b5b407 100644 --- a/controller/editorapicontroller.php +++ b/controller/editorapicontroller.php @@ -294,8 +294,8 @@ public function config($fileId, $filePath = null, $shareToken = null, $directTok ], "documentType" => $format["type"], "editorConfig" => [ - "lang" => str_replace("_", "-", \OC::$server->getL10NFactory("")->get("")->getLanguageCode()), - "region" => str_replace("_", "-", \OC::$server->getL10NFactory("")->findLocale()) + "lang" => str_replace("_", "-", \OC::$server->getL10NFactory()->get("onlyoffice")->getLanguageCode()), + "region" => str_replace("_", "-", \OC::$server->getL10NFactory()->get("onlyoffice")->getLocaleCode()) ] ]; @@ -813,4 +813,4 @@ private function isFavorite($fileId, $userId = null) { return false; } -} \ No newline at end of file +} From 8038cfa5dfd529c66cd70a06fdbe8368567bf849 Mon Sep 17 00:00:00 2001 From: Antipkin-A Date: Wed, 15 Dec 2021 18:35:42 +0300 Subject: [PATCH 05/24] fixed link in push notification --- lib/notifier.php | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/lib/notifier.php b/lib/notifier.php index 1b52fe32..530f727c 100644 --- a/lib/notifier.php +++ b/lib/notifier.php @@ -125,6 +125,11 @@ public function prepare(INotification $notification, string $languageCode): INot $notifierName = $notifier->getDisplayName(); $trans = $this->l10nFactory->get($this->appName, $languageCode); + $editorLink = $this->urlGenerator->linkToRouteAbsolute($this->appName . ".editor.index", [ + "fileId" => $fileId, + "anchor" => $anchor + ]); + $notification->setIcon($this->urlGenerator->getAbsoluteURL($this->urlGenerator->imagePath($this->appName, "app-dark.svg"))) ->setParsedSubject($trans->t("%1\$s mentioned in the %2\$s: \"%3\$s\".", [$notifierName, $fileName, $notification->getObjectId()])) ->setRichSubject($trans->t("{notifier} mentioned in the {file}: \"%1\$s\".", [$notification->getObjectId()]), [ @@ -136,17 +141,11 @@ public function prepare(INotification $notification, string $languageCode): INot "file" => [ "type" => "highlight", "id" => $fileId, - "name" => $fileName + "name" => $fileName, + "link" => $editorLink ] ]); - $editorLink = $this->urlGenerator->linkToRouteAbsolute($this->appName . ".editor.index", [ - "fileId" => $fileId, - "anchor" => $anchor - ]); - - $notification->setLink($editorLink); - return $notification; } } \ No newline at end of file From 39b543e7ae62d51a2775821a5551e053ecb7d7ac Mon Sep 17 00:00:00 2001 From: Pierre Ozoux Date: Wed, 15 Dec 2021 18:10:48 +0100 Subject: [PATCH 06/24] Changes french translation The idea of the change is to have a coherent wording between libreofficeonline app and onlyoffice. --- l10n/fr.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/l10n/fr.js b/l10n/fr.js index 7536c5e3..fb9ff0a9 100644 --- a/l10n/fr.js +++ b/l10n/fr.js @@ -24,9 +24,9 @@ OC.L10N.register( "File created" : "Fichier créé", "Open in ONLYOFFICE" : "Ouvrir dans ONLYOFFICE", "Convert with ONLYOFFICE" : "Convertir avec ONLYOFFICE", - "Document" : "Document", - "Spreadsheet" : "Feuille de calcul", - "Presentation" : "Présentation", + "Document" : "Nouveau document", + "Spreadsheet" : "Nouvelle feuille de calcul", + "Presentation" : "Nouvelle présentation", "Error when trying to connect" : "Erreur durant la tentative de connexion", "Settings have been successfully updated" : "Les paramètres ont été mis à jour avec succès", "Server can't read xml" : "Le serveur ne peut pas lire le XML", From dc93b55def8f67c817c4e6a72109d7100a716fcd Mon Sep 17 00:00:00 2001 From: Pierre Ozoux Date: Wed, 15 Dec 2021 18:12:10 +0100 Subject: [PATCH 07/24] Updates french translation. --- l10n/fr.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/l10n/fr.json b/l10n/fr.json index f25d3621..af5eeaf8 100644 --- a/l10n/fr.json +++ b/l10n/fr.json @@ -22,9 +22,9 @@ "File created" : "Fichier créé", "Open in ONLYOFFICE" : "Ouvrir dans ONLYOFFICE", "Convert with ONLYOFFICE" : "Convertir avec ONLYOFFICE", - "Document" : "Document", - "Spreadsheet" : "Feuille de calcul", - "Presentation" : "Présentation", + "Document" : "Nouveau document", + "Spreadsheet" : "Nouvelle feuille de calcul", + "Presentation" : "Nouvelle présentation", "Error when trying to connect" : "Erreur durant la tentative de connexion", "Settings have been successfully updated" : "Les paramètres ont été mis à jour avec succès", "Server can't read xml" : "Le serveur ne peut pas lire le XML", From d7bf7ad074f369eb329ef80c9c74c6dc7d0dcbbe Mon Sep 17 00:00:00 2001 From: Antipkin-A Date: Thu, 16 Dec 2021 12:01:53 +0300 Subject: [PATCH 08/24] remove share token from history --- controller/editorcontroller.php | 31 ++++++++++++++----------------- js/editor.js | 9 +++------ 2 files changed, 17 insertions(+), 23 deletions(-) diff --git a/controller/editorcontroller.php b/controller/editorcontroller.php index 1bb8c870..d48fbeef 100644 --- a/controller/editorcontroller.php +++ b/controller/editorcontroller.php @@ -671,16 +671,15 @@ public function save($name, $dir, $url) { * Get versions history for file * * @param integer $fileId - file identifier - * @param string $shareToken - access token * * @return array * * @NoAdminRequired */ - public function history($fileId, $shareToken = null) { + public function history($fileId) { $this->logger->debug("Request history for: $fileId", ["app" => $this->appName]); - if (empty($shareToken) && !$this->config->isUserAllowedToUse()) { + if (!$this->config->isUserAllowedToUse()) { return ["error" => $this->trans->t("Not permitted")]; } @@ -692,7 +691,7 @@ public function history($fileId, $shareToken = null) { $userId = $user->getUID(); } - list ($file, $error, $share) = empty($shareToken) ? $this->getFile($userId, $fileId) : $this->fileUtility->getFileByToken($fileId, $shareToken); + list ($file, $error, $share) = $this->getFile($userId, $fileId); if (isset($error)) { $this->logger->error("History: $fileId $error", ["app" => $this->appName]); @@ -791,16 +790,15 @@ public function history($fileId, $shareToken = null) { * * @param integer $fileId - file identifier * @param integer $version - file version - * @param string $shareToken - access token * * @return array * * @NoAdminRequired */ - public function version($fileId, $version, $shareToken = null) { + public function version($fileId, $version) { $this->logger->debug("Request version for: $fileId ($version)", ["app" => $this->appName]); - if (empty($shareToken) && !$this->config->isUserAllowedToUse()) { + if (!$this->config->isUserAllowedToUse()) { return ["error" => $this->trans->t("Not permitted")]; } @@ -812,7 +810,7 @@ public function version($fileId, $version, $shareToken = null) { $userId = $user->getUID(); } - list ($file, $error, $share) = empty($shareToken) ? $this->getFile($userId, $fileId) : $this->fileUtility->getFileByToken($fileId, $shareToken); + list ($file, $error, $share) = $this->getFile($userId, $fileId); if (isset($error)) { $this->logger->error("History: $fileId $error", ["app" => $this->appName]); @@ -841,14 +839,14 @@ public function version($fileId, $version, $shareToken = null) { $key = $this->fileUtility->getKey($file, true); $versionId = $file->getFileInfo()->getMtime(); - $fileUrl = $this->getUrl($file, $user, $shareToken); + $fileUrl = $this->getUrl($file, $user); } else { $fileVersion = array_values($versions)[$version - 1]; $key = $this->fileUtility->getVersionKey($fileVersion); $versionId = $fileVersion->getRevisionId(); - $fileUrl = $this->getUrl($file, $user, $shareToken, $version); + $fileUrl = $this->getUrl($file, $user, null, $version); } $key = DocumentService::GenerateRevisionId($key); @@ -862,14 +860,14 @@ public function version($fileId, $version, $shareToken = null) { && count($versions) >= $version - 1 && FileVersions::hasChanges($ownerId, $fileId, $versionId)) { - $changesUrl = $this->getUrl($file, $user, $shareToken, $version, true); + $changesUrl = $this->getUrl($file, $user, null, $version, true); $result["changesUrl"] = $changesUrl; $prevVersion = array_values($versions)[$version - 2]; $prevVersionKey = $this->fileUtility->getVersionKey($prevVersion); $prevVersionKey = DocumentService::GenerateRevisionId($prevVersionKey); - $prevVersionUrl = $this->getUrl($file, $user, $shareToken, $version - 1); + $prevVersionUrl = $this->getUrl($file, $user, null, $version - 1); $result["previous"] = [ "key" => $prevVersionKey, @@ -890,17 +888,16 @@ public function version($fileId, $version, $shareToken = null) { * * @param integer $fileId - file identifier * @param integer $version - file version - * @param string $shareToken - access token * * @return array * * @NoAdminRequired * @PublicPage */ - public function restore($fileId, $version, $shareToken = null) { + public function restore($fileId, $version) { $this->logger->debug("Request restore version for: $fileId ($version)", ["app" => $this->appName]); - if (empty($shareToken) && !$this->config->isUserAllowedToUse()) { + if (!$this->config->isUserAllowedToUse()) { return ["error" => $this->trans->t("Not permitted")]; } @@ -912,7 +909,7 @@ public function restore($fileId, $version, $shareToken = null) { $userId = $user->getUID(); } - list ($file, $error, $share) = empty($shareToken) ? $this->getFile($userId, $fileId) : $this->fileUtility->getFileByToken($fileId, $shareToken); + list ($file, $error, $share) = $this->getFile($userId, $fileId); if (isset($error)) { $this->logger->error("Restore: $fileId $error", ["app" => $this->appName]); @@ -937,7 +934,7 @@ public function restore($fileId, $version, $shareToken = null) { } } - return $this->history($fileId, $shareToken); + return $this->history($fileId); } /** diff --git a/js/editor.js b/js/editor.js index dcfe7483..8ef6dfb7 100644 --- a/js/editor.js +++ b/js/editor.js @@ -201,10 +201,9 @@ }; OCA.Onlyoffice.onRequestHistory = function (version) { - $.get(OC.generateUrl("apps/" + OCA.Onlyoffice.AppName + "/ajax/history?fileId={fileId}&shareToken={shareToken}", + $.get(OC.generateUrl("apps/" + OCA.Onlyoffice.AppName + "/ajax/history?fileId={fileId}", { fileId: OCA.Onlyoffice.fileId || 0, - shareToken: OCA.Onlyoffice.shareToken || "", }), function onSuccess(response) { OCA.Onlyoffice.refreshHistory(response, version); @@ -214,11 +213,10 @@ OCA.Onlyoffice.onRequestHistoryData = function (event) { var version = event.data; - $.get(OC.generateUrl("apps/" + OCA.Onlyoffice.AppName + "/ajax/version?fileId={fileId}&version={version}&shareToken={shareToken}", + $.get(OC.generateUrl("apps/" + OCA.Onlyoffice.AppName + "/ajax/version?fileId={fileId}&version={version}", { fileId: OCA.Onlyoffice.fileId || 0, version: version, - shareToken: OCA.Onlyoffice.shareToken || "", }), function onSuccess(response) { if (response.error) { @@ -236,11 +234,10 @@ $.ajax({ method: "PUT", - url: OC.generateUrl("apps/" + OCA.Onlyoffice.AppName + "/ajax/restore?fileId={fileId}&version={version}&shareToken={shareToken}", + url: OC.generateUrl("apps/" + OCA.Onlyoffice.AppName + "/ajax/restore?fileId={fileId}&version={version}", { fileId: OCA.Onlyoffice.fileId || 0, version: version, - shareToken: OCA.Onlyoffice.shareToken || "", }), success: function onSuccess(response) { OCA.Onlyoffice.refreshHistory(response, version); From fade67674cbeb4ecb57ac25bc30b9f67155fe79d Mon Sep 17 00:00:00 2001 From: Antipkin-A Date: Mon, 27 Dec 2021 18:01:26 +0300 Subject: [PATCH 09/24] format plural of languages --- l10n/bg.js | 2 +- l10n/bg.json | 2 +- l10n/fr.js | 2 +- l10n/fr.json | 2 +- l10n/ja.js | 2 +- l10n/ja.json | 2 +- l10n/pl.js | 2 +- l10n/pl.json | 2 +- l10n/pt_BR.js | 2 +- l10n/pt_BR.json | 2 +- l10n/ru.js | 2 +- l10n/ru.json | 2 +- l10n/zh_CN.js | 2 +- l10n/zh_CN.json | 2 +- 14 files changed, 14 insertions(+), 14 deletions(-) diff --git a/l10n/bg.js b/l10n/bg.js index 026a007c..bcdcbc32 100644 --- a/l10n/bg.js +++ b/l10n/bg.js @@ -111,4 +111,4 @@ OC.L10N.register( "{notifier} mentioned in the {file}: \"%1\$s\".": "{notifier} ha mencionado en {file}: \"%1\$s\".", "Choose a format to convert {fileName}": "Изберете формат за конвертиране {fileName}" }, -"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"); +"nplurals=2; plural=(n != 1);"); diff --git a/l10n/bg.json b/l10n/bg.json index 334e09d6..67f1e00f 100644 --- a/l10n/bg.json +++ b/l10n/bg.json @@ -108,5 +108,5 @@ "%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\".", "Choose a format to convert {fileName}": "Изберете формат за конвертиране {fileName}" -},"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);" +},"pluralForm" :"nplurals=2; plural=(n != 1);" } \ No newline at end of file diff --git a/l10n/fr.js b/l10n/fr.js index 7536c5e3..b5730f8a 100644 --- a/l10n/fr.js +++ b/l10n/fr.js @@ -111,4 +111,4 @@ OC.L10N.register( "{notifier} mentioned in the {file}: \"%1\$s\".": "{notifier} a mentionné dans {file}: \"%1\$s\".", "Choose a format to convert {fileName}": "Choisissez un format à convertir {fileName}" }, -"nplurals=2; plural=(n != 1);"); +"nplurals=2; plural=(n > 1);"); diff --git a/l10n/fr.json b/l10n/fr.json index f25d3621..804d7267 100644 --- a/l10n/fr.json +++ b/l10n/fr.json @@ -108,5 +108,5 @@ "%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\".", "Choose a format to convert {fileName}": "Choisissez un format à convertir {fileName}" -},"pluralForm" :"nplurals=2; plural=(n != 1);" +},"pluralForm" :"nplurals=2; plural=(n > 1);" } diff --git a/l10n/ja.js b/l10n/ja.js index 4eb00f75..cc7717a2 100644 --- a/l10n/ja.js +++ b/l10n/ja.js @@ -111,4 +111,4 @@ OC.L10N.register( "{notifier} mentioned in the {file}: \"%1\$s\".": "{notifier} は {file}: \"%1\$s\"に記載しました。", "Choose a format to convert {fileName}": "{fileName}を変換する形式を選択してください" }, -"nplurals=2; plural=(n != 1);"); +"nplurals=1; plural=0;"); diff --git a/l10n/ja.json b/l10n/ja.json index 90eb6cea..9b0ef995 100644 --- a/l10n/ja.json +++ b/l10n/ja.json @@ -108,5 +108,5 @@ "%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\"に記載しました。", "Choose a format to convert {fileName}": "{fileName}を変換する形式を選択してください" -},"pluralForm" :"nplurals=2; plural=(n != 1);" +},"pluralForm" :"nplurals=1; plural=0;" } \ No newline at end of file diff --git a/l10n/pl.js b/l10n/pl.js index c8b04a9d..c1304fae 100644 --- a/l10n/pl.js +++ b/l10n/pl.js @@ -111,4 +111,4 @@ OC.L10N.register( "{notifier} mentioned in the {file}: \"%1\$s\".": "{notifier} dodał(a) w {file} następujący komentarz: \"%1\$s\".", "Choose a format to convert {fileName}": "Wybierz format, do którego chcesz przekonwertować {fileName}" }, -"nplurals=2; plural=(n != 1);"); \ No newline at end of file +"nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);"); \ No newline at end of file diff --git a/l10n/pl.json b/l10n/pl.json index 73f35f17..29a6a5ea 100644 --- a/l10n/pl.json +++ b/l10n/pl.json @@ -108,5 +108,5 @@ "%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\".", "Choose a format to convert {fileName}": "Wybierz format, do którego chcesz przekonwertować {fileName}" -},"pluralForm" :"nplurals=2; plural=(n != 1);" +},"pluralForm" :"nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && (n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);" } \ No newline at end of file diff --git a/l10n/pt_BR.js b/l10n/pt_BR.js index 88c9a5e4..10c938fe 100644 --- a/l10n/pt_BR.js +++ b/l10n/pt_BR.js @@ -111,4 +111,4 @@ OC.L10N.register( "{notifier} mentioned in the {file}: \"%1\$s\".": "{notifier} mencionado em {file}: \"%1\$s\".", "Choose a format to convert {fileName}": "Escolha um formato para converter {fileName}" }, -"nplurals=2; plural=(n != 1);"); +"nplurals=2; plural=(n > 1);"); diff --git a/l10n/pt_BR.json b/l10n/pt_BR.json index 215e5b9b..63346a6f 100644 --- a/l10n/pt_BR.json +++ b/l10n/pt_BR.json @@ -108,5 +108,5 @@ "%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\".", "Choose a format to convert {fileName}": "Escolha um formato para converter {fileName}" -},"pluralForm" :"nplurals=2; plural=(n != 1);" +},"pluralForm" :"nplurals=2; plural=(n > 1);" } diff --git a/l10n/ru.js b/l10n/ru.js index 63ac85a3..1add6222 100644 --- a/l10n/ru.js +++ b/l10n/ru.js @@ -111,4 +111,4 @@ OC.L10N.register( "{notifier} mentioned in the {file}: \"%1\$s\".": "{notifier} упомянул в {file}: \"%1\$s\".", "Choose a format to convert {fileName}": "Выберите формат для {fileName}" }, -"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);"); +"nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);"); diff --git a/l10n/ru.json b/l10n/ru.json index 81b2801a..0f634ce4 100644 --- a/l10n/ru.json +++ b/l10n/ru.json @@ -108,5 +108,5 @@ "%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\".", "Choose a format to convert {fileName}": "Выберите формат для {fileName}" -},"pluralForm" :"nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);" +},"pluralForm" :"nplurals=4; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%10<=4 && (n%100<12 || n%100>14) ? 1 : n%10==0 || (n%10>=5 && n%10<=9) || (n%100>=11 && n%100<=14)? 2 : 3);" } \ No newline at end of file diff --git a/l10n/zh_CN.js b/l10n/zh_CN.js index 59e6c9e5..2aae7c37 100644 --- a/l10n/zh_CN.js +++ b/l10n/zh_CN.js @@ -111,4 +111,4 @@ OC.L10N.register( "{notifier} mentioned in the {file}: \"%1\$s\".": "{notifier} 提到 {file}: \"%1\$s\".", "Choose a format to convert {fileName}": "选择要转换{fileName}的格式" }, -"nplurals=2; plural=(n != 1);"); +"nplurals=1; plural=0;"); diff --git a/l10n/zh_CN.json b/l10n/zh_CN.json index 54028f10..5590c9a5 100644 --- a/l10n/zh_CN.json +++ b/l10n/zh_CN.json @@ -108,5 +108,5 @@ "%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\".", "Choose a format to convert {fileName}": "选择要转换{fileName}的格式" -},"pluralForm" :"nplurals=2; plural=(n != 1);" +},"pluralForm" :"nplurals=1; plural=0;" } \ No newline at end of file From 6df7c1eb73fbe911a34bb8e9d19b38b64c4ad8d7 Mon Sep 17 00:00:00 2001 From: acsfer <12234510+acsfer@users.noreply.github.com> Date: Tue, 18 Jan 2022 14:39:56 +0100 Subject: [PATCH 10/24] Switch to H2 levels, more visible See screenshots. --- templates/settings.php | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/templates/settings.php b/templates/settings.php index 73372d6f..311ae964 100644 --- a/templates/settings.php +++ b/templates/settings.php @@ -34,7 +34,7 @@ "> -

t("Server settings")) ?>

+

t("Server settings")) ?>

t("ONLYOFFICE Docs Location specifies the address of the server with the document services installed. Please change the '' for the server address in the below line.")) ?>

@@ -92,7 +92,7 @@
onlyoffice-hide"> -

t("Common settings")) ?>

+

t("Common settings")) ?>


-

+

t("Editor customization settings")) ?> "> -

+

onlyoffice-hide"> -

+

t("Common templates")) ?> -

+
  • class="onlyoffice-template-item" > @@ -251,7 +251,7 @@
onlyoffice-hide"> -

t("Secure view settings")) ?>

+

t("Secure view settings")) ?>

t("Secure view enables you to secure documents by embedding a watermark")) ?>

@@ -332,4 +332,4 @@

-
\ No newline at end of file + From 137e70ca8453d06309f96cc724168a8c9b7a1589 Mon Sep 17 00:00:00 2001 From: Antipkin-A Date: Tue, 7 Dec 2021 18:18:17 +0300 Subject: [PATCH 11/24] connect hook to register (Fix #562) --- appinfo/application.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/appinfo/application.php b/appinfo/application.php index 8088c0f7..79bc51e0 100644 --- a/appinfo/application.php +++ b/appinfo/application.php @@ -222,6 +222,8 @@ public function register(IRegistrationContext $context): void { $detector->getAllMappings(); $detector->registerType("docxf", "application/vnd.openxmlformats-officedocument.wordprocessingml.document.docxf"); $detector->registerType("oform", "application/vnd.openxmlformats-officedocument.wordprocessingml.document.oform"); + + Hooks::connectHooks(); } public function boot(IBootContext $context): void { @@ -279,7 +281,5 @@ function (FileCreatedFromTemplateEvent $event) { } }); } - - Hooks::connectHooks(); } } \ No newline at end of file From a49f0bd9b70ef10a0f6aa52f5b578e2afae7a244 Mon Sep 17 00:00:00 2001 From: Sergey Linnik Date: Thu, 20 Jan 2022 17:18:43 +0300 Subject: [PATCH 12/24] update submodule --- assets | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/assets b/assets index 47e28a87..9cc2c926 160000 --- a/assets +++ b/assets @@ -1 +1 @@ -Subproject commit 47e28a87f5eb0fd90739ff8a6f959e7807d47b0b +Subproject commit 9cc2c926af7542b026cbb89357d5fd901f2d0cf7 From 629a7494ab8b22393aa56226b301ae2ad39704d0 Mon Sep 17 00:00:00 2001 From: Sergey Linnik Date: Fri, 21 Jan 2022 17:07:57 +0300 Subject: [PATCH 13/24] Change title for new file --- appinfo/application.php | 6 +++--- controller/editorapicontroller.php | 6 +++--- js/main.js | 16 ++++++++-------- l10n/bg.js | 8 ++++---- l10n/bg.json | 8 ++++---- l10n/de.js | 8 ++++---- l10n/de.json | 8 ++++---- l10n/de_DE.js | 8 ++++---- l10n/de_DE.json | 8 ++++---- l10n/es.js | 8 ++++---- l10n/es.json | 8 ++++---- l10n/fr.js | 8 ++++---- l10n/fr.json | 8 ++++---- l10n/it.js | 8 ++++---- l10n/it.json | 8 ++++---- l10n/ja.js | 8 ++++---- l10n/ja.json | 8 ++++---- l10n/pl.js | 8 ++++---- l10n/pl.json | 8 ++++---- l10n/pt_BR.js | 8 ++++---- l10n/pt_BR.json | 8 ++++---- l10n/ru.js | 8 ++++---- l10n/ru.json | 8 ++++---- l10n/sv.js | 8 ++++---- l10n/sv.json | 8 ++++---- l10n/zh_CN.js | 8 ++++---- l10n/zh_CN.json | 8 ++++---- lib/filecreator.php | 6 +++--- 28 files changed, 113 insertions(+), 113 deletions(-) diff --git a/appinfo/application.php b/appinfo/application.php index 79bc51e0..a5d507bb 100644 --- a/appinfo/application.php +++ b/appinfo/application.php @@ -256,7 +256,7 @@ function (FileCreatedFromTemplateEvent $event) { && $this->appConfig->isUserAllowedToUse()) { $templateManager->registerTemplateFileCreator(function () use ($appName, $trans) { - $wordTemplate = new TemplateFileCreator($appName, $trans->t("Document"), ".docx"); + $wordTemplate = new TemplateFileCreator($appName, $trans->t("New document"), ".docx"); $wordTemplate->addMimetype("application/vnd.openxmlformats-officedocument.wordprocessingml.document"); $wordTemplate->setIconClass("icon-onlyoffice-new-docx"); $wordTemplate->setRatio(21/29.7); @@ -264,7 +264,7 @@ function (FileCreatedFromTemplateEvent $event) { }); $templateManager->registerTemplateFileCreator(function () use ($appName, $trans) { - $cellTemplate = new TemplateFileCreator($appName, $trans->t("Spreadsheet"), ".xlsx"); + $cellTemplate = new TemplateFileCreator($appName, $trans->t("New spreadsheet"), ".xlsx"); $cellTemplate->addMimetype("application/vnd.openxmlformats-officedocument.spreadsheetml.sheet"); $cellTemplate->setIconClass("icon-onlyoffice-new-xlsx"); $cellTemplate->setRatio(21/29.7); @@ -272,7 +272,7 @@ function (FileCreatedFromTemplateEvent $event) { }); $templateManager->registerTemplateFileCreator(function () use ($appName, $trans) { - $slideTemplate = new TemplateFileCreator($appName, $trans->t("Presentation"), ".pptx"); + $slideTemplate = new TemplateFileCreator($appName, $trans->t("New presentation"), ".pptx"); $slideTemplate->addMimetype("application/vnd.openxmlformats-officedocument.presentationml.presentation"); $slideTemplate->setIconClass("icon-onlyoffice-new-pptx"); $slideTemplate->setRatio(16/9); diff --git a/controller/editorapicontroller.php b/controller/editorapicontroller.php index b3fd0c6c..7bbe9c2b 100644 --- a/controller/editorapicontroller.php +++ b/controller/editorapicontroller.php @@ -396,13 +396,13 @@ public function config($fileId, $filePath = null, $shareToken = null, $directTok switch ($params["documentType"]) { case "word": - $createName = $this->trans->t("Document") . ".docx"; + $createName = $this->trans->t("New document") . ".docx"; break; case "cell": - $createName = $this->trans->t("Spreadsheet") . ".xlsx"; + $createName = $this->trans->t("New spreadsheet") . ".xlsx"; break; case "slide": - $createName = $this->trans->t("Presentation") . ".pptx"; + $createName = $this->trans->t("New presentation") . ".pptx"; break; } diff --git a/js/main.js b/js/main.js index 69714411..ff37a6e2 100644 --- a/js/main.js +++ b/js/main.js @@ -412,8 +412,8 @@ || OC.config.version.split(".")[0] < 21) { menu.addMenuEntry({ id: "onlyofficeDocx", - displayName: t(OCA.Onlyoffice.AppName, "Document"), - templateName: t(OCA.Onlyoffice.AppName, "Document"), + displayName: t(OCA.Onlyoffice.AppName, "New document"), + templateName: t(OCA.Onlyoffice.AppName, "New document"), iconClass: "icon-onlyoffice-new-docx", fileType: "docx", actionHandler: function (name) { @@ -427,8 +427,8 @@ menu.addMenuEntry({ id: "onlyofficeXlsx", - displayName: t(OCA.Onlyoffice.AppName, "Spreadsheet"), - templateName: t(OCA.Onlyoffice.AppName, "Spreadsheet"), + displayName: t(OCA.Onlyoffice.AppName, "New spreadsheet"), + templateName: t(OCA.Onlyoffice.AppName, "New spreadsheet"), iconClass: "icon-onlyoffice-new-xlsx", fileType: "xlsx", actionHandler: function (name) { @@ -442,8 +442,8 @@ menu.addMenuEntry({ id: "onlyofficePpts", - displayName: t(OCA.Onlyoffice.AppName, "Presentation"), - templateName: t(OCA.Onlyoffice.AppName, "Presentation"), + displayName: t(OCA.Onlyoffice.AppName, "New presentation"), + templateName: t(OCA.Onlyoffice.AppName, "New presentation"), iconClass: "icon-onlyoffice-new-pptx", fileType: "pptx", actionHandler: function (name) { @@ -462,8 +462,8 @@ menu.addMenuEntry({ id: "onlyofficeDocxf", - displayName: t(OCA.Onlyoffice.AppName, "Form template"), - templateName: t(OCA.Onlyoffice.AppName, "Form template"), + displayName: t(OCA.Onlyoffice.AppName, "New form template"), + templateName: t(OCA.Onlyoffice.AppName, "New form template"), iconClass: "icon-onlyoffice-new-docxf", fileType: "docxf", actionHandler: function (name) { diff --git a/l10n/bg.js b/l10n/bg.js index 40b24818..1c783b5d 100644 --- a/l10n/bg.js +++ b/l10n/bg.js @@ -24,9 +24,9 @@ OC.L10N.register( "File created" : "Файлът е създаден", "Open in ONLYOFFICE" : "Отвори в ONLYOFFICE", "Convert with ONLYOFFICE" : "Конвертирай с ONLYOFFICE", - "Document" : "Документ", - "Spreadsheet" : "Електронна таблица", - "Presentation" : "Презентация", + "New document" : "Документ", + "New spreadsheet" : "Електронна таблица", + "New presentation" : "Презентация", "Error when trying to connect" : "Грешка при опит за свързване", "Settings have been successfully updated" : "Настройките са успешно обновени", "Server can't read xml" : "Невъзможно прочитане на xml файла на сървъра", @@ -110,7 +110,7 @@ OC.L10N.register( "%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\".", "Choose a format to convert {fileName}": "Изберете формат за конвертиране {fileName}", - "Form template": "Шаблон на формуляр", + "New form template": "Шаблон на формуляр", "Blank": "Празно", "From text document": "От текстов документ", "Create new Form template": "Създайте нов шаблон на формуляр", diff --git a/l10n/bg.json b/l10n/bg.json index 444d06c7..ca7abbd9 100644 --- a/l10n/bg.json +++ b/l10n/bg.json @@ -22,9 +22,9 @@ "File created" : "Файлът е създаден", "Open in ONLYOFFICE" : "Отвори в ONLYOFFICE", "Convert with ONLYOFFICE" : "Конвертирай с ONLYOFFICE", - "Document" : "Документ", - "Spreadsheet" : "Електронна таблица", - "Presentation" : "Презентация", + "New document" : "Документ", + "New spreadsheet" : "Електронна таблица", + "New presentation" : "Презентация", "Error when trying to connect" : "Грешка при опит за свързване", "Settings have been successfully updated" : "Настройките са успешно обновени", "Server can't read xml" : "Невъзможно прочитане на xml файла на сървъра", @@ -108,7 +108,7 @@ "%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\".", "Choose a format to convert {fileName}": "Изберете формат за конвертиране {fileName}", - "Form template": "Шаблон на формуляр", + "New form template": "Шаблон на формуляр", "Blank": "Празно", "From text document": "От текстов документ", "Create new Form template": "Създайте нов шаблон на формуляр", diff --git a/l10n/de.js b/l10n/de.js index 66dfe98b..f48b6cbe 100644 --- a/l10n/de.js +++ b/l10n/de.js @@ -24,9 +24,9 @@ OC.L10N.register( "File created" : "Erstellte Datei", "Open in ONLYOFFICE" : "In ONLYOFFICE öffnen", "Convert with ONLYOFFICE" : "Mit ONLYOFFICE umwandeln", - "Document" : "Dokument", - "Spreadsheet" : "Tabelle", - "Presentation" : "Präsentation", + "New document" : "Dokument", + "New spreadsheet" : "Tabelle", + "New presentation" : "Präsentation", "Error when trying to connect" : "Fehler beim Anschließen", "Settings have been successfully updated" : "Einstellungen wurden erfolgreich aktualisiert", "Server can't read xml" : "Server kann eine xml-Datei nicht einlesen", @@ -110,7 +110,7 @@ OC.L10N.register( "%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\".", "Choose a format to convert {fileName}": "Wählen Sie das Format für {fileName} aus", - "Form template": "Formularvorlage", + "New form template": "Formularvorlage", "Blank": "Leer", "From text document": "Aus Textdatei", "Create new Form template": "Neue Formularvorlage erstellen", diff --git a/l10n/de.json b/l10n/de.json index 9cbcf6d8..d5da65b5 100644 --- a/l10n/de.json +++ b/l10n/de.json @@ -22,9 +22,9 @@ "File created" : "Erstellte Datei", "Open in ONLYOFFICE" : "In ONLYOFFICE öffnen", "Convert with ONLYOFFICE" : "Mit ONLYOFFICE umwandeln", - "Document" : "Dokument", - "Spreadsheet" : "Tabelle", - "Presentation" : "Präsentation", + "New document" : "Dokument", + "New spreadsheet" : "Tabelle", + "New presentation" : "Präsentation", "Error when trying to connect" : "Fehler beim Anschließen", "Settings have been successfully updated" : "Einstellungen wurden erfolgreich aktualisiert", "Server can't read xml" : "Server kann eine xml-Datei nicht einlesen", @@ -108,7 +108,7 @@ "%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\".", "Choose a format to convert {fileName}": "Wählen Sie das Format für {fileName} aus", - "Form template": "Formularvorlage", + "New form template": "Formularvorlage", "Blank": "Leer", "From text document": "Aus Textdatei", "Create new Form template": "Neue Formularvorlage erstellen", diff --git a/l10n/de_DE.js b/l10n/de_DE.js index fd9b0702..7b10a2a5 100644 --- a/l10n/de_DE.js +++ b/l10n/de_DE.js @@ -24,9 +24,9 @@ OC.L10N.register( "File created" : "Erstellte Datei", "Open in ONLYOFFICE" : "In ONLYOFFICE öffnen", "Convert with ONLYOFFICE" : "Mit ONLYOFFICE umwandeln", - "Document" : "Dokument", - "Spreadsheet" : "Tabelle", - "Presentation" : "Präsentation", + "New document" : "Dokument", + "New spreadsheet" : "Tabelle", + "New presentation" : "Präsentation", "Error when trying to connect" : "Fehler beim Anschließen", "Settings have been successfully updated" : "Einstellungen wurden erfolgreich aktualisiert", "Server can't read xml" : "Server kann eine xml-Datei nicht einlesen", @@ -110,7 +110,7 @@ OC.L10N.register( "%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\".", "Choose a format to convert {fileName}": "Wählen Sie das Format für {fileName} aus", - "Form template": "Formularvorlage", + "New form template": "Formularvorlage", "Blank": "Leer", "From text document": "Aus Textdatei", "Create new Form template": "Neue Formularvorlage erstellen", diff --git a/l10n/de_DE.json b/l10n/de_DE.json index eb36d008..c6512e6e 100644 --- a/l10n/de_DE.json +++ b/l10n/de_DE.json @@ -22,9 +22,9 @@ "File created" : "Erstellte Datei", "Open in ONLYOFFICE" : "In ONLYOFFICE öffnen", "Convert with ONLYOFFICE" : "Mit ONLYOFFICE umwandeln", - "Document" : "Dokument", - "Spreadsheet" : "Tabelle", - "Presentation" : "Präsentation", + "New document" : "Dokument", + "New spreadsheet" : "Tabelle", + "New presentation" : "Präsentation", "Error when trying to connect" : "Fehler beim Anschließen", "Settings have been successfully updated" : "Einstellungen wurden erfolgreich aktualisiert", "Server can't read xml" : "Server kann eine xml-Datei nicht einlesen", @@ -108,7 +108,7 @@ "%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\".", "Choose a format to convert {fileName}": "Wählen Sie das Format für {fileName} aus", - "Form template": "Formularvorlage", + "New form template": "Formularvorlage", "Blank": "Leer", "From text document": "Aus Textdatei", "Create new Form template": "Neue Formularvorlage erstellen", diff --git a/l10n/es.js b/l10n/es.js index 0dacb5bb..d7e5369a 100644 --- a/l10n/es.js +++ b/l10n/es.js @@ -24,9 +24,9 @@ OC.L10N.register( "File created" : "Archivo creado", "Open in ONLYOFFICE" : "Abrir en ONLYOFFICE", "Convert with ONLYOFFICE" : "Convertir con ONLYOFFICE", - "Document" : "Documento", - "Spreadsheet" : "Hoja de cálculo", - "Presentation" : "Presentación", + "New document" : "Documento", + "New spreadsheet" : "Hoja de cálculo", + "New presentation" : "Presentación", "Error when trying to connect" : "Error al intentar establecer la conexión", "Settings have been successfully updated" : "Ajustes han sido actualizados con éxito", "Server can't read xml" : "Servidor no puede leer xml", @@ -110,7 +110,7 @@ OC.L10N.register( "%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\".", "Choose a format to convert {fileName}": "Elija un formato para convertir {fileName}", - "Form template": "Plantilla de formulario", + "New form template": "Plantilla de formulario", "Blank": "En blanco", "From text document": "Desde documento de texto", "Create new Form template": "Crear nueva plantilla de formulario", diff --git a/l10n/es.json b/l10n/es.json index 8541b386..0b2a162e 100644 --- a/l10n/es.json +++ b/l10n/es.json @@ -22,9 +22,9 @@ "File created" : "Archivo creado", "Open in ONLYOFFICE" : "Abrir en ONLYOFFICE", "Convert with ONLYOFFICE" : "Convertir con ONLYOFFICE", - "Document" : "Documento", - "Spreadsheet" : "Hoja de cálculo", - "Presentation" : "Presentación", + "New document" : "Documento", + "New spreadsheet" : "Hoja de cálculo", + "New presentation" : "Presentación", "Error when trying to connect" : "Error al intentar establecer la conexión", "Settings have been successfully updated" : "Ajustes han sido actualizados con éxito", "Server can't read xml" : "Servidor no puede leer xml", @@ -108,7 +108,7 @@ "%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\".", "Choose a format to convert {fileName}": "Elija un formato para convertir {fileName}", - "Form template": "Plantilla de formulario", + "New form template": "Plantilla de formulario", "Blank": "En blanco", "From text document": "Desde documento de texto", "Create new Form template": "Crear nueva plantilla de formulario", diff --git a/l10n/fr.js b/l10n/fr.js index 186b2aef..9ebaa1b4 100644 --- a/l10n/fr.js +++ b/l10n/fr.js @@ -24,9 +24,9 @@ OC.L10N.register( "File created" : "Fichier créé", "Open in ONLYOFFICE" : "Ouvrir dans ONLYOFFICE", "Convert with ONLYOFFICE" : "Convertir avec ONLYOFFICE", - "Document" : "Nouveau document", - "Spreadsheet" : "Nouvelle feuille de calcul", - "Presentation" : "Nouvelle présentation", + "New document" : "Nouveau document", + "New spreadsheet" : "Nouvelle feuille de calcul", + "New presentation" : "Nouvelle présentation", "Error when trying to connect" : "Erreur durant la tentative de connexion", "Settings have been successfully updated" : "Les paramètres ont été mis à jour avec succès", "Server can't read xml" : "Le serveur ne peut pas lire le XML", @@ -110,7 +110,7 @@ OC.L10N.register( "%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\".", "Choose a format to convert {fileName}": "Choisissez un format à convertir {fileName}", - "Form template": "Modèle de formulaire", + "New form template": "Modèle de formulaire", "Blank": "Vide", "From text document": "À partir d'un fichier texte", "Create new Form template": "Créer un nouveau modèle de formulaire", diff --git a/l10n/fr.json b/l10n/fr.json index 6ed81a61..22a2ad78 100644 --- a/l10n/fr.json +++ b/l10n/fr.json @@ -22,9 +22,9 @@ "File created" : "Fichier créé", "Open in ONLYOFFICE" : "Ouvrir dans ONLYOFFICE", "Convert with ONLYOFFICE" : "Convertir avec ONLYOFFICE", - "Document" : "Nouveau document", - "Spreadsheet" : "Nouvelle feuille de calcul", - "Presentation" : "Nouvelle présentation", + "New document" : "Nouveau document", + "New spreadsheet" : "Nouvelle feuille de calcul", + "New presentation" : "Nouvelle présentation", "Error when trying to connect" : "Erreur durant la tentative de connexion", "Settings have been successfully updated" : "Les paramètres ont été mis à jour avec succès", "Server can't read xml" : "Le serveur ne peut pas lire le XML", @@ -108,7 +108,7 @@ "%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\".", "Choose a format to convert {fileName}": "Choisissez un format à convertir {fileName}", - "Form template": "Modèle de formulaire", + "New form template": "Modèle de formulaire", "Blank": "Vide", "From text document": "À partir d'un fichier texte", "Create new Form template": "Créer un nouveau modèle de formulaire", diff --git a/l10n/it.js b/l10n/it.js index bc0bb3de..a8f9e462 100644 --- a/l10n/it.js +++ b/l10n/it.js @@ -24,9 +24,9 @@ OC.L10N.register( "File created" : "File creato", "Open in ONLYOFFICE" : "Apri in ONLYOFFICE", "Convert with ONLYOFFICE" : "Converti con ONLYOFFICE", - "Document" : "Documento", - "Spreadsheet" : "Foglio di calcolo", - "Presentation" : "Presentazione", + "New document" : "Documento", + "New spreadsheet" : "Foglio di calcolo", + "New presentation" : "Presentazione", "Error when trying to connect" : "Errore durante il tentativo di connessione", "Settings have been successfully updated" : "Le impostazioni sono state aggiornate con successo", "Server can't read xml" : "Il server non può leggere xml", @@ -110,7 +110,7 @@ OC.L10N.register( "%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\".", "Choose a format to convert {fileName}": "Scegli un formato per convertire {fileName}", - "Form template": "Modello di modulo", + "New form template": "Modello di modulo", "Blank": "Vuoto", "From text document": "Dal documento di testo", "Create new Form template": "Creare un nuovo modello di modulo", diff --git a/l10n/it.json b/l10n/it.json index 0c23b26f..8a266ff9 100644 --- a/l10n/it.json +++ b/l10n/it.json @@ -22,9 +22,9 @@ "File created" : "File creato", "Open in ONLYOFFICE" : "Apri in ONLYOFFICE", "Convert with ONLYOFFICE" : "Converti con ONLYOFFICE", - "Document" : "Documento", - "Spreadsheet" : "Foglio di calcolo", - "Presentation" : "Presentazione", + "New document" : "Documento", + "New spreadsheet" : "Foglio di calcolo", + "New presentation" : "Presentazione", "Error when trying to connect" : "Errore durante il tentativo di connessione", "Settings have been successfully updated" : "Le impostazioni sono state aggiornate con successo", "Server can't read xml" : "Il server non può leggere xml", @@ -108,7 +108,7 @@ "%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\".", "Choose a format to convert {fileName}": "Scegli un formato per convertire {fileName}", - "Form template": "Modello di modulo", + "New form template": "Modello di modulo", "Blank": "Vuoto", "From text document": "Dal documento di testo", "Create new Form template": "Creare un nuovo modello di modulo", diff --git a/l10n/ja.js b/l10n/ja.js index b669d49d..dbe70b97 100644 --- a/l10n/ja.js +++ b/l10n/ja.js @@ -24,9 +24,9 @@ OC.L10N.register( "File created" : "ファイル作成されました", "Open in ONLYOFFICE" : "ONLYOFFICEで開く", "Convert with ONLYOFFICE" : "ONLYOFFICEで変換", - "Document" : "ドキュメント", - "Spreadsheet" : "スプレッドシート", - "Presentation" : "プレゼンテーション", + "New document" : "ドキュメント", + "New spreadsheet" : "スプレッドシート", + "New presentation" : "プレゼンテーション", "Error when trying to connect" : "接続時にエラーが発生しました", "Settings have been successfully updated" : "設定が更新されました", "Server can't read xml" : "サーバーでxmlを読み込ませんでした", @@ -110,7 +110,7 @@ OC.L10N.register( "%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\"に記載しました。", "Choose a format to convert {fileName}": "{fileName}を変換する形式を選択してください", - "Form template": "フォーム テンプレート", + "New form template": "フォーム テンプレート", "Blank": "空白", "From text document": "テキスト文書から作成する", "Create new Form template": "新しいフォームテンプレートの作成", diff --git a/l10n/ja.json b/l10n/ja.json index 975272e9..ea065fa5 100644 --- a/l10n/ja.json +++ b/l10n/ja.json @@ -22,9 +22,9 @@ "File created" : "ファイル作成されました", "Open in ONLYOFFICE" : "ONLYOFFICEで開く", "Convert with ONLYOFFICE" : "ONLYOFFICEで変換", - "Document" : "ドキュメント", - "Spreadsheet" : "スプレッドシート", - "Presentation" : "プレゼンテーション", + "New document" : "ドキュメント", + "New spreadsheet" : "スプレッドシート", + "New presentation" : "プレゼンテーション", "Error when trying to connect" : "接続時にエラーが発生しました", "Settings have been successfully updated" : "設定が更新されました", "Server can't read xml" : "サーバーでxmlを読み込ませんでした", @@ -108,7 +108,7 @@ "%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\"に記載しました。", "Choose a format to convert {fileName}": "{fileName}を変換する形式を選択してください", - "Form template": "フォーム テンプレート", + "New form template": "フォーム テンプレート", "Blank": "空白", "From text document": "テキスト文書から作成する", "Create new Form template": "新しいフォームテンプレートの作成", diff --git a/l10n/pl.js b/l10n/pl.js index 003329a8..74516545 100644 --- a/l10n/pl.js +++ b/l10n/pl.js @@ -24,9 +24,9 @@ OC.L10N.register( "File created" : "Plik utworzony", "Open in ONLYOFFICE" : "Otwórz w ONLYOFFICE", "Convert with ONLYOFFICE" : "Konwertuj", - "Document" : "Nowy dokument", - "Spreadsheet" : "Nowy skoroszyt", - "Presentation" : "Nowa prezentacja", + "New document" : "Nowy dokument", + "New spreadsheet" : "Nowy skoroszyt", + "New presentation" : "Nowa prezentacja", "Error when trying to connect" : "Błąd przy próbie połączenia", "Settings have been successfully updated" : "Ustawienia zaktualizowane pomyślnie", "Server can't read xml" : "Serwer nie może przeczytać xml", @@ -110,7 +110,7 @@ OC.L10N.register( "%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\".", "Choose a format to convert {fileName}": "Wybierz format, do którego chcesz przekonwertować {fileName}", - "Form template": "Szablon formularza", + "New form template": "Szablon formularza", "Blank": "Pusty", "From text document": "Szablon formularza z pliku tekstowego", "Create new Form template": "Utwórz nowy szablon formularza", diff --git a/l10n/pl.json b/l10n/pl.json index 6df4ac04..bab63ab6 100644 --- a/l10n/pl.json +++ b/l10n/pl.json @@ -22,9 +22,9 @@ "File created" : "Plik utworzony", "Open in ONLYOFFICE" : "Otwórz w ONLYOFFICE", "Convert with ONLYOFFICE" : "Konwertuj", - "Document" : "Nowy dokument", - "Spreadsheet" : "Nowy skoroszyt", - "Presentation" : "Nowa prezentacja", + "New document" : "Nowy dokument", + "New spreadsheet" : "Nowy skoroszyt", + "New presentation" : "Nowa prezentacja", "Error when trying to connect" : "Błąd przy próbie połączenia", "Settings have been successfully updated" : "Ustawienia zaktualizowane pomyślnie", "Server can't read xml" : "Serwer nie może przeczytać xml", @@ -108,7 +108,7 @@ "%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\".", "Choose a format to convert {fileName}": "Wybierz format, do którego chcesz przekonwertować {fileName}", - "Form template": "Szablon formularza", + "New form template": "Szablon formularza", "Blank": "Pusty", "From text document": "Szablon formularza z pliku tekstowego", "Create new Form template": "Utwórz nowy szablon formularza", diff --git a/l10n/pt_BR.js b/l10n/pt_BR.js index 926d6acb..969bc716 100644 --- a/l10n/pt_BR.js +++ b/l10n/pt_BR.js @@ -24,9 +24,9 @@ OC.L10N.register( "File created" : "Arquivo criado", "Open in ONLYOFFICE" : "Abrir no ONLYOFFICE", "Convert with ONLYOFFICE" : "Converta com ONLYOFFICE", - "Document" : "Documento", - "Spreadsheet" : "Planilha", - "Presentation" : "Apresentação", + "New document" : "Documento", + "New spreadsheet" : "Planilha", + "New presentation" : "Apresentação", "Error when trying to connect" : "Erro ao tentar conectar", "Settings have been successfully updated" : "Configurações salvas com sucesso", "Server can't read xml" : "Servidor não pode ler xml", @@ -110,7 +110,7 @@ OC.L10N.register( "%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\".", "Choose a format to convert {fileName}": "Escolha um formato para converter {fileName}", - "Form template": "Modelo de formulário", + "New form template": "Modelo de formulário", "Blank": "Em branco", "From text document": "Do documento de texto", "Create new Form template": "Criar novo modelo de formulário", diff --git a/l10n/pt_BR.json b/l10n/pt_BR.json index c78bdd75..b94c4099 100644 --- a/l10n/pt_BR.json +++ b/l10n/pt_BR.json @@ -22,9 +22,9 @@ "File created" : "Arquivo criado", "Open in ONLYOFFICE" : "Abrir no ONLYOFFICE", "Convert with ONLYOFFICE" : "Converta com ONLYOFFICE", - "Document" : "Documento", - "Spreadsheet" : "Planilha", - "Presentation" : "Apresentação", + "New document" : "Documento", + "New spreadsheet" : "Planilha", + "New presentation" : "Apresentação", "Error when trying to connect" : "Erro ao tentar conectar", "Settings have been successfully updated" : "Configurações salvas com sucesso", "Server can't read xml" : "Servidor não pode ler xml", @@ -108,7 +108,7 @@ "%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\".", "Choose a format to convert {fileName}": "Escolha um formato para converter {fileName}", - "Form template": "Modelo de formulário", + "New form template": "Modelo de formulário", "Blank": "Em branco", "From text document": "Do documento de texto", "Create new Form template": "Criar novo modelo de formulário", diff --git a/l10n/ru.js b/l10n/ru.js index 79011eb1..8c5a8c85 100644 --- a/l10n/ru.js +++ b/l10n/ru.js @@ -24,9 +24,9 @@ OC.L10N.register( "File created" : "Файл создан", "Open in ONLYOFFICE" : "Открыть в ONLYOFFICE", "Convert with ONLYOFFICE" : "Конвертировать в ONLYOFFICE", - "Document" : "Документ", - "Spreadsheet" : "Электронная таблица", - "Presentation" : "Презентация", + "New document" : "Новый документ", + "New spreadsheet" : "Новая электронная таблица", + "New presentation" : "Новая презентация", "Error when trying to connect" : "При попытке соединения возникла ошибка", "Settings have been successfully updated" : "Настройки были успешно обновлены", "Server can't read xml" : "Невозможно прочитать xml файл на сервере", @@ -110,7 +110,7 @@ OC.L10N.register( "%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\".", "Choose a format to convert {fileName}": "Выберите формат для {fileName}", - "Form template": "Шаблон формы", + "New form template": "Новый шаблон формы", "Blank": "Пустой", "From text document": "Из текстового документа", "Create new Form template": "Создать новый Шаблон формы", diff --git a/l10n/ru.json b/l10n/ru.json index 0d7fe3b5..7478f0c3 100644 --- a/l10n/ru.json +++ b/l10n/ru.json @@ -22,9 +22,9 @@ "File created" : "Файл создан", "Open in ONLYOFFICE" : "Открыть в ONLYOFFICE", "Convert with ONLYOFFICE" : "Конвертировать в ONLYOFFICE", - "Document" : "Документ", - "Spreadsheet" : "Электронная таблица", - "Presentation" : "Презентация", + "New document" : "Новый документ", + "New spreadsheet" : "Новая электронная таблица", + "New presentation" : "Новая презентация", "Error when trying to connect" : "При попытке соединения возникла ошибка", "Settings have been successfully updated" : "Настройки были успешно обновлены", "Server can't read xml" : "Невозможно прочитать xml файл на сервере", @@ -108,7 +108,7 @@ "%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\".", "Choose a format to convert {fileName}": "Выберите формат для {fileName}", - "Form template": "Шаблон формы", + "New form template": "Новый шаблон формы", "Blank": "Пустой", "From text document": "Из текстового документа", "Create new Form template": "Создать новый Шаблон формы", diff --git a/l10n/sv.js b/l10n/sv.js index aa00b6da..bdfaf7e7 100644 --- a/l10n/sv.js +++ b/l10n/sv.js @@ -24,9 +24,9 @@ OC.L10N.register( "File created" : "Filen skapad", "Open in ONLYOFFICE" : "Öppna i ONLYOFFICE", "Convert with ONLYOFFICE" : "Konvertera med ONLYOFFICE", - "Document" : "Dokument", - "Spreadsheet" : "Kalkylblad", - "Presentation" : "Presentation", + "New document" : "Dokument", + "New spreadsheet" : "Kalkylblad", + "New presentation" : "Presentation", "Error when trying to connect" : "Fel vid försök att ansluta", "Settings have been successfully updated" : "Inställningarna har uppdaterats", "Server can't read xml" : "Servern kan inte läsa XML", @@ -110,7 +110,7 @@ OC.L10N.register( "%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\".", "Choose a format to convert {fileName}": "Välj det filformat som {fileName} ska konverteras till.", - "Form template": "Formulärmall", + "New form template": "Formulärmall", "Blank": "Töm", "From text document": "Formulärmall från textfil", "Create new Form template": "Skapa ny formulärmall", diff --git a/l10n/sv.json b/l10n/sv.json index f78163f8..96c70730 100644 --- a/l10n/sv.json +++ b/l10n/sv.json @@ -22,9 +22,9 @@ "File created" : "Filen skapad", "Open in ONLYOFFICE" : "Öppna i ONLYOFFICE", "Convert with ONLYOFFICE" : "Konvertera med ONLYOFFICE", - "Document" : "Dokument", - "Spreadsheet" : "Kalkylblad", - "Presentation" : "Presentation", + "New document" : "Dokument", + "New spreadsheet" : "Kalkylblad", + "New presentation" : "Presentation", "Error when trying to connect" : "Fel vid försök att ansluta", "Settings have been successfully updated" : "Inställningarna har uppdaterats", "Server can't read xml" : "Servern kan inte läsa XML", @@ -108,7 +108,7 @@ "%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\".", "Choose a format to convert {fileName}": "Välj det filformat som {fileName} ska konverteras till.", - "Form template": "Formulärmall", + "New form template": "Formulärmall", "Blank": "Töm", "From text document": "Formulärmall från textfil", "Create new Form template": "Skapa ny formulärmall", diff --git a/l10n/zh_CN.js b/l10n/zh_CN.js index d465f41f..125421cf 100644 --- a/l10n/zh_CN.js +++ b/l10n/zh_CN.js @@ -24,9 +24,9 @@ OC.L10N.register( "File created" : "文件已创建", "Open in ONLYOFFICE" : "用 ONLYOFFICE 打开", "Convert with ONLYOFFICE" : "用 ONLYOFFICE 转换", - "Document" : "文档", - "Spreadsheet" : "电子表格", - "Presentation" : "演示文稿", + "New document" : "文档", + "New spreadsheet" : "电子表格", + "New presentation" : "演示文稿", "Error when trying to connect" : "连接是发生异常", "Settings have been successfully updated" : "设置已保存", "Server can't read xml" : "服务器无法读取XML", @@ -110,7 +110,7 @@ OC.L10N.register( "%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\".", "Choose a format to convert {fileName}": "选择要转换{fileName}的格式", - "Form template": "表单模板", + "New form template": "表单模板", "Blank": "空白", "From text document": "从文本文件", "Create new Form template": "创建新的表单模板", diff --git a/l10n/zh_CN.json b/l10n/zh_CN.json index d733aa8f..5be8da7c 100644 --- a/l10n/zh_CN.json +++ b/l10n/zh_CN.json @@ -22,9 +22,9 @@ "File created" : "文件已创建", "Open in ONLYOFFICE" : "用 ONLYOFFICE 打开", "Convert with ONLYOFFICE" : "用 ONLYOFFICE 转换", - "Document" : "文档", - "Spreadsheet" : "电子表格", - "Presentation" : "演示文稿", + "New document" : "文档", + "New spreadsheet" : "电子表格", + "New presentation" : "演示文稿", "Error when trying to connect" : "连接是发生异常", "Settings have been successfully updated" : "设置已保存", "Server can't read xml" : "服务器无法读取XML", @@ -108,7 +108,7 @@ "%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\".", "Choose a format to convert {fileName}": "选择要转换{fileName}的格式", - "Form template": "表单模板", + "New form template": "表单模板", "Blank": "空白", "From text document": "从文本文件", "Create new Form template": "创建新的表单模板", diff --git a/lib/filecreator.php b/lib/filecreator.php index 29104728..7bde076f 100644 --- a/lib/filecreator.php +++ b/lib/filecreator.php @@ -94,11 +94,11 @@ public function getId(): string { public function getName(): string { switch ($this->format) { case "xlsx": - return $this->trans->t("Spreadsheet"); + return $this->trans->t("New spreadsheet"); case "pptx": - return $this->trans->t("Presentation"); + return $this->trans->t("New presentation"); } - return $this->trans->t("Document"); + return $this->trans->t("New document"); } /** From 7de8ed93f666c69ab4f6364259b10f923ca85851 Mon Sep 17 00:00:00 2001 From: Sergey Linnik Date: Fri, 21 Jan 2022 17:18:50 +0300 Subject: [PATCH 14/24] new title to changelog --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 8413fdd6..b9beb5ab 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Change Log +## Changed +- title for new file + ## 7.3.0 ## Added - support docxf and oform formats From b0e9d1df96b9a4df9873accd49cd05270040d84e Mon Sep 17 00:00:00 2001 From: Sergey Linnik Date: Fri, 21 Jan 2022 17:28:47 +0300 Subject: [PATCH 15/24] fix to changelog --- CHANGELOG.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index ea137571..ff41b35e 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,8 @@ # Change Log +## Changed +- fixed link in mention notifications + ## 7.2.1 ## Added - check document server version From c469b7ed3602c95174ef80c55f2dfdd27b917815 Mon Sep 17 00:00:00 2001 From: Antipkin-A Date: Fri, 21 Jan 2022 17:41:48 +0300 Subject: [PATCH 16/24] mimes is consts in mimerepair (Fix #579) --- lib/Migration/MimeRepair.php | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/Migration/MimeRepair.php b/lib/Migration/MimeRepair.php index 46cfbef4..4d91c5bd 100644 --- a/lib/Migration/MimeRepair.php +++ b/lib/Migration/MimeRepair.php @@ -86,10 +86,9 @@ public function run(IOutput $output) { $customAliasPath = \OC::$SERVERROOT . "/config/" . self::CUSTOM_MIMETYPEALIASES; - $formats = $this->config->FormatsSetting(); $mimes = [ - $formats["docxf"]["mime"] => self::DOCUMENT_ALIAS, - $formats["oform"]["mime"] => self::DOCUMENT_ALIAS + "application/vnd.openxmlformats-officedocument.wordprocessingml.document.docxf" => self::DOCUMENT_ALIAS, + "application/vnd.openxmlformats-officedocument.wordprocessingml.document.oform" => self::DOCUMENT_ALIAS ]; $customAlias = $mimes; From c6cea73976a82271662ac92d962202e2ae77d381 Mon Sep 17 00:00:00 2001 From: Maria-Sukhova Date: Mon, 24 Jan 2022 12:28:28 +0300 Subject: [PATCH 17/24] update translations (add New) --- l10n/bg.js | 8 ++++---- l10n/bg.json | 8 ++++---- l10n/de.js | 8 ++++---- l10n/de.json | 8 ++++---- l10n/de_DE.js | 8 ++++---- l10n/de_DE.json | 8 ++++---- l10n/es.js | 8 ++++---- l10n/es.json | 8 ++++---- l10n/fr.js | 2 +- l10n/fr.json | 2 +- l10n/it.js | 8 ++++---- l10n/it.json | 8 ++++---- l10n/ja.js | 8 ++++---- l10n/ja.json | 8 ++++---- l10n/pl.js | 2 +- l10n/pl.json | 2 +- l10n/pt_BR.js | 8 ++++---- l10n/pt_BR.json | 8 ++++---- l10n/sv.js | 8 ++++---- l10n/sv.json | 8 ++++---- l10n/zh_CN.js | 8 ++++---- l10n/zh_CN.json | 8 ++++---- 22 files changed, 76 insertions(+), 76 deletions(-) diff --git a/l10n/bg.js b/l10n/bg.js index 1c783b5d..3d415f0a 100644 --- a/l10n/bg.js +++ b/l10n/bg.js @@ -24,9 +24,9 @@ OC.L10N.register( "File created" : "Файлът е създаден", "Open in ONLYOFFICE" : "Отвори в ONLYOFFICE", "Convert with ONLYOFFICE" : "Конвертирай с ONLYOFFICE", - "New document" : "Документ", - "New spreadsheet" : "Електронна таблица", - "New presentation" : "Презентация", + "New document" : "Нов документ", + "New spreadsheet" : "Нова електронна таблица", + "New presentation" : "Нова презентация", "Error when trying to connect" : "Грешка при опит за свързване", "Settings have been successfully updated" : "Настройките са успешно обновени", "Server can't read xml" : "Невъзможно прочитане на xml файла на сървъра", @@ -110,7 +110,7 @@ OC.L10N.register( "%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\".", "Choose a format to convert {fileName}": "Изберете формат за конвертиране {fileName}", - "New form template": "Шаблон на формуляр", + "New form template": "Нов шаблон на формуляр", "Blank": "Празно", "From text document": "От текстов документ", "Create new Form template": "Създайте нов шаблон на формуляр", diff --git a/l10n/bg.json b/l10n/bg.json index ca7abbd9..8466fa42 100644 --- a/l10n/bg.json +++ b/l10n/bg.json @@ -22,9 +22,9 @@ "File created" : "Файлът е създаден", "Open in ONLYOFFICE" : "Отвори в ONLYOFFICE", "Convert with ONLYOFFICE" : "Конвертирай с ONLYOFFICE", - "New document" : "Документ", - "New spreadsheet" : "Електронна таблица", - "New presentation" : "Презентация", + "New document" : "Нов документ", + "New spreadsheet" : "Нова електронна таблица", + "New presentation" : "Нова презентация", "Error when trying to connect" : "Грешка при опит за свързване", "Settings have been successfully updated" : "Настройките са успешно обновени", "Server can't read xml" : "Невъзможно прочитане на xml файла на сървъра", @@ -108,7 +108,7 @@ "%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\".", "Choose a format to convert {fileName}": "Изберете формат за конвертиране {fileName}", - "New form template": "Шаблон на формуляр", + "New form template": "Нов шаблон на формуляр", "Blank": "Празно", "From text document": "От текстов документ", "Create new Form template": "Създайте нов шаблон на формуляр", diff --git a/l10n/de.js b/l10n/de.js index f48b6cbe..98aa873c 100644 --- a/l10n/de.js +++ b/l10n/de.js @@ -24,9 +24,9 @@ OC.L10N.register( "File created" : "Erstellte Datei", "Open in ONLYOFFICE" : "In ONLYOFFICE öffnen", "Convert with ONLYOFFICE" : "Mit ONLYOFFICE umwandeln", - "New document" : "Dokument", - "New spreadsheet" : "Tabelle", - "New presentation" : "Präsentation", + "New document" : "Neues Dokument", + "New spreadsheet" : "Neue Tabelle", + "New presentation" : "Neue Präsentation", "Error when trying to connect" : "Fehler beim Anschließen", "Settings have been successfully updated" : "Einstellungen wurden erfolgreich aktualisiert", "Server can't read xml" : "Server kann eine xml-Datei nicht einlesen", @@ -110,7 +110,7 @@ OC.L10N.register( "%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\".", "Choose a format to convert {fileName}": "Wählen Sie das Format für {fileName} aus", - "New form template": "Formularvorlage", + "New form template": "Neue Formularvorlage", "Blank": "Leer", "From text document": "Aus Textdatei", "Create new Form template": "Neue Formularvorlage erstellen", diff --git a/l10n/de.json b/l10n/de.json index d5da65b5..d1285a84 100644 --- a/l10n/de.json +++ b/l10n/de.json @@ -22,9 +22,9 @@ "File created" : "Erstellte Datei", "Open in ONLYOFFICE" : "In ONLYOFFICE öffnen", "Convert with ONLYOFFICE" : "Mit ONLYOFFICE umwandeln", - "New document" : "Dokument", - "New spreadsheet" : "Tabelle", - "New presentation" : "Präsentation", + "New document" : "Neues Dokument", + "New spreadsheet" : "Neue Tabelle", + "New presentation" : "Neue Präsentation", "Error when trying to connect" : "Fehler beim Anschließen", "Settings have been successfully updated" : "Einstellungen wurden erfolgreich aktualisiert", "Server can't read xml" : "Server kann eine xml-Datei nicht einlesen", @@ -108,7 +108,7 @@ "%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\".", "Choose a format to convert {fileName}": "Wählen Sie das Format für {fileName} aus", - "New form template": "Formularvorlage", + "New form template": "Neue Formularvorlage", "Blank": "Leer", "From text document": "Aus Textdatei", "Create new Form template": "Neue Formularvorlage erstellen", diff --git a/l10n/de_DE.js b/l10n/de_DE.js index 7b10a2a5..e3e68ee6 100644 --- a/l10n/de_DE.js +++ b/l10n/de_DE.js @@ -24,9 +24,9 @@ OC.L10N.register( "File created" : "Erstellte Datei", "Open in ONLYOFFICE" : "In ONLYOFFICE öffnen", "Convert with ONLYOFFICE" : "Mit ONLYOFFICE umwandeln", - "New document" : "Dokument", - "New spreadsheet" : "Tabelle", - "New presentation" : "Präsentation", + "New document" : "Neues Dokument", + "New spreadsheet" : "Neue Tabelle", + "New presentation" : "Neue Präsentation", "Error when trying to connect" : "Fehler beim Anschließen", "Settings have been successfully updated" : "Einstellungen wurden erfolgreich aktualisiert", "Server can't read xml" : "Server kann eine xml-Datei nicht einlesen", @@ -110,7 +110,7 @@ OC.L10N.register( "%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\".", "Choose a format to convert {fileName}": "Wählen Sie das Format für {fileName} aus", - "New form template": "Formularvorlage", + "New form template": "Neue Formularvorlage", "Blank": "Leer", "From text document": "Aus Textdatei", "Create new Form template": "Neue Formularvorlage erstellen", diff --git a/l10n/de_DE.json b/l10n/de_DE.json index c6512e6e..a22b9cc6 100644 --- a/l10n/de_DE.json +++ b/l10n/de_DE.json @@ -22,9 +22,9 @@ "File created" : "Erstellte Datei", "Open in ONLYOFFICE" : "In ONLYOFFICE öffnen", "Convert with ONLYOFFICE" : "Mit ONLYOFFICE umwandeln", - "New document" : "Dokument", - "New spreadsheet" : "Tabelle", - "New presentation" : "Präsentation", + "New document" : "Neues Dokument", + "New spreadsheet" : "Neue Tabelle", + "New presentation" : "Neue Präsentation", "Error when trying to connect" : "Fehler beim Anschließen", "Settings have been successfully updated" : "Einstellungen wurden erfolgreich aktualisiert", "Server can't read xml" : "Server kann eine xml-Datei nicht einlesen", @@ -108,7 +108,7 @@ "%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\".", "Choose a format to convert {fileName}": "Wählen Sie das Format für {fileName} aus", - "New form template": "Formularvorlage", + "New form template": "Neue Formularvorlage", "Blank": "Leer", "From text document": "Aus Textdatei", "Create new Form template": "Neue Formularvorlage erstellen", diff --git a/l10n/es.js b/l10n/es.js index d7e5369a..d983027f 100644 --- a/l10n/es.js +++ b/l10n/es.js @@ -24,9 +24,9 @@ OC.L10N.register( "File created" : "Archivo creado", "Open in ONLYOFFICE" : "Abrir en ONLYOFFICE", "Convert with ONLYOFFICE" : "Convertir con ONLYOFFICE", - "New document" : "Documento", - "New spreadsheet" : "Hoja de cálculo", - "New presentation" : "Presentación", + "New document" : "Nuevo documento", + "New spreadsheet" : "Nueva hoja de cálculo", + "New presentation" : "Nueva presentación", "Error when trying to connect" : "Error al intentar establecer la conexión", "Settings have been successfully updated" : "Ajustes han sido actualizados con éxito", "Server can't read xml" : "Servidor no puede leer xml", @@ -110,7 +110,7 @@ OC.L10N.register( "%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\".", "Choose a format to convert {fileName}": "Elija un formato para convertir {fileName}", - "New form template": "Plantilla de formulario", + "New form template": "Nueva plantilla de formulario", "Blank": "En blanco", "From text document": "Desde documento de texto", "Create new Form template": "Crear nueva plantilla de formulario", diff --git a/l10n/es.json b/l10n/es.json index 0b2a162e..04ae274b 100644 --- a/l10n/es.json +++ b/l10n/es.json @@ -22,9 +22,9 @@ "File created" : "Archivo creado", "Open in ONLYOFFICE" : "Abrir en ONLYOFFICE", "Convert with ONLYOFFICE" : "Convertir con ONLYOFFICE", - "New document" : "Documento", - "New spreadsheet" : "Hoja de cálculo", - "New presentation" : "Presentación", + "New document" : "Nuevo documento", + "New spreadsheet" : "Nueva hoja de cálculo", + "New presentation" : "Nueva presentación", "Error when trying to connect" : "Error al intentar establecer la conexión", "Settings have been successfully updated" : "Ajustes han sido actualizados con éxito", "Server can't read xml" : "Servidor no puede leer xml", @@ -108,7 +108,7 @@ "%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\".", "Choose a format to convert {fileName}": "Elija un formato para convertir {fileName}", - "New form template": "Plantilla de formulario", + "New form template": "Nueva plantilla de formulario", "Blank": "En blanco", "From text document": "Desde documento de texto", "Create new Form template": "Crear nueva plantilla de formulario", diff --git a/l10n/fr.js b/l10n/fr.js index 9ebaa1b4..3108e33a 100644 --- a/l10n/fr.js +++ b/l10n/fr.js @@ -110,7 +110,7 @@ OC.L10N.register( "%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\".", "Choose a format to convert {fileName}": "Choisissez un format à convertir {fileName}", - "New form template": "Modèle de formulaire", + "New form template": "Nouveau modèle de formulaire", "Blank": "Vide", "From text document": "À partir d'un fichier texte", "Create new Form template": "Créer un nouveau modèle de formulaire", diff --git a/l10n/fr.json b/l10n/fr.json index 22a2ad78..d4a1293d 100644 --- a/l10n/fr.json +++ b/l10n/fr.json @@ -108,7 +108,7 @@ "%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\".", "Choose a format to convert {fileName}": "Choisissez un format à convertir {fileName}", - "New form template": "Modèle de formulaire", + "New form template": "Nouveau modèle de formulaire", "Blank": "Vide", "From text document": "À partir d'un fichier texte", "Create new Form template": "Créer un nouveau modèle de formulaire", diff --git a/l10n/it.js b/l10n/it.js index a8f9e462..34724e61 100644 --- a/l10n/it.js +++ b/l10n/it.js @@ -24,9 +24,9 @@ OC.L10N.register( "File created" : "File creato", "Open in ONLYOFFICE" : "Apri in ONLYOFFICE", "Convert with ONLYOFFICE" : "Converti con ONLYOFFICE", - "New document" : "Documento", - "New spreadsheet" : "Foglio di calcolo", - "New presentation" : "Presentazione", + "New document" : "Nuovo documento", + "New spreadsheet" : "Nuovo foglio di calcolo", + "New presentation" : "Nuova presentazione", "Error when trying to connect" : "Errore durante il tentativo di connessione", "Settings have been successfully updated" : "Le impostazioni sono state aggiornate con successo", "Server can't read xml" : "Il server non può leggere xml", @@ -110,7 +110,7 @@ OC.L10N.register( "%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\".", "Choose a format to convert {fileName}": "Scegli un formato per convertire {fileName}", - "New form template": "Modello di modulo", + "New form template": "Nuovo modello di modulo", "Blank": "Vuoto", "From text document": "Dal documento di testo", "Create new Form template": "Creare un nuovo modello di modulo", diff --git a/l10n/it.json b/l10n/it.json index 8a266ff9..31f47e22 100644 --- a/l10n/it.json +++ b/l10n/it.json @@ -22,9 +22,9 @@ "File created" : "File creato", "Open in ONLYOFFICE" : "Apri in ONLYOFFICE", "Convert with ONLYOFFICE" : "Converti con ONLYOFFICE", - "New document" : "Documento", - "New spreadsheet" : "Foglio di calcolo", - "New presentation" : "Presentazione", + "New document" : "Nuovo documento", + "New spreadsheet" : "Nuovo foglio di calcolo", + "New presentation" : "Nuova presentazione", "Error when trying to connect" : "Errore durante il tentativo di connessione", "Settings have been successfully updated" : "Le impostazioni sono state aggiornate con successo", "Server can't read xml" : "Il server non può leggere xml", @@ -108,7 +108,7 @@ "%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\".", "Choose a format to convert {fileName}": "Scegli un formato per convertire {fileName}", - "New form template": "Modello di modulo", + "New form template": "Nuovo modello di modulo", "Blank": "Vuoto", "From text document": "Dal documento di testo", "Create new Form template": "Creare un nuovo modello di modulo", diff --git a/l10n/ja.js b/l10n/ja.js index dbe70b97..14349b1b 100644 --- a/l10n/ja.js +++ b/l10n/ja.js @@ -24,9 +24,9 @@ OC.L10N.register( "File created" : "ファイル作成されました", "Open in ONLYOFFICE" : "ONLYOFFICEで開く", "Convert with ONLYOFFICE" : "ONLYOFFICEで変換", - "New document" : "ドキュメント", - "New spreadsheet" : "スプレッドシート", - "New presentation" : "プレゼンテーション", + "New document" : "新しいドキュメント", + "New spreadsheet" : "新しいスプレッドシート", + "New presentation" : "新しいプレゼンテーション", "Error when trying to connect" : "接続時にエラーが発生しました", "Settings have been successfully updated" : "設定が更新されました", "Server can't read xml" : "サーバーでxmlを読み込ませんでした", @@ -110,7 +110,7 @@ OC.L10N.register( "%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\"に記載しました。", "Choose a format to convert {fileName}": "{fileName}を変換する形式を選択してください", - "New form template": "フォーム テンプレート", + "New form template": "新しいフォームテンプレート", "Blank": "空白", "From text document": "テキスト文書から作成する", "Create new Form template": "新しいフォームテンプレートの作成", diff --git a/l10n/ja.json b/l10n/ja.json index ea065fa5..707a8b86 100644 --- a/l10n/ja.json +++ b/l10n/ja.json @@ -22,9 +22,9 @@ "File created" : "ファイル作成されました", "Open in ONLYOFFICE" : "ONLYOFFICEで開く", "Convert with ONLYOFFICE" : "ONLYOFFICEで変換", - "New document" : "ドキュメント", - "New spreadsheet" : "スプレッドシート", - "New presentation" : "プレゼンテーション", + "New document" : "新しいドキュメント", + "New spreadsheet" : "新しいスプレッドシート", + "New presentation" : "新しいプレゼンテーション", "Error when trying to connect" : "接続時にエラーが発生しました", "Settings have been successfully updated" : "設定が更新されました", "Server can't read xml" : "サーバーでxmlを読み込ませんでした", @@ -108,7 +108,7 @@ "%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\"に記載しました。", "Choose a format to convert {fileName}": "{fileName}を変換する形式を選択してください", - "New form template": "フォーム テンプレート", + "New form template": "新しいフォームテンプレート", "Blank": "空白", "From text document": "テキスト文書から作成する", "Create new Form template": "新しいフォームテンプレートの作成", diff --git a/l10n/pl.js b/l10n/pl.js index 74516545..806ac5ed 100644 --- a/l10n/pl.js +++ b/l10n/pl.js @@ -110,7 +110,7 @@ OC.L10N.register( "%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\".", "Choose a format to convert {fileName}": "Wybierz format, do którego chcesz przekonwertować {fileName}", - "New form template": "Szablon formularza", + "New form template": "Nowy szablon formularza", "Blank": "Pusty", "From text document": "Szablon formularza z pliku tekstowego", "Create new Form template": "Utwórz nowy szablon formularza", diff --git a/l10n/pl.json b/l10n/pl.json index bab63ab6..5e534201 100644 --- a/l10n/pl.json +++ b/l10n/pl.json @@ -108,7 +108,7 @@ "%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\".", "Choose a format to convert {fileName}": "Wybierz format, do którego chcesz przekonwertować {fileName}", - "New form template": "Szablon formularza", + "New form template": "Nowy szablon formularza", "Blank": "Pusty", "From text document": "Szablon formularza z pliku tekstowego", "Create new Form template": "Utwórz nowy szablon formularza", diff --git a/l10n/pt_BR.js b/l10n/pt_BR.js index 969bc716..105ecf38 100644 --- a/l10n/pt_BR.js +++ b/l10n/pt_BR.js @@ -24,9 +24,9 @@ OC.L10N.register( "File created" : "Arquivo criado", "Open in ONLYOFFICE" : "Abrir no ONLYOFFICE", "Convert with ONLYOFFICE" : "Converta com ONLYOFFICE", - "New document" : "Documento", - "New spreadsheet" : "Planilha", - "New presentation" : "Apresentação", + "New document" : "Novo documento", + "New spreadsheet" : "Nova planilha", + "New presentation" : "Nova apresentação", "Error when trying to connect" : "Erro ao tentar conectar", "Settings have been successfully updated" : "Configurações salvas com sucesso", "Server can't read xml" : "Servidor não pode ler xml", @@ -110,7 +110,7 @@ OC.L10N.register( "%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\".", "Choose a format to convert {fileName}": "Escolha um formato para converter {fileName}", - "New form template": "Modelo de formulário", + "New form template": "Novo modelo de formulário", "Blank": "Em branco", "From text document": "Do documento de texto", "Create new Form template": "Criar novo modelo de formulário", diff --git a/l10n/pt_BR.json b/l10n/pt_BR.json index b94c4099..9e5efa52 100644 --- a/l10n/pt_BR.json +++ b/l10n/pt_BR.json @@ -22,9 +22,9 @@ "File created" : "Arquivo criado", "Open in ONLYOFFICE" : "Abrir no ONLYOFFICE", "Convert with ONLYOFFICE" : "Converta com ONLYOFFICE", - "New document" : "Documento", - "New spreadsheet" : "Planilha", - "New presentation" : "Apresentação", + "New document" : "Novo documento", + "New spreadsheet" : "Nova planilha", + "New presentation" : "Nova apresentação", "Error when trying to connect" : "Erro ao tentar conectar", "Settings have been successfully updated" : "Configurações salvas com sucesso", "Server can't read xml" : "Servidor não pode ler xml", @@ -108,7 +108,7 @@ "%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\".", "Choose a format to convert {fileName}": "Escolha um formato para converter {fileName}", - "New form template": "Modelo de formulário", + "New form template": "Novo modelo de formulário", "Blank": "Em branco", "From text document": "Do documento de texto", "Create new Form template": "Criar novo modelo de formulário", diff --git a/l10n/sv.js b/l10n/sv.js index bdfaf7e7..02716e4f 100644 --- a/l10n/sv.js +++ b/l10n/sv.js @@ -24,9 +24,9 @@ OC.L10N.register( "File created" : "Filen skapad", "Open in ONLYOFFICE" : "Öppna i ONLYOFFICE", "Convert with ONLYOFFICE" : "Konvertera med ONLYOFFICE", - "New document" : "Dokument", - "New spreadsheet" : "Kalkylblad", - "New presentation" : "Presentation", + "New document" : "Nytt dokument", + "New spreadsheet" : "Nytt kalkylblad", + "New presentation" : "Ny presentation", "Error when trying to connect" : "Fel vid försök att ansluta", "Settings have been successfully updated" : "Inställningarna har uppdaterats", "Server can't read xml" : "Servern kan inte läsa XML", @@ -110,7 +110,7 @@ OC.L10N.register( "%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\".", "Choose a format to convert {fileName}": "Välj det filformat som {fileName} ska konverteras till.", - "New form template": "Formulärmall", + "New form template": "Ny formulärmall", "Blank": "Töm", "From text document": "Formulärmall från textfil", "Create new Form template": "Skapa ny formulärmall", diff --git a/l10n/sv.json b/l10n/sv.json index 96c70730..582b7c3d 100644 --- a/l10n/sv.json +++ b/l10n/sv.json @@ -22,9 +22,9 @@ "File created" : "Filen skapad", "Open in ONLYOFFICE" : "Öppna i ONLYOFFICE", "Convert with ONLYOFFICE" : "Konvertera med ONLYOFFICE", - "New document" : "Dokument", - "New spreadsheet" : "Kalkylblad", - "New presentation" : "Presentation", + "New document" : "Nytt dokument", + "New spreadsheet" : "Nytt kalkylblad", + "New presentation" : "Ny presentation", "Error when trying to connect" : "Fel vid försök att ansluta", "Settings have been successfully updated" : "Inställningarna har uppdaterats", "Server can't read xml" : "Servern kan inte läsa XML", @@ -108,7 +108,7 @@ "%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\".", "Choose a format to convert {fileName}": "Välj det filformat som {fileName} ska konverteras till.", - "New form template": "Formulärmall", + "New form template": "Ny formulärmall", "Blank": "Töm", "From text document": "Formulärmall från textfil", "Create new Form template": "Skapa ny formulärmall", diff --git a/l10n/zh_CN.js b/l10n/zh_CN.js index 125421cf..26b749ad 100644 --- a/l10n/zh_CN.js +++ b/l10n/zh_CN.js @@ -24,9 +24,9 @@ OC.L10N.register( "File created" : "文件已创建", "Open in ONLYOFFICE" : "用 ONLYOFFICE 打开", "Convert with ONLYOFFICE" : "用 ONLYOFFICE 转换", - "New document" : "文档", - "New spreadsheet" : "电子表格", - "New presentation" : "演示文稿", + "New document" : "新建文档", + "New spreadsheet" : "新建表格", + "New presentation" : "新建幻灯片", "Error when trying to connect" : "连接是发生异常", "Settings have been successfully updated" : "设置已保存", "Server can't read xml" : "服务器无法读取XML", @@ -110,7 +110,7 @@ OC.L10N.register( "%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\".", "Choose a format to convert {fileName}": "选择要转换{fileName}的格式", - "New form template": "表单模板", + "New form template": "新表单模板", "Blank": "空白", "From text document": "从文本文件", "Create new Form template": "创建新的表单模板", diff --git a/l10n/zh_CN.json b/l10n/zh_CN.json index 5be8da7c..733f3b4d 100644 --- a/l10n/zh_CN.json +++ b/l10n/zh_CN.json @@ -22,9 +22,9 @@ "File created" : "文件已创建", "Open in ONLYOFFICE" : "用 ONLYOFFICE 打开", "Convert with ONLYOFFICE" : "用 ONLYOFFICE 转换", - "New document" : "文档", - "New spreadsheet" : "电子表格", - "New presentation" : "演示文稿", + "New document" : "新建文档", + "New spreadsheet" : "新建表格", + "New presentation" : "新建幻灯片", "Error when trying to connect" : "连接是发生异常", "Settings have been successfully updated" : "设置已保存", "Server can't read xml" : "服务器无法读取XML", @@ -108,7 +108,7 @@ "%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\".", "Choose a format to convert {fileName}": "选择要转换{fileName}的格式", - "New form template": "表单模板", + "New form template": "新表单模板", "Blank": "空白", "From text document": "从文本文件", "Create new Form template": "创建新的表单模板", From 4051c7af839b436928f9181aa1e21b7dfaf1978c Mon Sep 17 00:00:00 2001 From: Antipkin-A Date: Tue, 25 Jan 2022 15:37:11 +0300 Subject: [PATCH 18/24] copyright22 --- appinfo/application.php | 2 +- appinfo/routes.php | 2 +- controller/callbackcontroller.php | 2 +- controller/editorapicontroller.php | 2 +- controller/editorcontroller.php | 2 +- controller/federationcontroller.php | 2 +- controller/settingscontroller.php | 2 +- controller/templatecontroller.php | 2 +- css/editor.css | 2 +- css/main.css | 2 +- css/settings.css | 2 +- css/template.css | 2 +- css/viewer.css | 2 +- js/desktop.js | 2 +- js/directeditor.js | 2 +- js/editor.js | 2 +- js/listener.js | 2 +- js/main.js | 2 +- js/settings.js | 2 +- js/template.js | 2 +- js/viewer.js | 2 +- lib/Migration/MimeRepair.php | 2 +- lib/adminsection.php | 2 +- lib/adminsettings.php | 2 +- lib/appconfig.php | 2 +- lib/command/documentserver.php | 2 +- lib/crypt.php | 2 +- lib/directeditor.php | 2 +- lib/documentservice.php | 2 +- lib/filecreator.php | 2 +- lib/fileutility.php | 2 +- lib/fileversions.php | 2 +- lib/hooks.php | 2 +- lib/keymanager.php | 2 +- lib/listeners/directeditorlistener.php | 2 +- lib/listeners/filesharinglistener.php | 2 +- lib/listeners/fileslistener.php | 2 +- lib/listeners/viewerlistener.php | 2 +- lib/listeners/widgetlistener.php | 2 +- lib/notifier.php | 2 +- lib/preview.php | 2 +- lib/templatemanager.php | 2 +- lib/templateprovider.php | 2 +- templates/editor.php | 2 +- templates/settings.php | 2 +- 45 files changed, 45 insertions(+), 45 deletions(-) diff --git a/appinfo/application.php b/appinfo/application.php index a5d507bb..c5c1ec89 100644 --- a/appinfo/application.php +++ b/appinfo/application.php @@ -1,7 +1,7 @@ Date: Thu, 16 Dec 2021 12:54:20 +0300 Subject: [PATCH 19/24] format link for restore (dd4401a31b9754573eaaa03bcb1b31333a957471) --- js/editor.js | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/js/editor.js b/js/editor.js index 8ef6dfb7..bee41de2 100644 --- a/js/editor.js +++ b/js/editor.js @@ -234,11 +234,11 @@ $.ajax({ method: "PUT", - url: OC.generateUrl("apps/" + OCA.Onlyoffice.AppName + "/ajax/restore?fileId={fileId}&version={version}", - { + url: OC.generateUrl("apps/" + OCA.Onlyoffice.AppName + "/ajax/restore"), + data: { fileId: OCA.Onlyoffice.fileId || 0, version: version, - }), + }, success: function onSuccess(response) { OCA.Onlyoffice.refreshHistory(response, version); From d49694c3a059f310c05d70b1f8784b14a2eb3343 Mon Sep 17 00:00:00 2001 From: Sergey Linnik Date: Thu, 10 Feb 2022 17:35:38 +0300 Subject: [PATCH 20/24] error for ds 6.0 (417bcde478829527df9cec05b9ba2673f0b71f10) --- js/editor.js | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/js/editor.js b/js/editor.js index 0254a926..00d05cbd 100644 --- a/js/editor.js +++ b/js/editor.js @@ -52,6 +52,13 @@ return; } + var docsVersion = DocsAPI.DocEditor.version().split("."); + if (docsVersion[0] < 6 + || docsVersion[0] == 6 && docsVersion[1] == 0) { + OCA.Onlyoffice.showMessage(t(OCA.Onlyoffice.AppName, "Not supported version"), "error", {timeout: -1}); + return; + } + var configUrl = OC.linkToOCS("apps/" + OCA.Onlyoffice.AppName + "/api/v1/config", 2) + (OCA.Onlyoffice.fileId || 0); var params = []; @@ -100,7 +107,7 @@ } if ((config.document.fileType === "docxf" || config.document.fileType === "oform") - && DocsAPI.DocEditor.version().split(".")[0] < 7) { + && docsVersion[0] < 7) { OCA.Onlyoffice.showMessage(t(OCA.Onlyoffice.AppName, "Please update ONLYOFFICE Docs to version 7.0 to work on fillable forms online"), "error", {timeout: -1}); return; } From 4b594b74b9580945408df644dc89878997f9ca57 Mon Sep 17 00:00:00 2001 From: Antipkin-A Date: Fri, 18 Feb 2022 14:02:56 +0300 Subject: [PATCH 21/24] region to convert service --- controller/editorcontroller.php | 6 ++++-- lib/documentservice.php | 12 +++++++++--- 2 files changed, 13 insertions(+), 5 deletions(-) diff --git a/controller/editorcontroller.php b/controller/editorcontroller.php index e7e036a9..df067b4e 100644 --- a/controller/editorcontroller.php +++ b/controller/editorcontroller.php @@ -268,9 +268,10 @@ public function create($name, $dir, $templateId = null, $targetId = 0, $shareTok $fileUrl = $this->getUrl($targetFile, $user, $shareToken); $ext = strtolower(pathinfo($name, PATHINFO_EXTENSION)); + $region = str_replace("_", "-", \OC::$server->getL10NFactory()->get($this->appName)->getLocaleCode()); $documentService = new DocumentService($this->trans, $this->config); try { - $newFileUri = $documentService->GetConvertedUri($fileUrl, $targetExt, $ext, $targetKey); + $newFileUri = $documentService->GetConvertedUri($fileUrl, $targetExt, $ext, $targetKey, $region); } catch (\Exception $e) { $this->logger->logException($e, ["message" => "GetConvertedUri: " . $targetFile->getId(), "app" => $this->appName]); return ["error" => $e->getMessage()]; @@ -591,8 +592,9 @@ public function convert($fileId, $shareToken = null) { $documentService = new DocumentService($this->trans, $this->config); $key = $this->fileUtility->getKey($file); $fileUrl = $this->getUrl($file, $user, $shareToken); + $region = str_replace("_", "-", \OC::$server->getL10NFactory()->get($this->appName)->getLocaleCode()); try { - $newFileUri = $documentService->GetConvertedUri($fileUrl, $ext, $internalExtension, $key); + $newFileUri = $documentService->GetConvertedUri($fileUrl, $ext, $internalExtension, $key, $region); } catch (\Exception $e) { $this->logger->logException($e, ["message" => "GetConvertedUri: " . $file->getId(), "app" => $this->appName]); return ["error" => $e->getMessage()]; diff --git a/lib/documentservice.php b/lib/documentservice.php index 454fde15..85437e85 100644 --- a/lib/documentservice.php +++ b/lib/documentservice.php @@ -83,11 +83,12 @@ public static function GenerateRevisionId($expected_key) { * @param string $from_extension - Document extension * @param string $to_extension - Extension to which to convert * @param string $document_revision_id - Key for caching on service + * @param string $region - Region * * @return string */ - function GetConvertedUri($document_uri, $from_extension, $to_extension, $document_revision_id) { - $responceFromConvertService = $this->SendRequestToConvertService($document_uri, $from_extension, $to_extension, $document_revision_id, false); + function GetConvertedUri($document_uri, $from_extension, $to_extension, $document_revision_id, $region = null) { + $responceFromConvertService = $this->SendRequestToConvertService($document_uri, $from_extension, $to_extension, $document_revision_id, false, $region); $errorElement = $responceFromConvertService->Error; if ($errorElement->count() > 0) { @@ -111,10 +112,11 @@ function GetConvertedUri($document_uri, $from_extension, $to_extension, $documen * @param string $to_extension - Extension to which to convert * @param string $document_revision_id - Key for caching on service * @param bool - $is_async - Perform conversions asynchronously + * @param string $region - Region * * @return array */ - function SendRequestToConvertService($document_uri, $from_extension, $to_extension, $document_revision_id, $is_async) { + function SendRequestToConvertService($document_uri, $from_extension, $to_extension, $document_revision_id, $is_async, $region = null) { $documentServerUrl = $this->config->GetDocumentServerInternalUrl(); if (empty($documentServerUrl)) { @@ -144,6 +146,10 @@ function SendRequestToConvertService($document_uri, $from_extension, $to_extensi "key" => $document_revision_id ]; + if (!is_null($region)) { + $data["region"] = $region; + } + if ($this->config->UseDemo()) { $data["tenant"] = $this->config->GetSystemValue("instanceid", true); } From aa92c07255a2a166ff0a2047c9805d776d6ebc6e Mon Sep 17 00:00:00 2001 From: Sergey Linnik Date: Fri, 25 Feb 2022 12:09:19 +0300 Subject: [PATCH 22/24] restore not for external link (dd4401a31b9754573eaaa03bcb1b31333a957471) --- controller/editorcontroller.php | 1 - 1 file changed, 1 deletion(-) diff --git a/controller/editorcontroller.php b/controller/editorcontroller.php index e7e036a9..2eac19c6 100644 --- a/controller/editorcontroller.php +++ b/controller/editorcontroller.php @@ -912,7 +912,6 @@ public function version($fileId, $version) { * @return array * * @NoAdminRequired - * @PublicPage */ public function restore($fileId, $version) { $this->logger->debug("Request restore version for: $fileId ($version)", ["app" => $this->appName]); From ee5c250caaa8e86fbc227b0787455dc1f9bf45b3 Mon Sep 17 00:00:00 2001 From: Sergey Linnik Date: Tue, 1 Mar 2022 15:53:51 +0300 Subject: [PATCH 23/24] fix to changelog (137e70ca8453d06309f96cc724168a8c9b7a1589) --- CHANGELOG.md | 1 + 1 file changed, 1 insertion(+) diff --git a/CHANGELOG.md b/CHANGELOG.md index 022d01bf..a794678d 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -4,6 +4,7 @@ - Nextcloud v20 is no longer supported - fixed link in mention notifications - title for new file +- fix editing after desktop sync ## 7.3.0 ## Added From 11e73ae6cf0707f8ab146c1b4cb05bceb38412d8 Mon Sep 17 00:00:00 2001 From: Sergey Linnik Date: Tue, 1 Mar 2022 15:55:06 +0300 Subject: [PATCH 24/24] 7.3.2 --- CHANGELOG.md | 1 + appinfo/info.xml | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index a794678d..71da3ce6 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,6 @@ # Change Log +## 7.3.2 ## Changed - Nextcloud v20 is no longer supported - fixed link in mention notifications diff --git a/appinfo/info.xml b/appinfo/info.xml index abbc4625..469e879c 100644 --- a/appinfo/info.xml +++ b/appinfo/info.xml @@ -6,7 +6,7 @@ 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. apache Ascensio System SIA - 7.3.0 + 7.3.2 Onlyoffice