From: Benoît Pin Date: Fri, 17 Apr 2015 08:43:56 +0000 (+0200) Subject: Remaniement du formulaire de configuration du portail. X-Git-Url: https://svn.cri.ensmp.fr/git/Plinn.git/commitdiff_plain/cb53449c564dc94a9eed16bc2a99006a78a1ec5a?hp=3ea03165707ec21e141b91c554596bc440872312 Remaniement du formulaire de configuration du portail. --- diff --git a/Products/Plinn/locales/en/LC_MESSAGES/plinn.mo b/Products/Plinn/locales/en/LC_MESSAGES/plinn.mo index 5a02e61..d596a79 100644 Binary files a/Products/Plinn/locales/en/LC_MESSAGES/plinn.mo and b/Products/Plinn/locales/en/LC_MESSAGES/plinn.mo differ diff --git a/Products/Plinn/locales/en/LC_MESSAGES/plinn.po b/Products/Plinn/locales/en/LC_MESSAGES/plinn.po index efb623e..a22fbc7 100644 --- a/Products/Plinn/locales/en/LC_MESSAGES/plinn.po +++ b/Products/Plinn/locales/en/LC_MESSAGES/plinn.po @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: 2.0 beta 1\n" -"POT-Creation-Date: Fri Apr 17 09:59:32 2015\n" +"POT-Creation-Date: Fri Apr 17 10:39:07 2015\n" "PO-Revision-Date: 2015-04-15 17:00+0200\n" "Last-Translator: FULL NAME \n" "Language-Team: Zope 3 Developers \n" @@ -946,7 +946,7 @@ msgstr "Preferred languages" msgid "Please enter language codes separated by spaces." msgstr "Please enter language codes separated by spaces." -#: n/skins/custom_generic/reconfig_template.pt:7 +#: n/skins/custom_generic/reconfig_template.pt:9 msgid "Configure the Portal" msgstr "Configure the Portal" @@ -964,11 +964,11 @@ msgid "" msgstr "" "When the portal generates mail, it uses this name as its (apparent) sender." -#: n/skins/custom_generic/reconfig_template.pt:28 +#: n/skins/custom_generic/reconfig_template.pt:30 msgid "Portal 'From' address" msgstr "Portal 'From' address" -#: n/skins/custom_generic/reconfig_template.pt:33 +#: n/skins/custom_generic/reconfig_template.pt:35 msgid "" "When the portal generates mail, it uses this address as its (apparent) " "return address." @@ -976,27 +976,27 @@ msgstr "" "When the portal generates mail, it uses this address as its (apparent) " "return address." -#: n/skins/custom_generic/reconfig_template.pt:39 +#: n/skins/custom_generic/reconfig_template.pt:43 msgid "SMTP server" msgstr "SMTP server" -#: n/skins/custom_generic/reconfig_template.pt:44 +#: n/skins/custom_generic/reconfig_template.pt:48 msgid "This is the address of your local SMTP (out-going mail) server." msgstr "This is the address of your local SMTP (out-going mail) server." -#: n/skins/custom_generic/reconfig_template.pt:50 +#: n/skins/custom_generic/reconfig_template.pt:56 msgid "Portal title" msgstr "Portal title" -#: n/skins/custom_generic/reconfig_template.pt:54 +#: n/skins/custom_generic/reconfig_template.pt:61 msgid "This is the title which appears at the top of every portal page." msgstr "This is the title which appears at the top of every portal page." -#: n/skins/custom_generic/reconfig_template.pt:60 +#: n/skins/custom_generic/reconfig_template.pt:69 msgid "Portal description" msgstr "Portal description" -#: n/skins/custom_generic/reconfig_template.pt:64 +#: n/skins/custom_generic/reconfig_template.pt:73 msgid "" "This description is made available via syndicated content and elsewhere. It " "should be fairly brief." @@ -1004,63 +1004,53 @@ msgstr "" "This description is made available via syndicated content and elsewhere. It " "should be fairly brief." -#: n/skins/custom_generic/reconfig_template.pt:70 +#: n/skins/custom_generic/reconfig_template.pt:81 msgid "Keywords" msgstr "Keywords" -#: n/skins/custom_generic/reconfig_template.pt:74 +#: n/skins/custom_generic/reconfig_template.pt:85 msgid "" "Keywords describing the portal. Type one keyword (or expression) per line." msgstr "" "Keywords describing the portal. Type one keyword (or expression) per line." -#: n/skins/custom_generic/reconfig_template.pt:79 +#: n/skins/custom_generic/reconfig_template.pt:93 msgid "Copyright notice" msgstr "Copyright notice" -#: n/skins/custom_generic/reconfig_template.pt:83 +#: n/skins/custom_generic/reconfig_template.pt:98 msgid "Copyright notice displayed on the portal footer." msgstr "Copyright notice displayed on the portal footer." -#: n/skins/custom_generic/reconfig_template.pt:88 -msgid "Password policy" -msgstr "Password policy" +#: n/skins/custom_generic/reconfig_template.pt:105 +msgid "Registration policy" +msgstr "Registration policy" -#: n/skins/custom_generic/reconfig_template.pt:92 -msgid "Generate and email members' initial password" -msgstr "Generate and email members' initial password" +#: n/skins/custom_generic/reconfig_template.pt:110 +msgid "Send email to new members to validate their registrations" +msgstr "Send email to new members to validate their registrations" -#: n/skins/custom_generic/reconfig_template.pt:97 -msgid "Allow members to select their initial password" -msgstr "Allow members to select their initial password" +#: n/skins/custom_generic/reconfig_template.pt:118 +msgid "Allow new members to select their initial passwords" +msgstr "Allow new members to select their initial passwords" -#: n/skins/custom_generic/reconfig_template.pt:102 -msgid "Portal default encoding" -msgstr "Portal default encoding" - -#: n/skins/custom_generic/reconfig_template.pt:107 -msgid "" -"Charset used to decode portal content strings. If empty, 'ascii' is used." -msgstr "" -"Charset used to decode portal content strings. If empty, 'ascii' is used." - -#: n/skins/custom_generic/reconfig_template.pt:113 +#: n/skins/custom_generic/reconfig_template.pt:125 msgid "Thumbnails size" msgstr "Thumbnails size" -#: n/skins/custom_generic/reconfig_template.pt:119 +#: n/skins/custom_generic/reconfig_template.pt:130 msgid "This is the size of the thumbnails in the photo album, in pixels." msgstr "This is the size of the thumbnails in the photo album, in pixels." -#: n/skins/custom_generic/reconfig_template.pt:124 +#: n/skins/custom_generic/reconfig_template.pt:138 msgid "Default ajax options" msgstr "Default ajax options" -#: n/skins/custom_generic/reconfig_template.pt:128 +#: n/skins/custom_generic/reconfig_template.pt:143 msgid "Enable handling of all clicks over links" msgstr "Enable handling of all clicks over links" -#: n/skins/custom_generic/reconfig_template.pt:133 +#: n/skins/custom_generic/reconfig_template.pt:149 msgid "Enable handling of all forms submissions" msgstr "Enable handling of all forms submissions" @@ -2953,6 +2943,26 @@ msgstr "Directory" msgid "Configure portal" msgstr "Configure portal" +#~ msgid "Registration option" +#~ msgstr "Registration option" + +#~ msgid "Password policy" +#~ msgstr "Password policy" + +#~ msgid "Generate and email members' initial password" +#~ msgstr "Generate and email members' initial password" + +#~ msgid "Allow members to select their initial password" +#~ msgstr "Allow members to select their initial password" + +#~ msgid "Portal default encoding" +#~ msgstr "Portal default encoding" + +#~ msgid "" +#~ "Charset used to decode portal content strings. If empty, 'ascii' is used." +#~ msgstr "" +#~ "Charset used to decode portal content strings. If empty, 'ascii' is used." + #~ msgid "\"%s\" username not found." #~ msgstr "\"%s\" username not found." diff --git a/Products/Plinn/locales/fr/LC_MESSAGES/plinn.mo b/Products/Plinn/locales/fr/LC_MESSAGES/plinn.mo index e7103f5..9bd1fc3 100644 Binary files a/Products/Plinn/locales/fr/LC_MESSAGES/plinn.mo and b/Products/Plinn/locales/fr/LC_MESSAGES/plinn.mo differ diff --git a/Products/Plinn/locales/fr/LC_MESSAGES/plinn.po b/Products/Plinn/locales/fr/LC_MESSAGES/plinn.po index e075be8..2f92760 100644 --- a/Products/Plinn/locales/fr/LC_MESSAGES/plinn.po +++ b/Products/Plinn/locales/fr/LC_MESSAGES/plinn.po @@ -1,7 +1,7 @@ msgid "" msgstr "" "Project-Id-Version: Plinn 2.0\n" -"POT-Creation-Date: Fri Apr 17 09:59:32 2015\n" +"POT-Creation-Date: Fri Apr 17 10:39:07 2015\n" "PO-Revision-Date: 2015-04-15 15:06+0200\n" "Last-Translator: Benoît PIN\n" "Language-Team: CRI http://cri.ensmp.fr\n" @@ -34,7 +34,8 @@ msgstr "Votre mot de passe doit comporter au moins 8 caractères." #: n/RegistrationTool.py:236 msgid "Your password and confirmation did not match. Please try again." -msgstr "Votre mot de passe et sa confirmation sont différents. Essayez à nouveau." +msgstr "" +"Votre mot de passe et sa confirmation sont différents. Essayez à nouveau." #: n/RegistrationTool.py:288 msgid "Complete your registration on the %s website" @@ -946,7 +947,7 @@ msgstr "Préférences linguistiques" msgid "Please enter language codes separated by spaces." msgstr "Veuillez entrer les codes de langues, séparés par des espaces." -#: n/skins/custom_generic/reconfig_template.pt:7 +#: n/skins/custom_generic/reconfig_template.pt:9 msgid "Configure the Portal" msgstr "Configurer le portail" @@ -964,38 +965,38 @@ msgid "" msgstr "" "Lorsque le portail envoie un mail, il utilise ce nom pour l'expéditeur." -#: n/skins/custom_generic/reconfig_template.pt:28 +#: n/skins/custom_generic/reconfig_template.pt:30 msgid "Portal 'From' address" msgstr "Email d'expéditeur" -#: n/skins/custom_generic/reconfig_template.pt:33 +#: n/skins/custom_generic/reconfig_template.pt:35 msgid "" "When the portal generates mail, it uses this address as its (apparent) " "return address." msgstr "" "Lorsque le portail envoie un mail, il utilise cette adresse d'expédition." -#: n/skins/custom_generic/reconfig_template.pt:39 +#: n/skins/custom_generic/reconfig_template.pt:43 msgid "SMTP server" msgstr "Serveur SMTP" -#: n/skins/custom_generic/reconfig_template.pt:44 +#: n/skins/custom_generic/reconfig_template.pt:48 msgid "This is the address of your local SMTP (out-going mail) server." msgstr "Ceci est l'adresse de votre serveur SMTP (courrier sortant)." -#: n/skins/custom_generic/reconfig_template.pt:50 +#: n/skins/custom_generic/reconfig_template.pt:56 msgid "Portal title" msgstr "Titre du portail" -#: n/skins/custom_generic/reconfig_template.pt:54 +#: n/skins/custom_generic/reconfig_template.pt:61 msgid "This is the title which appears at the top of every portal page." msgstr "Ceci est le titre qui apparaîtra en haut de chaque page." -#: n/skins/custom_generic/reconfig_template.pt:60 +#: n/skins/custom_generic/reconfig_template.pt:69 msgid "Portal description" msgstr "Description du portail" -#: n/skins/custom_generic/reconfig_template.pt:64 +#: n/skins/custom_generic/reconfig_template.pt:73 msgid "" "This description is made available via syndicated content and elsewhere. It " "should be fairly brief." @@ -1003,65 +1004,54 @@ msgstr "" "Cette description est visible via les canaux de diffusion et partout " "ailleurs. Il est recommandé d'être concis." -#: n/skins/custom_generic/reconfig_template.pt:70 +#: n/skins/custom_generic/reconfig_template.pt:81 msgid "Keywords" msgstr "Mots clés" -#: n/skins/custom_generic/reconfig_template.pt:74 +#: n/skins/custom_generic/reconfig_template.pt:85 msgid "" "Keywords describing the portal. Type one keyword (or expression) per line." msgstr "" "Mots clés décrivant le portail. Entrez un mot (ou expression) par ligne." -#: n/skins/custom_generic/reconfig_template.pt:79 +#: n/skins/custom_generic/reconfig_template.pt:93 msgid "Copyright notice" msgstr "Mention légale" -#: n/skins/custom_generic/reconfig_template.pt:83 +#: n/skins/custom_generic/reconfig_template.pt:98 msgid "Copyright notice displayed on the portal footer." msgstr "Mention légale affichée sur le pied de page du portail." -#: n/skins/custom_generic/reconfig_template.pt:88 -msgid "Password policy" -msgstr "Option des mots de passe" - -#: n/skins/custom_generic/reconfig_template.pt:92 -msgid "Generate and email members' initial password" -msgstr "Générer et envoyer par e-mail les mots de passe initiaux aux membres" +#: n/skins/custom_generic/reconfig_template.pt:105 +msgid "Registration policy" +msgstr "Modalité d'inscription" -#: n/skins/custom_generic/reconfig_template.pt:97 -msgid "Allow members to select their initial password" -msgstr "Autoriser les membres à choisir leur mot de passe initial" +#: n/skins/custom_generic/reconfig_template.pt:110 +msgid "Send email to new members to validate their registrations" +msgstr "Envoyer un email aux nouveaux membres pour valider leurs inscriptions" -#: n/skins/custom_generic/reconfig_template.pt:102 -msgid "Portal default encoding" -msgstr "Encodage par défaut du portail" +#: n/skins/custom_generic/reconfig_template.pt:118 +msgid "Allow new members to select their initial passwords" +msgstr "Permettre aux nouveaux membre de choisir leurs mots de passe initiaux" -#: n/skins/custom_generic/reconfig_template.pt:107 -msgid "" -"Charset used to decode portal content strings. If empty, 'ascii' is used." -msgstr "" -"Encodage utilisé par le portail pour décoder les textes des contenus. Si ce " -"champ est laissé vide, c'est l'encodage ascii qui sera utilisé." - -#: n/skins/custom_generic/reconfig_template.pt:113 +#: n/skins/custom_generic/reconfig_template.pt:125 msgid "Thumbnails size" msgstr "Taille des vignettes" -#: n/skins/custom_generic/reconfig_template.pt:119 +#: n/skins/custom_generic/reconfig_template.pt:130 msgid "This is the size of the thumbnails in the photo album, in pixels." msgstr "" "C'est la taille, en pixels, utilisée pour les vignettes des albums photo." -#: n/skins/custom_generic/reconfig_template.pt:124 +#: n/skins/custom_generic/reconfig_template.pt:138 msgid "Default ajax options" msgstr "Options ajax par défaut" -#: n/skins/custom_generic/reconfig_template.pt:128 +#: n/skins/custom_generic/reconfig_template.pt:143 msgid "Enable handling of all clicks over links" msgstr "Activer l'interception de tous les clicks sur les liens" -#: n/skins/custom_generic/reconfig_template.pt:133 +#: n/skins/custom_generic/reconfig_template.pt:149 msgid "Enable handling of all forms submissions" msgstr "Activer l'interception de tous les envois de formulaires" @@ -2972,6 +2962,28 @@ msgstr "Annuaire" msgid "Configure portal" msgstr "Configurer portail" +#~ msgid "Registration option" +#~ msgstr "Option d'inscription" + +#~ msgid "Password policy" +#~ msgstr "Option des mots de passe" + +#~ msgid "Generate and email members' initial password" +#~ msgstr "" +#~ "Générer et envoyer par e-mail les mots de passe initiaux aux membres" + +#~ msgid "Allow members to select their initial password" +#~ msgstr "Autoriser les membres à choisir leur mot de passe initial" + +#~ msgid "Portal default encoding" +#~ msgstr "Encodage par défaut du portail" + +#~ msgid "" +#~ "Charset used to decode portal content strings. If empty, 'ascii' is used." +#~ msgstr "" +#~ "Encodage utilisé par le portail pour décoder les textes des contenus. Si " +#~ "ce champ est laissé vide, c'est l'encodage ascii qui sera utilisé." + #~ msgid "\"%s\" username not found." #~ msgstr "Nom : « %s » non trouvé." diff --git a/Products/Plinn/locales/plinn.pot b/Products/Plinn/locales/plinn.pot index 8c18e8a..2b3fa42 100644 --- a/Products/Plinn/locales/plinn.pot +++ b/Products/Plinn/locales/plinn.pot @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: 2.0 beta 1\n" -"POT-Creation-Date: Fri Apr 17 09:59:32 2015\n" +"POT-Creation-Date: Fri Apr 17 10:39:07 2015\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: Zope 3 Developers \n" @@ -887,7 +887,7 @@ msgstr "" msgid "Please enter language codes separated by spaces." msgstr "" -#: n/skins/custom_generic/reconfig_template.pt:7 +#: n/skins/custom_generic/reconfig_template.pt:9 msgid "Configure the Portal" msgstr "" @@ -903,91 +903,83 @@ msgstr "" msgid "When the portal generates mail, it uses this name as its (apparent) sender." msgstr "" -#: n/skins/custom_generic/reconfig_template.pt:28 +#: n/skins/custom_generic/reconfig_template.pt:30 msgid "Portal 'From' address" msgstr "" -#: n/skins/custom_generic/reconfig_template.pt:33 +#: n/skins/custom_generic/reconfig_template.pt:35 msgid "When the portal generates mail, it uses this address as its (apparent) return address." msgstr "" -#: n/skins/custom_generic/reconfig_template.pt:39 +#: n/skins/custom_generic/reconfig_template.pt:43 msgid "SMTP server" msgstr "" -#: n/skins/custom_generic/reconfig_template.pt:44 +#: n/skins/custom_generic/reconfig_template.pt:48 msgid "This is the address of your local SMTP (out-going mail) server." msgstr "" -#: n/skins/custom_generic/reconfig_template.pt:50 +#: n/skins/custom_generic/reconfig_template.pt:56 msgid "Portal title" msgstr "" -#: n/skins/custom_generic/reconfig_template.pt:54 +#: n/skins/custom_generic/reconfig_template.pt:61 msgid "This is the title which appears at the top of every portal page." msgstr "" -#: n/skins/custom_generic/reconfig_template.pt:60 +#: n/skins/custom_generic/reconfig_template.pt:69 msgid "Portal description" msgstr "" -#: n/skins/custom_generic/reconfig_template.pt:64 +#: n/skins/custom_generic/reconfig_template.pt:73 msgid "This description is made available via syndicated content and elsewhere. It should be fairly brief." msgstr "" -#: n/skins/custom_generic/reconfig_template.pt:70 +#: n/skins/custom_generic/reconfig_template.pt:81 msgid "Keywords" msgstr "" -#: n/skins/custom_generic/reconfig_template.pt:74 +#: n/skins/custom_generic/reconfig_template.pt:85 msgid "Keywords describing the portal. Type one keyword (or expression) per line." msgstr "" -#: n/skins/custom_generic/reconfig_template.pt:79 +#: n/skins/custom_generic/reconfig_template.pt:93 msgid "Copyright notice" msgstr "" -#: n/skins/custom_generic/reconfig_template.pt:83 +#: n/skins/custom_generic/reconfig_template.pt:98 msgid "Copyright notice displayed on the portal footer." msgstr "" -#: n/skins/custom_generic/reconfig_template.pt:88 -msgid "Password policy" +#: n/skins/custom_generic/reconfig_template.pt:105 +msgid "Registration policy" msgstr "" -#: n/skins/custom_generic/reconfig_template.pt:92 -msgid "Generate and email members' initial password" +#: n/skins/custom_generic/reconfig_template.pt:110 +msgid "Send email to new members to validate their registrations" msgstr "" -#: n/skins/custom_generic/reconfig_template.pt:97 -msgid "Allow members to select their initial password" +#: n/skins/custom_generic/reconfig_template.pt:118 +msgid "Allow new members to select their initial passwords" msgstr "" -#: n/skins/custom_generic/reconfig_template.pt:102 -msgid "Portal default encoding" -msgstr "" - -#: n/skins/custom_generic/reconfig_template.pt:107 -msgid "Charset used to decode portal content strings. If empty, 'ascii' is used." -msgstr "" - -#: n/skins/custom_generic/reconfig_template.pt:113 +#: n/skins/custom_generic/reconfig_template.pt:125 msgid "Thumbnails size" msgstr "" -#: n/skins/custom_generic/reconfig_template.pt:119 +#: n/skins/custom_generic/reconfig_template.pt:130 msgid "This is the size of the thumbnails in the photo album, in pixels." msgstr "" -#: n/skins/custom_generic/reconfig_template.pt:124 +#: n/skins/custom_generic/reconfig_template.pt:138 msgid "Default ajax options" msgstr "" -#: n/skins/custom_generic/reconfig_template.pt:128 +#: n/skins/custom_generic/reconfig_template.pt:143 msgid "Enable handling of all clicks over links" msgstr "" -#: n/skins/custom_generic/reconfig_template.pt:133 +#: n/skins/custom_generic/reconfig_template.pt:149 msgid "Enable handling of all forms submissions" msgstr "" diff --git a/Products/Plinn/skins/custom_generic/reconfig_form.py b/Products/Plinn/skins/custom_generic/reconfig_form.py index 8a0c540..1b9292d 100644 --- a/Products/Plinn/skins/custom_generic/reconfig_form.py +++ b/Products/Plinn/skins/custom_generic/reconfig_form.py @@ -29,7 +29,6 @@ options['form'] = { 'action': target, 'keywords': '\n'.join(ptool.getProperty('keywords', [])), 'copyright_notice': ptool.getProperty('copyright_notice'), 'validate_email': ptool.getProperty('validate_email'), - 'default_charset': ptool.getProperty('default_charset', ''), 'slide_size' : ptool.getProperty('slide_size', ''), 'listButtonInfos': tuple(buttons), 'ajax_rootClickHandler' : ajax_config & 1 == 1, diff --git a/Products/Plinn/skins/custom_generic/reconfig_template.pt b/Products/Plinn/skins/custom_generic/reconfig_template.pt index 22425ae..ed96bbf 100644 --- a/Products/Plinn/skins/custom_generic/reconfig_template.pt +++ b/Products/Plinn/skins/custom_generic/reconfig_template.pt @@ -1,52 +1,67 @@ - - +

Configure the Portal

-

This form is used to set the portal configuration - options.

+

+ This form is used to set the portal configuration options. +

@@ -55,8 +70,10 @@
Portal 'From' name - +
-
When the portal generates mail, it uses this name as - its (apparent) sender.
+
+ When the portal generates mail, it uses this name as its + (apparent) sender. +
Portal 'From' address - +
-
When the portal generates mail, it uses this address - as its (apparent) return address.
+
+ When the portal generates mail, it uses this address as its + (apparent) return address. +
SMTP server - +
-
This is the address of your local SMTP (out-going - mail) server.
+
+ This is the address of your local SMTP (out-going mail) + server. +
Portal title - +
-
This is the title which appears at the top of every - portal page.
+
+ This is the title which appears at the top of every portal + page. +