From 78957817e2b548137fa614dbf21df755338346ad Mon Sep 17 00:00:00 2001 From: Ahmed Mazen Date: Sat, 1 Jul 2023 08:20:29 +0800 Subject: [PATCH 1/8] add " (copy)" to copied OpenOffice files Normally, copied CryptPad files have a " (copy)" suffixed to them but OnlyOffice doesn't because it has different internal architechture. Copied OnlyOffice files can be identified by two attributes: a non-empty title and template data. Since OnlyOffice files cannot be just copy and pasted, I resorted to modifying their metadata through metadataMgr in `./common/onlyoffice/inner.js` Essentially, this commit check if a file is a copied file. If it is, it updates the title. It doesn't actually copy the file but merely modifies the title after it has been copied. --- www/common/onlyoffice/inner.js | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/www/common/onlyoffice/inner.js b/www/common/onlyoffice/inner.js index 96842f99c..b7326b244 100644 --- a/www/common/onlyoffice/inner.js +++ b/www/common/onlyoffice/inner.js @@ -241,6 +241,11 @@ define([ type = APP.downloadType; title = "download"; } + if(title === "" && APP.startWithTemplate) { + var copyTitle = Messages._getKey('copy_title', [APP.startWithTemplate.content.metadata.title]); + common.getMetadataMgr().updateTitle(copyTitle); + title = copyTitle + } var file = {}; switch(type) { case 'doc': From ce577e1a07c96f705549f5ada2b5ba77f96f6208 Mon Sep 17 00:00:00 2001 From: Ahmed Mazen Date: Mon, 10 Jul 2023 17:47:20 +0800 Subject: [PATCH 2/8] make `npm run lint` happy --- www/common/onlyoffice/inner.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/www/common/onlyoffice/inner.js b/www/common/onlyoffice/inner.js index b7326b244..46a33b7d9 100644 --- a/www/common/onlyoffice/inner.js +++ b/www/common/onlyoffice/inner.js @@ -244,7 +244,7 @@ define([ if(title === "" && APP.startWithTemplate) { var copyTitle = Messages._getKey('copy_title', [APP.startWithTemplate.content.metadata.title]); common.getMetadataMgr().updateTitle(copyTitle); - title = copyTitle + title = copyTitle; } var file = {}; switch(type) { From 4b3cd9484c23ee426928bae1e670bca8a9010fb3 Mon Sep 17 00:00:00 2001 From: Ahmed Mazen Date: Mon, 10 Jul 2023 18:01:45 +0800 Subject: [PATCH 3/8] add "(copy)" to implicitily titled documents Normally, documents that are created get a title similar to this: "Sheet - Mon, July 10, 2023". This commit adds " (copy)" to those documents when copied. --- www/common/onlyoffice/inner.js | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/www/common/onlyoffice/inner.js b/www/common/onlyoffice/inner.js index 46a33b7d9..64716c7e1 100644 --- a/www/common/onlyoffice/inner.js +++ b/www/common/onlyoffice/inner.js @@ -242,7 +242,8 @@ define([ title = "download"; } if(title === "" && APP.startWithTemplate) { - var copyTitle = Messages._getKey('copy_title', [APP.startWithTemplate.content.metadata.title]); + var metadata = APP.startWithTemplate.content.metadata; + var copyTitle = Messages._getKey('copy_title', [metadata.title || metadata.defaultTitle]); common.getMetadataMgr().updateTitle(copyTitle); title = copyTitle; } From 7cc5a6c31f3c846a06c3e54964b6b70b7c19ac6b Mon Sep 17 00:00:00 2001 From: Mathilde <41020854+mthld@users.noreply.github.com> Date: Mon, 17 Jul 2023 10:10:29 +0200 Subject: [PATCH 4/8] Add 5.4-rc CryptPad version to bug template --- .github/ISSUE_TEMPLATE/bug_resolution.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/ISSUE_TEMPLATE/bug_resolution.yml b/.github/ISSUE_TEMPLATE/bug_resolution.yml index 60e415d7a..a10f732e5 100644 --- a/.github/ISSUE_TEMPLATE/bug_resolution.yml +++ b/.github/ISSUE_TEMPLATE/bug_resolution.yml @@ -85,6 +85,7 @@ body: label: Version description: What version of CryptPad are you running? options: + - 5.4-rc - 5.3.0 - 5.2.1 - 5.2.0 From d974279b21023ce2e2deb3c314172e6e03fd1e86 Mon Sep 17 00:00:00 2001 From: Weblate Date: Mon, 17 Jul 2023 14:36:20 +0200 Subject: [PATCH 5/8] Translated using Weblate (English) Currently translated at 100.0% (1629 of 1629 strings) Co-authored-by: Anonymous Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/en/ Translation: CryptPad/App --- www/common/translations/messages.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/www/common/translations/messages.json b/www/common/translations/messages.json index eeee8330a..15f66fdaf 100644 --- a/www/common/translations/messages.json +++ b/www/common/translations/messages.json @@ -1628,5 +1628,6 @@ "admin_totpDisableButton": "Disable", "register_nameTooLong": "Usernames must be shorter than {0} characters", "loading_enter_otp": "This account is protected with Two-Factor Authentication. Please enter your verification code", - "loading_recover": "Unable to get a code? Recover your account" + "loading_recover": "Unable to get a code? Recover your account", + "recovery_mfa_secret_ph": "Recovery code" } From e8c2ac4ff01721a1d9702a1ee593c1ae148b0676 Mon Sep 17 00:00:00 2001 From: Weblate Date: Mon, 17 Jul 2023 14:36:21 +0200 Subject: [PATCH 6/8] Translated using Weblate (German) Currently translated at 99.1% (1615 of 1629 strings) Co-authored-by: Yann Flory Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/de/ Translation: CryptPad/App --- www/common/translations/messages.de.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/www/common/translations/messages.de.json b/www/common/translations/messages.de.json index 0d1f81241..3919c1dd3 100644 --- a/www/common/translations/messages.de.json +++ b/www/common/translations/messages.de.json @@ -1614,5 +1614,6 @@ "recovery_header": "2FA-Wiederherstellung", "mfa_revoke_code": "Bitte gib den Verifizierungscode ein", "recovery_mfa_error": "Unbekannter Fehler. Bitte neu laden und erneut versuchen.", - "recovery_mfa_disabled": "Multi-Faktor-Authentifizierung ist für diesen Account bereits deaktiviert." + "recovery_mfa_disabled": "Multi-Faktor-Authentifizierung ist für diesen Account bereits deaktiviert.", + "recovery_mfa_secret_ph": "Wiederherstellungscode" } From 5005618d57704b84310daaae5fcabaa5586ccb8e Mon Sep 17 00:00:00 2001 From: Weblate Date: Mon, 17 Jul 2023 14:36:21 +0200 Subject: [PATCH 7/8] Translated using Weblate (Arabic) Currently translated at 99.8% (1626 of 1629 strings) Co-authored-by: Yann Flory Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/ar/ Translation: CryptPad/App --- www/common/translations/messages.ar.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/www/common/translations/messages.ar.json b/www/common/translations/messages.ar.json index d6e117fa9..bcdfb8d96 100644 --- a/www/common/translations/messages.ar.json +++ b/www/common/translations/messages.ar.json @@ -1625,5 +1625,6 @@ "admin_totpRecoveryHint": "يمكن للمستخدمين نسخ بيانات الإسترجاع على صفحة استرجاع المصادقة الثنائية (2FA) /recovery/ ورسله للإيميل مسؤولين المنصة. ألصق بيانات الإسترجاع أدناه لتعطيل المصادقة الثنائية (2FA) لحساب", "admin_totpEnabled": "المصادقة الثنائية (2FA) مُمكنة", "admin_totpRecoveryMethod": "طريقة استرجاع المصادقة الثنائية (2FA)", - "admin_totpCheck": "نجاح التحقق من صحة التوقيع" + "admin_totpCheck": "نجاح التحقق من صحة التوقيع", + "recovery_mfa_secret_ph": "رمز الإسترجاع" } From 78fb230e5b09a739d09bd32ed6273f8e3e34d728 Mon Sep 17 00:00:00 2001 From: Weblate Date: Mon, 17 Jul 2023 14:36:21 +0200 Subject: [PATCH 8/8] Translated using Weblate (Japanese) Currently translated at 99.6% (1623 of 1629 strings) Co-authored-by: Yann Flory Translate-URL: http://weblate.cryptpad.fr/projects/cryptpad/app/ja/ Translation: CryptPad/App --- www/common/translations/messages.ja.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/www/common/translations/messages.ja.json b/www/common/translations/messages.ja.json index d9313a206..579d94228 100644 --- a/www/common/translations/messages.ja.json +++ b/www/common/translations/messages.ja.json @@ -1623,5 +1623,6 @@ "admin_totpCheck": "署名の認証に成功しました", "settings_mfaTitle": "二要素認証", "form_condorcetSchulze": "シュルツェ", - "form_noCondorcetWinner": "勝者がありません" + "form_noCondorcetWinner": "勝者がありません", + "recovery_mfa_secret_ph": "復旧コード" }