From b1d5beca6fa87522d63e17b3538b920b67cdd2e4 Mon Sep 17 00:00:00 2001 From: yflory Date: Wed, 14 Mar 2018 11:37:49 +0100 Subject: [PATCH] Translations + UI for pad creation screen v2 --- customize.dist/translations/messages.fr.js | 12 ++++++---- customize.dist/translations/messages.js | 14 ++++++----- www/common/common-ui-elements.js | 28 +++++++++++----------- 3 files changed, 29 insertions(+), 25 deletions(-) diff --git a/customize.dist/translations/messages.fr.js b/customize.dist/translations/messages.fr.js index 24299e422..5d22021ae 100644 --- a/customize.dist/translations/messages.fr.js +++ b/customize.dist/translations/messages.fr.js @@ -1060,11 +1060,13 @@ define(function () { // Creation page out.creation_404 = "Ce pad n'existe plus. Vous pouvez créer un nouveau pad en utilisant le formulaire suivant."; out.creation_ownedTitle = "Type de pad"; + out.creation_owned = "Être propriétaire de ce pad"; out.creation_ownedTrue = "Pad possédé"; out.creation_ownedFalse = "Pad ouvert"; out.creation_owned1 = "Un pad possédé peut être supprimé du serveur à tout moment quand son propriétaire le souhaite. Une fois supprimé, il disparaît du CryptDrive des autres utilisateurs."; out.creation_owned2 = "Un pad ouvert n'a pas de propriétaire et ne peut donc pas être supprimé du serveur à moins d'avoir dépassé sa date d'expiration."; out.creation_expireTitle = "Durée de vie"; + out.creation_expire = "Ajouter une durée de vie"; out.creation_expireTrue = "Ajouter durée de vie"; out.creation_expireFalse = "Illimité"; out.creation_expireHours = "Heure(s)"; @@ -1072,11 +1074,11 @@ define(function () { out.creation_expireMonths = "Mois"; out.creation_expire1 = "Un pad illimité ne sera pas supprimé du serveur à moins que son propriétaire ne le décide."; out.creation_expire2 = "Un pad expirant a une durée de vie définie, après laquelle il sera supprimé automatiquement du serveur et du CryptDrive des utilisateurs."; - out.creation_createTitle = "Créer un pad"; - out.creation_createFromTemplate = "Depuis un modèle"; - out.creation_createFromScratch = "Nouveau pad vide"; - out.creation_settings = "Préférences des nouveaux pads"; - out.creation_saveSettings = "Sauver les préférences"; + out.creation_noTemplate = "Pas de modèle"; + out.creation_newTemplate = "Nouveau modèle"; + out.creation_create = "Créer"; + out.creation_saveSettings = "Se souvenir de ces paramètres"; + out.creation_settings = "Voir davantage de préférences"; // Properties about creation data out.creation_owners = "Propriétaires"; out.creation_ownedByOther = "Possédé par un autre utilisateur"; diff --git a/customize.dist/translations/messages.js b/customize.dist/translations/messages.js index f0eeda3bc..a80616a2f 100644 --- a/customize.dist/translations/messages.js +++ b/customize.dist/translations/messages.js @@ -1107,11 +1107,13 @@ define(function () { // Creation page out.creation_404 = "This pad not longer exists. Use the following form to create a new pad."; out.creation_ownedTitle = "Type of pad"; - out.creation_ownedTrue = "Owned pad"; + out.creation_owned = "Owned pad"; // Creation page + out.creation_ownedTrue = "Owned pad"; // Settings out.creation_ownedFalse = "Open pad"; out.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."; out.creation_owned2 = "An open pad doesn't have any owner and thus, it can't be deleted from the server unless it has reached its expiration time."; out.creation_expireTitle = "Life time"; + out.creation_expire = "Expiring pad"; out.creation_expireTrue = "Add a life time"; out.creation_expireFalse = "Unlimited"; out.creation_expireHours = "Hour(s)"; @@ -1119,11 +1121,11 @@ define(function () { out.creation_expireMonths = "Month(s)"; out.creation_expire1 = "An unlimited pad will not be removed from the server until its owner deletes it."; out.creation_expire2 = "An expiring pad has a set lifetime, after which it will be automatically removed from the server and other users' CryptDrives."; - out.creation_createTitle = "Create a pad"; - out.creation_createFromTemplate = "From template"; - out.creation_createFromScratch = "From scratch"; - out.creation_settings = "New Pad settings"; - out.creation_saveSettings = "Save settings"; + out.creation_noTemplate = "No template"; + out.creation_newTemplate = "New template"; + out.creation_create = "Create"; + out.creation_saveSettings = "Remember these settings"; + out.creation_settings = "View more settings"; // Properties about creation data out.creation_owners = "Owners"; out.creation_ownedByOther = "Owned by another user"; diff --git a/www/common/common-ui-elements.js b/www/common/common-ui-elements.js index ce716640e..feb8de684 100644 --- a/www/common/common-ui-elements.js +++ b/www/common/common-ui-elements.js @@ -1829,10 +1829,11 @@ define([ }; // Title - $creation.append(h('h1.cp-creation-title', 'Create a new pad')); // XXX + var colorClass = 'cp-icon-color-'+type; + $creation.append(h('h1.cp-creation-title.'+colorClass, Messages['button_new'+type])); // Deleted pad warning - if (metadataMgr.getPrivateData().isDeleted || true) { // XXX + if (metadataMgr.getPrivateData().isDeleted) { $creation.append(h('div.cp-creation-deleted-container', h('div.cp-creation-deleted', Messages.creation_404) )); @@ -1858,23 +1859,22 @@ define([ checked: 'checked' }), h('span.cp-checkmark-mark'), - 'Owned pad' - ]), // XXX + Messages.creation_owned + ]), createHelper('/faq.html#keywords-owned', Messages.creation_owned1) ]); // Life time var expire = h('div.cp-creation-expire', [ - //Messages.creation_ownedTitle, h('label.cp-checkmark', [ h('input', { type: 'checkbox', id: 'cp-creation-expire' }), h('span.cp-checkmark-mark'), - 'Expiring pad' - ]), // XXX - createHelper('faq.html#keywords-expiring', Messages.creation_expire1), + Messages.creation_expire + ]), + createHelper('faq.html#keywords-expiring', Messages.creation_expire2), h('div.cp-creation-expire-picker', [ h('input#cp-creation-expire-val', { type: "number", @@ -1907,9 +1907,9 @@ define([ checked: 'checked' }), h('span.cp-checkmark-mark'), - 'Save settings' - ]), // XXX - createHelper('/settings/#creation', "View more settings") + Messages.creation_saveSettings + ]), + createHelper('/settings/#creation', Messages.creation_settings) ]); $(h('div#cp-creation-form', [ @@ -1930,12 +1930,12 @@ define([ return a.name < b.name ? -1 : 1; }); data.unshift({ - name: "No template", + name: Messages.creation_noTemplate, id: 0, icon: h('span.fa.fa-times') }); data.push({ - name: "New template", + name: Messages.creation_newTemplate, id: -1, icon: h('span.fa.fa-plus') }); @@ -2056,7 +2056,7 @@ define([ var $create = $(h('div.cp-creation-create')).appendTo($creation); - var $button = $('