infra
/
cryptpad
2
1
Fork 0
Code Issues Pull Requests Projects Releases 1 Activity

Merge branch 'soon' into staging

pull/1/head
yflory 2021-05-03 16:39:20 +02:00
parent 712a78dbca 09af3f1c86
commit 76ba55acbe
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
www/common/onlyoffice/inner.js
View File

@ -2790,10 +2790,8 @@ define([
checkNewCheckpoint();
});
};
var isModified = editor.asc_isDocumentModified || function () {
return editor.isDocumentModify;
};
if (isModified()) {
var editing = editor.asc_isDocumentModified ? editor.asc_isDocumentModified() : editor.isDocumentModify;
if (editing) {
setEditable(false);
APP.unsavedLocks = myLocks;
APP.onStrictSaveChanges = function () {

4
www/common/translations/messages.fr.json
View File

@ -1226,5 +1226,7 @@
"pad_goToAnchor": "Aller à cette ancre",
"settings_padOpenLinkLabel": "Activer l'ouverture directe des liens",
"settings_padOpenLinkHint": "Cette option permet d'ouvrir les liens dans un document texte sans fenêtre d’aperçu",
"settings_padOpenLinkTitle": "Ouvrir les lien avec un seul clic"
"settings_padOpenLinkTitle": "Ouvrir les lien avec un seul clic",
"toolbar_storeInDrive": "Stocker dans CryptDrive",
"genericCopySuccess": "Copié dans le presse-papiers"
}

4
www/common/translations/messages.json
View File

@ -1226,5 +1226,7 @@
"settings_notifCalendarCheckbox": "Enable calendar notifications",
"calendar_notifications": "Reminders",
"calendar_addNotification": "Add reminder",
"calendar_noNotification": "None"
"calendar_noNotification": "None",
"toolbar_storeInDrive": "Store in CryptDrive",
"genericCopySuccess": "Copied to clipboard"
}