dnrops
/
cryptpad
mirror of https://github.com/xwiki-labs/cryptpad
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'soon' into staging

This commit is contained in:
ansuz 2021-01-11 20:52:32 +05:30
parent 6871846306 7cd637624e
commit 5011f260fb
4 changed files with 5 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
customize.dist/loading.js
View File

@ -333,7 +333,6 @@ button:not(.btn).primary:hover{
if (data.type === "offline") {
try {
isOffline = true;
Messages.offlineError = "OFFLINE MODE NOT AVAILABLE"; // XXX
document.querySelector('#cp-loading-message').setAttribute('style', 'display:block;');
document.querySelector('#cp-loading-message').innerText = Messages.offlineError;
} catch (e) { console.error(e); }

2
www/common/drive-ui.js
View File

@ -4368,7 +4368,7 @@ define([
if (manager.isFolder(el) && !manager.isSharedFolder(el) && !anonDrive) { // Folder
// disconnected
if (!APP.editable) {
return void UI.warn(Messages.error); // XXX
return void UI.warn(Messages.error);
}
// if folder is inside SF
else if (manager.isInSharedFolder(paths[0].path)) {

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

@ -1506,5 +1506,6 @@
"admin_support_closed": "Tickets fermé :",
"admin_support_answered": "Tickets traité :",
"admin_support_normal": "Tickets sans réponse :",
"admin_support_premium": "Tickets prime  :"
"admin_support_premium": "Tickets prime :",
"offlineError": "MODE HORS LIGNE NON DISPONIBLE"
}

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

@ -1506,5 +1506,6 @@
"admin_support_first": "Created on: ",
"admin_support_last": "Updated on: ",
"access_offline": "You are currently offline. Access management is not available.",
"share_noContactsOffline": "You are currently offline. Contacts are not available."
"share_noContactsOffline": "You are currently offline. Contacts are not available.",
"offlineError": "OFFLINE MODE NOT AVAILABLE"
}