remove hardcoded translations and defer non-blocking issues till the next release

pull/1/head
ansuz 3 years ago
parent a4b89fff84
commit 854a635c5f

@ -123,7 +123,7 @@ module.exports.create = function (config) {
maxWorkers: config.maxWorkers, maxWorkers: config.maxWorkers,
disableIntegratedTasks: config.disableIntegratedTasks || false, disableIntegratedTasks: config.disableIntegratedTasks || false,
disableIntegratedEviction: typeof(config.disableIntegratedEviction) === 'undefined'? true: config.disableIntegratedEviction, // XXX false, disableIntegratedEviction: typeof(config.disableIntegratedEviction) === 'undefined'? true: config.disableIntegratedEviction, // XXX 4.10.0 false,
lastEviction: +new Date(), lastEviction: +new Date(),
evictionReport: {}, evictionReport: {},
commandTimers: {}, commandTimers: {},

@ -3034,9 +3034,18 @@ define([
var name = Util.fixHTML(data.title); var name = Util.fixHTML(data.title);
var url = data.href; var url = data.href;
var user = data.name; var user = data.name;
Messages.notification_openLink = "You've received a link <b>{0}</b> from {1}:"; // XXX //Messages.link_open = "Open URL";
Messages.link_open = "Open URL"; // openLinkInNewTab ("Open Link in New Tab")
Messages.link_store = "Store link in drive"; // fc_open ("Open")
// share_linkOpen ("Preview")
// resources_openInNewTab ("Open it in a new tab")
Messages.link_open = Messages.fc_open; // XXX 4.10.0
//Messages.link_store = "Store link in drive";
// toolbar_storeInDrive ? ("Store in CryptDrive")
// autostore_store ? ("Store")
Messages.link_store = Messages.toolbar_storeInDrive; // XXX 4.10.0
var content = h('div', [ var content = h('div', [
UI.setHTML(h('p'), Messages._getKey('notification_openLink', [name, user])), UI.setHTML(h('p'), Messages._getKey('notification_openLink', [name, user])),
@ -3069,7 +3078,6 @@ define([
onClick: function () { onClick: function () {
if (clicked) { return; } if (clicked) { return; }
clicked = true; clicked = true;
// XXX feedback
common.getSframeChannel().query("Q_DRIVE_USEROBJECT", { common.getSframeChannel().query("Q_DRIVE_USEROBJECT", {
cmd: "addLink", cmd: "addLink",
data: { data: {

@ -1940,7 +1940,6 @@ define([
'class': 'cp-app-drive-element-ctime cp-app-drive-element-list' 'class': 'cp-app-drive-element-ctime cp-app-drive-element-list'
}).text(getDate(data.ctime)); }).text(getDate(data.ctime));
$element.append($type).append($adate).append($cdate); $element.append($type).append($adate).append($cdate);
// XXX feedback
}; };
var _addOwnership = function ($span, $state, data) { var _addOwnership = function ($span, $state, data) {
if (data && Array.isArray(data.owners) && data.owners.indexOf(edPublic) !== -1) { if (data && Array.isArray(data.owners) && data.owners.indexOf(edPublic) !== -1) {
@ -2778,7 +2777,7 @@ define([
var u = $url.val().trim(); var u = $url.val().trim();
if (!n || !u) { return true; } if (!n || !u) { return true; }
if (!Util.isValidURL(u)) { if (!Util.isValidURL(u)) {
// XXX add style for invalid input? input:invalid // XXX 4.10.0 add style for invalid input? input:invalid
UI.warn(Messages.error); UI.warn(Messages.error);
return true; return true;
} }

@ -111,7 +111,6 @@ define([
if (mailbox) { // Friend if (mailbox) { // Friend
if (friends[curve] && !mailbox.notifications) { return; } if (friends[curve] && !mailbox.notifications) { return; }
if (mailbox.notifications && mailbox.curvePublic) { if (mailbox.notifications && mailbox.curvePublic) {
// XXX feedback
common.mailbox.sendTo("SHARE_PAD", { common.mailbox.sendTo("SHARE_PAD", {
href: href, href: href,
isStatic: Boolean(config.static), isStatic: Boolean(config.static),

@ -92,7 +92,6 @@ define([
(type === 'file' ? 'notification_fileShared' : // Msg.notification_fileSharedTeam (type === 'file' ? 'notification_fileShared' : // Msg.notification_fileSharedTeam
'notification_padShared'); // Msg.notification_padSharedTeam 'notification_padShared'); // Msg.notification_padSharedTeam
Messages.notification_linkShared = "{0} has shared a link with you: <b>{1}</b>"; // XXX
if (msg.content.isStatic) { if (msg.content.isStatic) {
key = 'notification_linkShared'; // Msg.notification_linkShared; key = 'notification_linkShared'; // Msg.notification_linkShared;
} }
@ -115,7 +114,6 @@ define([
}; };
content.handler = function() { content.handler = function() {
if (msg.content.isStatic) { if (msg.content.isStatic) {
// XXX feedback
UIElements.displayOpenLinkModal(common, { UIElements.displayOpenLinkModal(common, {
curve: msg.author, curve: msg.author,
href: msg.content.href, href: msg.content.href,

@ -97,7 +97,7 @@ define([
var checkCheckpoints = function (array) { var checkCheckpoints = function (array) {
if (!Array.isArray(array)) { return; } if (!Array.isArray(array)) { return; }
// Keep the last 100 messages // Keep the last 100 messages
if (array.length > 100) { // XXX if (array.length > 100) { // XXX 4.10.0
array.splice(0, array.length - 100); array.splice(0, array.length - 100);
} }
// Remove every message before the first checkpoint // Remove every message before the first checkpoint

@ -192,8 +192,8 @@ define([
}, },
}; };
Messages.convertPage = "Convert"; // XXX Messages.convertPage = "Convert"; // XXX 4.10.0
Messages.convert_hint = "Pick the file you want to convert. The list of output format will be visible afterward."; // XXX Messages.convert_hint = "Pick the file you want to convert. The list of output format will be visible afterward."; // XXX 4.10.0
var createToolbar = function () { var createToolbar = function () {
var displayed = ['useradmin', 'newpad', 'limit', 'pageTitle', 'notifications']; var displayed = ['useradmin', 'newpad', 'limit', 'pageTitle', 'notifications'];

@ -1970,8 +1970,6 @@ define([
$(cbox).hide().find('input').attr('disabled', 'disabled').prop('checked', false); $(cbox).hide().find('input').attr('disabled', 'disabled').prop('checked', false);
} }
} else { } else {
Messages.form_anonName = "Your username"; // XXX
Messages.form_answerAs = "Answer as"; // XXX
anonName = h('div.cp-form-anon-answer-input', [ anonName = h('div.cp-form-anon-answer-input', [
Messages.form_answerAs, Messages.form_answerAs,
h('input', { h('input', {

@ -176,7 +176,7 @@ define([
validateKey: keys.secondaryValidateKey, validateKey: keys.secondaryValidateKey,
owners: [myKeys.edPublic], owners: [myKeys.edPublic],
crypto: crypto, crypto: crypto,
//Cache: Utils.Cache // XXX //Cache: Utils.Cache // XXX 4.10.0
}; };
var results = {}; var results = {};
config.onError = function (info) { config.onError = function (info) {

Loading…
Cancel
Save