mirror of https://github.com/xwiki-labs/cryptpad
final translation fixes for admin panel
* add a 'reason' placeholder to prompts shown before archival and restoration * use two existing keys to describe what document archival and restoration do * use specific success messages where they already exist * annotate UI so our script does not flag translated strings as unused
This commit is contained in:
parent
56cf444855
commit
6349f01fd7
|
@ -115,11 +115,23 @@ var conditionallyPrintContent = function (output) {
|
|||
}
|
||||
};
|
||||
|
||||
var exceptions = `
|
||||
ui_more
|
||||
ui_collapse
|
||||
ui_expand
|
||||
ui_jsRequired
|
||||
|
||||
`.split(/\s+/).filter(Boolean);
|
||||
|
||||
var next = function () {
|
||||
var key = keys[0];
|
||||
if (!key) { return; }
|
||||
keys.shift();
|
||||
|
||||
if (/^og_/.test(key) || exceptions.includes(key)) {
|
||||
return void next();
|
||||
}
|
||||
|
||||
if (!limit) { return void console.log("[DONE]"); }
|
||||
limit--;
|
||||
|
||||
|
|
|
@ -71,7 +71,7 @@ define([
|
|||
'cp-admin-setlimit',
|
||||
'cp-admin-getlimits',
|
||||
],
|
||||
'database': [
|
||||
'database': [ // Msg.admin_cat_database
|
||||
'cp-admin-account-metadata',
|
||||
'cp-admin-document-metadata',
|
||||
'cp-admin-block-metadata',
|
||||
|
@ -302,7 +302,7 @@ define([
|
|||
};
|
||||
|
||||
var justifyDialog = (message, suggestion, implicit, explicit) => {
|
||||
UI.prompt(message, suggestion, result => { // XXX placeholder? (admin_archiveNote)
|
||||
UI.prompt(message, suggestion, result => {
|
||||
if (result === null) { return; }
|
||||
if (typeof(result) !== 'string') { result = ''; }
|
||||
else { result = result.trim(); }
|
||||
|
@ -310,6 +310,9 @@ define([
|
|||
explicit(result); // follow up with the action
|
||||
}, {
|
||||
ok: Messages.ui_confirm,
|
||||
inputOpts: {
|
||||
placeholder: Messages.admin_archiveNote || '',
|
||||
},
|
||||
});
|
||||
};
|
||||
|
||||
|
@ -325,14 +328,14 @@ define([
|
|||
justifyDialog(message, restoreReason, reason => { restoreReason = reason; }, action);
|
||||
};
|
||||
|
||||
var customButton = function (cls, text, handler) {
|
||||
var btn = h(`button.btn.btn-${cls}`, text);
|
||||
var customButton = function (cls, text, handler, opt) {
|
||||
var btn = h(`button.btn.btn-${cls}`, opt, text);
|
||||
if (handler) { $(btn).click(handler); }
|
||||
return btn;
|
||||
};
|
||||
|
||||
var primary = (text, handler) => customButton('primary', text, handler);
|
||||
var danger = (text, handler) => customButton('danger', text, handler);
|
||||
var primary = (text, handler, opt) => customButton('primary', text, handler, opt);
|
||||
var danger = (text, handler, opt) => customButton('danger', text, handler, opt);
|
||||
|
||||
var copyToClipboard = (content) => {
|
||||
var button = primary(Messages.copyToClipboard, () => {
|
||||
|
@ -531,7 +534,7 @@ define([
|
|||
|
||||
create['account-metadata'] = function () {
|
||||
var key = 'account-metadata';
|
||||
var $div = makeBlock(key, true);
|
||||
var $div = makeBlock(key, true); // Msg.admin_accountMetadataHint.admin_accountMetadataTitle
|
||||
|
||||
// input field for edPublic or user string
|
||||
var input = h('input', {
|
||||
|
@ -784,7 +787,6 @@ define([
|
|||
|
||||
if (data.live) {
|
||||
// archive
|
||||
// XXX accessibility, tooltips (admin_unarchiveHint, admin_unarchiveTitle)
|
||||
var archiveDocumentButton = danger(Messages.admin_archiveButton, function () {
|
||||
justifyArchivalDialog('', result => {
|
||||
sframeCommand('ARCHIVE_DOCUMENT', {
|
||||
|
@ -795,12 +797,15 @@ define([
|
|||
console.error(err);
|
||||
return void UI.warn(Messages.error);
|
||||
}
|
||||
UI.log(Messages.ui_success); //archivedFromServer); // XXX success ?
|
||||
UI.log(Messages.archivedFromServer);
|
||||
disable($(archiveDocumentButton));
|
||||
});
|
||||
});
|
||||
});
|
||||
row(Messages.admin_archiveDocument, archiveDocumentButton); // XXX admin_archiveHint ?
|
||||
row(Messages.admin_archiveDocument, h('span', [
|
||||
archiveDocumentButton,
|
||||
h('small', Messages.admin_archiveHint),
|
||||
]));
|
||||
}
|
||||
|
||||
if (data.archived && !data.live) {
|
||||
|
@ -814,13 +819,15 @@ define([
|
|||
console.error(err);
|
||||
return void UI.warn(Messages.error);
|
||||
}
|
||||
UI.log(Messages.ui_success);
|
||||
UI.log(Messages.restoredFromServer);
|
||||
disable($(restoreDocumentButton));
|
||||
});
|
||||
});
|
||||
});
|
||||
// XXX accessibility, tooltips (admin_unarchiveHint, admin_unarchiveTitle)
|
||||
row(Messages.admin_restoreDocument, restoreDocumentButton); // XXX display admin_unarchiveHint inline
|
||||
row(Messages.admin_restoreDocument, h('span', [
|
||||
restoreDocumentButton,
|
||||
h('small', Messages.admin_unarchiveHint),
|
||||
]));
|
||||
}
|
||||
// XXX file restore button?
|
||||
|
||||
|
@ -831,7 +838,7 @@ define([
|
|||
|
||||
create['document-metadata'] = function () {
|
||||
var key = 'document-metadata';
|
||||
var $div = makeBlock(key, true);
|
||||
var $div = makeBlock(key, true); // Msg.admin_documentMetadataHint.admin_documentMetadataTitle
|
||||
|
||||
var input = h('input', {
|
||||
placeholder: Messages.admin_documentMetadataPlaceholder,
|
||||
|
@ -1068,7 +1075,7 @@ define([
|
|||
|
||||
create['block-metadata'] = function () {
|
||||
var key = 'block-metadata';
|
||||
var $div = makeBlock(key, true);
|
||||
var $div = makeBlock(key, true); // Msg.admin_blockMetadataHint.admin_blockMetadataTitle
|
||||
|
||||
var input = h('input', {
|
||||
placeholder: Messages.admin_blockMetadataPlaceholder,
|
||||
|
|
|
@ -660,7 +660,7 @@ define([
|
|||
opt = opt || {};
|
||||
|
||||
var inputBlock = opt.password ? UI.passwordInput() :
|
||||
(opt.typeInput ? dialog.textTypeInput(opt.typeInput) : dialog.textInput());
|
||||
(opt.typeInput ? dialog.textTypeInput(opt.typeInput) : dialog.textInput(opt && opt.inputOpts));
|
||||
var input = $(inputBlock).is('input') ? inputBlock : $(inputBlock).find('input')[0];
|
||||
input.value = typeof(def) === 'string'? def: '';
|
||||
|
||||
|
|
Loading…
Reference in New Issue