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 5a02e61fe352a456c3f339e98218e65fb87c66c0..d596a79bc2026b633e0aff15a3db55c5226fbb3d 100644 (file)
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 efb623ee0c4d56b4692e65a44968bd400ee61b9b..a22fbc74d0dca486fa8454bb55bd689b3236b741 100644 (file)
--- 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"
 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 <EMAIL@ADDRESS>\n"
 "Language-Team: Zope 3 Developers <zope-dev@zope.org>\n"
 "PO-Revision-Date: 2015-04-15 17:00+0200\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Zope 3 Developers <zope-dev@zope.org>\n"


@@ -946,7 +946,7 @@ msgstr "Preferred languages"
 msgid "Please enter language codes separated by spaces."
 msgstr "Please enter language codes separated by spaces."
 
 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"
 
 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."
 
 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"
 
 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."
 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."
 
 "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"
 
 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."
 
 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"
 
 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."
 
 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"
 
 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."
 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."
 
 "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"
 
 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."
 
 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"
 
 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."
 
 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"
 
 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."
 
 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"
 
 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"
 
 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"
 
 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 "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."
 
 #~ 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 e7103f57701328a50815ae17c98979ae141c4cb2..9bd1fc3fc3c85702af128a1161761b5ab2456219 100644 (file)
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 e075be84e5606f3537fec8ffb1d9c095aebf6a60..2f92760407fd3cf55d774e31807f06aea8f03a1e 100644 (file)
--- 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"
 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"
 "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."
 
 #: 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"
 
 #: 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."
 
 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"
 
 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."
 
 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"
 
 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."
 
 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"
 
 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)."
 
 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"
 
 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."
 
 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"
 
 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."
 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."
 
 "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"
 
 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."
 
 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"
 
 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."
 
 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"
 
 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."
 
 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"
 
 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"
 
 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"
 
 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 "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é."
 
 #~ 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 8c18e8ac7af68089d3fcfc56ee2d3d6833377dc1..2b3fa42ab19838a4d36e3409bcaa700382770d68 100644 (file)
--- 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"
 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 <EMAIL@ADDRESS>\n"
 "Language-Team: Zope 3 Developers <zope-dev@zope.org>\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Zope 3 Developers <zope-dev@zope.org>\n"


@@ -887,7 +887,7 @@ msgstr ""
 msgid "Please enter language codes separated by spaces."
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 ""
 
 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 8a0c5400b352b1e848ebcab81adfda13cab8457d..1b9292d0458e994b5ebc4e80b9fe8f39b9ec38c4 100644 (file)
--- 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'),
                                        '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,
                                        '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 22425ae3f619705f95fe9391caf979340988e031..ed96bbfdabbf3803f0e9fe5a4eeabef8b090a985 100644 (file)
--- a/Products/Plinn/skins/custom_generic/reconfig_template.pt
+++ b/Products/Plinn/skins/custom_generic/reconfig_template.pt
@@ -1,52 +1,67 @@
-<?xml version="1.0" encoding="utf-8"?>
-<html xmlns:tal="http://xml.zope.org/namespaces/tal" xmlns:metal="http://xml.zope.org/namespaces/metal" xmlns:i18n="http://xml.zope.org/namespaces/i18n" metal:use-macro="context/main_template/macros/master">
+<html xmlns:tal="http://xml.zope.org/namespaces/tal"
+      xmlns:metal="http://xml.zope.org/namespaces/metal"
+      xmlns:i18n="http://xml.zope.org/namespaces/i18n"
+      metal:use-macro="context/main_template/macros/master">

   <head>
     <meta http-equiv="content-type" content="text/html;charset=UTF-8"/>
   </head>
   <body metal:fill-slot="main_no_tabs" i18n:domain="plinn" tal:omit-tag="" tal:define="form options/form">
     <h1 i18n:translate="">Configure the Portal</h1>
     <div class="config">
   <head>
     <meta http-equiv="content-type" content="text/html;charset=UTF-8"/>
   </head>
   <body metal:fill-slot="main_no_tabs" i18n:domain="plinn" tal:omit-tag="" tal:define="form options/form">
     <h1 i18n:translate="">Configure the Portal</h1>
     <div class="config">

-      <p i18n:translate="">This form is used to set the portal configuration
-  options.</p>
+      <p i18n:translate="">
+        This form is used to set the portal configuration options.
+      </p>

       <form method="post" tal:attributes="action form/action">
         <table class="TwoColumnForm">
           <tr>
             <th i18n:translate="">Portal 'From' name</th>
             <td>
       <form method="post" tal:attributes="action form/action">
         <table class="TwoColumnForm">
           <tr>
             <th i18n:translate="">Portal 'From' name</th>
             <td>

-              <input name="email_from_name" value="" tal:attributes="value form/email_from_name"/>
+              <input name="email_from_name" value=""
+                     tal:attributes="value form/email_from_name"/>

               <dl class="FieldHelp">
               <dl class="FieldHelp">

-                <dd i18n:translate="">When the portal generates mail, it uses this name as
-     its (apparent) sender.</dd>
+                <dd i18n:translate="">
+                  When the portal generates mail, it uses this name as its
+                  (apparent) sender.
+                </dd>

               </dl>
             </td>
           </tr>
           <tr>
             <th i18n:translate="">Portal 'From' address</th>
             <td>
               </dl>
             </td>
           </tr>
           <tr>
             <th i18n:translate="">Portal 'From' address</th>
             <td>

-              <input name="email_from_address" value="" tal:attributes="value form/email_from_address"/>
+              <input name="email_from_address" value=""
+                     tal:attributes="value form/email_from_address"/>

               <dl class="FieldHelp">
               <dl class="FieldHelp">

-                <dd i18n:translate="">When the portal generates mail, it uses this address
-     as its (apparent) return address.</dd>
+                <dd i18n:translate="">
+                  When the portal generates mail, it uses this address as its
+                  (apparent) return address.
+                </dd>

               </dl>
             </td>
           </tr>
           <tr>
             <th i18n:translate="">SMTP server</th>
             <td>
               </dl>
             </td>
           </tr>
           <tr>
             <th i18n:translate="">SMTP server</th>
             <td>

-              <input name="smtp_server" value="" tal:attributes="value form/smtp_server"/>
+              <input name="smtp_server" value=""
+                     tal:attributes="value form/smtp_server"/>

               <dl class="FieldHelp">
               <dl class="FieldHelp">

-                <dd i18n:translate="">This is the address of your local SMTP (out-going
-     mail) server.</dd>
+                <dd i18n:translate="">
+                  This is the address of your local SMTP (out-going mail)
+                  server.
+                </dd>

               </dl>
             </td>
           </tr>
           <tr>
             <th i18n:translate="">Portal title</th>
             <td>
               </dl>
             </td>
           </tr>
           <tr>
             <th i18n:translate="">Portal title</th>
             <td>

-              <input name="title" value="" tal:attributes="value form/title"/>
+              <input name="title" value=""
+                     tal:attributes="value form/title"/>

               <dl class="FieldHelp">
               <dl class="FieldHelp">

-                <dd i18n:translate="">This is the title which appears at the top of every
-     portal page.</dd>
+                <dd i18n:translate="">
+                  This is the title which appears at the top of every portal
+                  page.
+                </dd>

               </dl>
             </td>
           </tr>
               </dl>
             </td>
           </tr>


@@ -55,8 +70,10 @@
             <td class="TextField">
               <textarea name="description" rows="3" cols="40" tal:content="form/description"/>
               <dl class="FieldHelp">
             <td class="TextField">
               <textarea name="description" rows="3" cols="40" tal:content="form/description"/>
               <dl class="FieldHelp">

-                <dd i18n:translate=""> This description is made available via syndicated
-      content and elsewhere. It should be fairly brief.</dd>
+                <dd i18n:translate="">
+                  This description is made available via syndicated content and
+                  elsewhere. It should be fairly brief.
+                </dd>

               </dl>
             </td>
           </tr>
               </dl>
             </td>
           </tr>


@@ -65,66 +82,70 @@
             <td class="TextField">
               <textarea name="keywords:lines" rows="6" cols="40" tal:content="form/keywords"/>
               <dl class="FieldHelp">
             <td class="TextField">
               <textarea name="keywords:lines" rows="6" cols="40" tal:content="form/keywords"/>
               <dl class="FieldHelp">

-                <dd i18n:translate="">Keywords describing the portal. Type one keyword (or expression) per line.</dd>
+                <dd i18n:translate="">
+                  Keywords describing the portal. Type one keyword (or
+                  expression) per line.
+                </dd>

               </dl>
             </td>
           </tr>
               </dl>
             </td>
           </tr>

-          <tr i18n:domain="plinn">
+          <tr>

             <th i18n:translate="">Copyright notice</th>
             <td class="TextField">
             <th i18n:translate="">Copyright notice</th>
             <td class="TextField">

-              <input name="copyright_notice" value="" tal:attributes="value form/copyright_notice"/>
+              <input name="copyright_notice" value=""
+                     tal:attributes="value form/copyright_notice"/>

               <dl class="FieldHelp">
               <dl class="FieldHelp">

-                <dd i18n:translate="">Copyright notice displayed on the portal footer.</dd>
+                <dd i18n:translate="">
+                  Copyright notice displayed on the portal footer.
+                </dd>

               </dl>
             </td>
           </tr>
           <tr>
               </dl>
             </td>
           </tr>
           <tr>

-            <th i18n:translate="">Password policy</th>
+            <th i18n:translate="">Registration policy</th>

             <td>
               <label>
             <td>
               <label>

-                <input type="radio" name="validate_email:boolean" value="True" tal:attributes="checked form/validate_email"/>
-                <tal:span i18n:translate="">Generate and email members' initial
-    password</tal:span>
+                <input type="radio" name="validate_email:boolean" value="True"
+                       tal:attributes="checked form/validate_email"/>
+                <span i18n:translate="" tal:omit-tag="">
+                  Send email to new members to validate their registrations
+                </span>

               </label>
               <br/>
               <label>
               </label>
               <br/>
               <label>

-                <input type="radio" name="validate_email:boolean" value="False" tal:attributes="checked not:form/validate_email"/>
-                <tal:span i18n:translate="">Allow members to select their initial
-    password</tal:span>
+                <input type="radio" name="validate_email:boolean" value="False"
+                       tal:attributes="checked not:form/validate_email"/>
+                <span i18n:translate="" tal:omit-tag="">
+                  Allow new members to select their initial passwords
+                </span>

               </label>
             </td>
           </tr>
           <tr>
               </label>
             </td>
           </tr>
           <tr>

-            <th i18n:translate="">Portal default encoding</th>
+            <th i18n:translate="">Thumbnails size</th>

             <td>
             <td>

-              <input name="default_charset" value="" disabled="disabled" tal:attributes="value form/default_charset"/>
+              <input name="slide_size:int" value=""
+                     tal:attributes="value form/slide_size" size="5"/>

               <dl class="FieldHelp">
               <dl class="FieldHelp">

-                <dd i18n:translate="">Charset used to decode portal content strings.
-     If empty, 'ascii' is used.</dd>
+                <dd i18n:translate="">
+                  This is the size of the thumbnails in the photo album, in
+                  pixels.
+                </dd>

               </dl>
             </td>
           </tr>
           <tr>
               </dl>
             </td>
           </tr>
           <tr>

-            <th i18n:translate="">
-      Thumbnails size
-    </th>
-            <td>
-              <input name="slide_size:int" value="" tal:attributes="value form/slide_size" size="5"/>
-              <dl class="FieldHelp">
-                <dd i18n:translate="">This is the size of the thumbnails in the photo album, in pixels.</dd>
-              </dl>
-            </td>
-          </tr>
-          <tr i18n:domain="plinn">

             <th i18n:translate="">Default ajax options</th>
             <td>
               <label>
             <th i18n:translate="">Default ajax options</th>
             <td>
               <label>

-                <input type="checkbox" name="ajax_rootClickHandler:boolean" tal:attributes="checked form/ajax_rootClickHandler"/>
+                <input type="checkbox" name="ajax_rootClickHandler:boolean"
+                       tal:attributes="checked form/ajax_rootClickHandler"/>

                 <span i18n:translate="" tal:omit-tag="">Enable handling of all clicks over links</span>
               </label>
               <br/>
               <label>
                 <span i18n:translate="" tal:omit-tag="">Enable handling of all clicks over links</span>
               </label>
               <br/>
               <label>

-                <input type="checkbox" name="ajax_autoFormManager:boolean" tal:attributes="checked form/ajax_autoFormManager"/>
+                <input type="checkbox" name="ajax_autoFormManager:boolean"
+                       tal:attributes="checked form/ajax_autoFormManager"/>

                 <span i18n:translate="" tal:omit-tag="">Enable handling of all forms submissions</span>
               </label>
             </td>
                 <span i18n:translate="" tal:omit-tag="">Enable handling of all forms submissions</span>
               </label>
             </td>