diff --git a/customize.dist/pages.js b/customize.dist/pages.js index 4cc7c59b0..87a9f95da 100644 --- a/customize.dist/pages.js +++ b/customize.dist/pages.js @@ -62,12 +62,10 @@ define([ var imprintUrl = AppConfig.imprint && (typeof(AppConfig.imprint) === "boolean" ? '/imprint.html' : AppConfig.imprint); - // XXX + // XXX translations Msg.docs_link = "Documentation"; - // XXX Remove FAQ from translations - // XXX Add FAQ to docs - Msg.footer_team = "Contributors"; // XXX existing key - Msg.footer_tos = "Terms of Service"; // XXX existing key + Msg.footer_team = "Contributors"; + Msg.footer_tos = "Terms of Service"; Pages.versionString = "v3.25.0 (ZyzomysPedunculatus)"; diff --git a/customize.dist/pages/contact.js b/customize.dist/pages/contact.js index bf9196dec..19fab881c 100644 --- a/customize.dist/pages/contact.js +++ b/customize.dist/pages/contact.js @@ -6,7 +6,7 @@ define([ '/common/outer/local-store.js' ], function (Config, h, Msg, Pages, LocalStore) { - // XXX + // XXX translations Msg.contact_adminHint = "For any issues related to your account, storage limit, or availability of the service."; // existing key @@ -38,7 +38,7 @@ define([ ) ) ) : undefined, - (adminMailbox && LocalStore.isLoggedIn()) ? h('div.col-12.col-sm-6.col-md-3.col-lg-3', // XXX show "disabled" support if not logged in + (adminMailbox && LocalStore.isLoggedIn()) ? h('div.col-12.col-sm-6.col-md-3.col-lg-3', h('a.card', {href : "/support/"}, h('div.card-body', h('p', [ diff --git a/customize.dist/pages/features.js b/customize.dist/pages/features.js index 6645d9655..c2b693f26 100644 --- a/customize.dist/pages/features.js +++ b/customize.dist/pages/features.js @@ -13,10 +13,10 @@ define([ upgradeURL: AppConfig.upgradeURL || 'https://accounts.cryptpad.fr/#/?on=' + origin, }; - Msg.features_title = "Features"; // XXX existing key + // XXX translations + Msg.features_title = "Features"; return function () { - // XXX ALL are existing keys // Non-registered column Msg.features_anon = "Non-registered"; Msg.features_f_apps = "Access to all the applications"; @@ -36,13 +36,13 @@ define([ Msg.features_f_social = "Social Features"; Msg.features_f_social_note = "Add contacts for secure collaboration, create a profile, fine-grained access controls"; // Msg.features_f_file1 = ""; - // XXX hard coding file limit in keys? + // XXX add instance limit Msg.features_f_file1_note = "Store files in your CryptDrive: images, PDFs, videos, and more. Share them with your contacts or embed them in your documents. (up to 25MB)"; // Msg.features_f_cryptdrive1 = ""; // Msg.features_f_cryptdrive1_note = ""; // Msg.features_f_devices = ""; // Msg.features_f_devices_note = ""; - // XXX hard coding storage limit in keys? + // XXX add instance limit Msg.features_f_storage1 = "Permanent Storage (1GB)"; Msg.features_f_storage1_note = "Documents stored in your CryptDrive are never deleted for inactivity"; // Premium column @@ -120,7 +120,6 @@ define([ href: '/register/' }, h('button.cp-features-register-button', Msg.features_f_register)) ]), - // XXX remove Msg.features_f_register_note ]), ]), ]); diff --git a/customize.dist/pages/index.js b/customize.dist/pages/index.js index 0e2ca9338..687624db5 100644 --- a/customize.dist/pages/index.js +++ b/customize.dist/pages/index.js @@ -72,29 +72,6 @@ define([ }); UI.addTooltips(); - /* // XXX remove this commented code? - var more = icons.length < 4? undefined: h('div.bs-callout.cp-callout-more', [ - h('div.cp-callout-more-lessmsg.cp-hidden', [ - "see less ", - h('i.fa.fa-caret-up') - ]), - h('div.cp-callout-more-moremsg', [ - "see more ", - h('i.fa.fa-caret-down') - ]), - { - onclick: function () { - if (showingMore) { - $('.cp-more, .cp-callout-more-lessmsg').addClass('cp-hidden'); - $('.cp-callout-more-moremsg').removeClass('cp-hidden'); - } else { - $('.cp-more, .cp-callout-more-lessmsg').removeClass('cp-hidden'); - $('.cp-callout-more-moremsg').addClass('cp-hidden'); - } - showingMore = !showingMore; - } - } - ]);*/ // XXX move this button to pages.js to make it available to other pages var _link = h('a', { @@ -112,7 +89,7 @@ define([ Feedback.send('HOME_SUPPORT_CRYPTPAD'); }); - // XXX + // XXX translations Msg.home_privacy_title = "Private by design"; Msg.home_privacy_text = "CryptPad is built to enable collaboration while keeping data private. All information including documents, chats, and files is encrypted and decrypted by your browser. This means nothing is readable outside of the session where you are logged in. Even the service administrators do not have access to your information."; Msg.home_host_title = "About this instance"; @@ -159,7 +136,8 @@ define([ ]) ]; - Msg.main_catch_phrase = "Collaboration suite,
encrypted and open-source"; // XXX existing key + // XXX translation + Msg.main_catch_phrase = "Collaboration suite,
encrypted and open-source"; return [ h('div#cp-main', [ Pages.infopageTopbar(), @@ -176,17 +154,9 @@ define([ ]), h('div.col-md-5.cp-app-grid', [ icons, - // XXX remove this commented code? - //more ]) ]), blocks, - // XXX remove this commented code? - /*h('div.row', [ - h('div.cp-crowdfunding', [ - crowdFunding - ]) - ])*/ ]), ]), Pages.infopageFooter(), diff --git a/customize.dist/pages/register.js b/customize.dist/pages/register.js index d017ff368..d0d9c8520 100644 --- a/customize.dist/pages/register.js +++ b/customize.dist/pages/register.js @@ -9,12 +9,11 @@ define([ return function () { var urlArgs = Config.requireConf.urlArgs; - // XXX + // XXX translations Msg.register_header = "Register"; // existing key Msg.register_notes_title = "Important notes"; Msg.register_notes = ''; Msg.register_importRecent = "Import documents from your anonymous session"; // existing key - // XXX remove Msg.register_explanation return [h('div#cp-main', [ Pages.infopageTopbar(), diff --git a/customize.dist/pages/what-is-cryptpad.js b/customize.dist/pages/what-is-cryptpad.js index 4afb982e6..e5d6c689b 100644 --- a/customize.dist/pages/what-is-cryptpad.js +++ b/customize.dist/pages/what-is-cryptpad.js @@ -6,20 +6,16 @@ define([ ], function (Config, h, Msg, Pages) { var urlArgs = Config.requireConf.urlArgs; - // XXX + // XXX translations Msg.whatis_collaboration = "Private Collaboration"; // existing key Msg.whatis_collaboration_info = '

CryptPad is built to enable collaboration, synchronizing in real time between users editing the same document, but has no access to the content of the document or data about users. Because all data is encrypted, the service and its administrators have no way of seeing the content being edited and stored.

Collaborating in real time on online documents is now a common thing. A range of well known internet platforms offer this service. In order to enable collaboration, these services synchronize changes between all users. In the process they gain access to the content of the document and to data about the behaviour of users. While these services are often advertised as "free", platforms monetise user data by using it to profile users and selling advertising.

'; - // XXX remove whatis_collaboration_p1, p2, p3 Msg.whatis_apps = "A full suite of applications"; Msg.whatis_apps_info = "

CryptPad provides a full-fledged office suite, with all the tools necessary for productive collaboration. Applications include: Rich Text, Spreadsheets, Code/Markdown, Kanban, Slides, Whiteboard and Polls.

A secure chat is available in each document for secure communication, [continue ...]

"; - // XXX remove all whatis_zeroknowledge keys Msg.whatis_drive_info = "

Manage documents with CryptDrive. Create folders, shared folders, tags, [continue ...]

"; - // XXX remove whatis_drive_p1, p2, p3 Msg.whatis_model = "Business model"; Msg.whatis_model_info = "

CryptPad is open source [continue ...]

CryptPad does not profit from its users data. This is because being fully encrypted it does not gather any useful data that could be sold to profile users. This lack of data is a feature, not a bug, it is part of a vision for online services that respect users privacy. Instead of pretending to be \"free\" like the big platforms CryptPad aims to build a financially sustainable model: funded willingly by users instead of profiting form personal information.

Since 2016, CryptPad is supported by French and European research grants such as BPI France, NLNet Foundation, NGI Trust, Mozilla Open Source Support, as well as donations and subscriptions to the service. Now that the feasibility of the project has been established, the next goal is to make financially sustainable through user funding. If you would like to support CryptPad and help make it a sustainable alternative to the big platforms, please consider making a donation.

"; Msg.whatis_xwiki = "Made at XWiki"; Msg.whatis_xwiki_info = "

CryptPad is made at XWiki, a company based in Paris that has been making open-source software for over 15 years. [continue ...]

"; - // XXX remove all whatis_business keys return function () { return h('div#cp-main', [ Pages.infopageTopbar(), diff --git a/customize.dist/src/less2/include/colortheme.less b/customize.dist/src/less2/include/colortheme.less index 12abeed91..38c0c6139 100644 --- a/customize.dist/src/less2/include/colortheme.less +++ b/customize.dist/src/less2/include/colortheme.less @@ -4,7 +4,7 @@ @colortheme_app-font: @colortheme_app-font-size @colortheme_font; @colortheme_logo-1: #326599; -@colortheme_logo-2: #0087FF; // XXX Testing if this color works +@colortheme_logo-2: #0087FF; @colortheme_logo_2_light: lighten(@colortheme_logo-2, 40%); @colortheme_loading_bg: #E7E7E7; diff --git a/customize.dist/src/less2/include/infopages.less b/customize.dist/src/less2/include/infopages.less index 6b3ca1d1b..535b2afe8 100644 --- a/customize.dist/src/less2/include/infopages.less +++ b/customize.dist/src/less2/include/infopages.less @@ -117,7 +117,7 @@ body { } } footer { - @footer-color: #d9d9d9; // XXX move this + @footer-color: #d9d9d9; // XXX use/make variable background-color: @footer-color; padding-top: 20px; diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js index 5501ca813..d7cee2418 100644 --- a/www/common/common-ui-elements.js +++ b/www/common/common-ui-elements.js @@ -1530,7 +1530,7 @@ define([ var legalLine = template(Messages.info_imprintFlavour, Pages.imprintLink); var privacyLine = template(Messages.info_privacyFlavour, Pages.privacyLink); - // XXX existing key + // XXX translation Messages.help.generic.more = "Learn more about how CryptPad can work for you by reading our Documentation."; var faqLine = template(Messages.help.generic.more, Pages.docsLink); @@ -1684,7 +1684,7 @@ define([ 'href': 'https://docs.cryptpad.fr', 'class': 'fa fa-book' }, - content: h('span', Messages.docs_link) // XXX + content: h('span', Messages.docs_link) }); if (padType !== 'support' && accountName && Config.supportMailbox) { options.push({ @@ -2115,7 +2115,8 @@ define([ //$creation.append(h('h2.cp-creation-title', Messages.newButtonTitle)); var newPadH3Title = Messages['button_new' + type]; - Messages.creation_helperText = "Learn more..."; // XXX + // XXX translation + Messages.creation_helperText = "Learn more..."; var title = h('div.cp-creation-title', [ UI.getFileIcon({type: type})[0], h('div.cp-creation-title-text', [ @@ -2185,18 +2186,15 @@ define([ // Owned pads // Default is Owned pad - // XXX Remove creation_owned1 and creation_owned2 keys var owned = h('div.cp-creation-owned', [ UI.createCheckbox('cp-creation-owned', Messages.creation_owned, true), ]); // Life time - // XXX rewrite "creation_expire2": "An expiring pad has a set lifetime, after which it will be automatically removed from the server and other users' CryptDrives." - - - Messages.creation_expiration = "Expiration date"; // XXX - Messages.creation_expiresIn = "Expires in"; // XXX + // XXX translations + Messages.creation_expiration = "Expiration date"; + Messages.creation_expiresIn = "Expires in"; var expire = h('div.cp-creation-expire', [ UI.createCheckbox('cp-creation-expire', Messages.creation_expiration, false, { labelAlt: Messages.creation_expiresIn @@ -2220,7 +2218,8 @@ define([ ]); // Password - Messages.creation_password = "Password"; // XXX + // XXX translation + Messages.creation_password = "Password"; var password = h('div.cp-creation-password', [ UI.createCheckbox('cp-creation-password', Messages.creation_password, false), h('span.cp-creation-password-picker.cp-creation-slider', [ diff --git a/www/common/drive-ui.js b/www/common/drive-ui.js index 2ad6e1fa3..1c96ab17d 100644 --- a/www/common/drive-ui.js +++ b/www/common/drive-ui.js @@ -4377,8 +4377,6 @@ define([ } // if folder does not contains SF - // XXX rewrite "creation_owned1": "An owned pad can be deleted from the server whenever the owner wants. Deleting an owned pad removes it from other users' CryptDrives." - // tipy used in dialog to create a shared folder else { var convertContent = h('div', [ h('p', Messages.convertFolderToSF_confirm), diff --git a/www/register/main.js b/www/register/main.js index 6086ac514..2e112de74 100644 --- a/www/register/main.js +++ b/www/register/main.js @@ -99,7 +99,7 @@ define([ return void UI.alert(Messages.register_mustAcceptTerms); } - // XXX + // XXX translations Messages.register_warning = " Warning"; // existing key Messages.register_warning_note = "Due to the encrypted nature of CrytpPad even the the service administrators will not be able to recover data in case the username and/or password are forgotten. Please save them in a safe place."; Messages.register_cancel = "Cancel"; // existing key