From 4bb6988027b9396a5f0ed10509f15dc2a230c61c Mon Sep 17 00:00:00 2001
From: =?utf8?q?Benoi=CC=82t=20Pin?= <benoit.pin@gmail.com>
Date: Wed, 3 Sep 2014 23:39:33 +0200
Subject: [PATCH] Aide + localisation.
---
locales/en/LC_MESSAGES/photoprint.po | 35 ++++++++++++++++-------
locales/fr/LC_MESSAGES/photoprint.mo | Bin 13531 -> 14196 bytes
locales/fr/LC_MESSAGES/photoprint.po | 40 +++++++++++++++++++--------
locales/photoprint.pot | 34 +++++++++++++++--------
skins/customer_join_template.pt | 17 ++++++++++--
5 files changed, 91 insertions(+), 35 deletions(-)
diff --git a/locales/en/LC_MESSAGES/photoprint.po b/locales/en/LC_MESSAGES/photoprint.po
index 10842db..9dff8f9 100644
--- a/locales/en/LC_MESSAGES/photoprint.po
+++ b/locales/en/LC_MESSAGES/photoprint.po
@@ -84,47 +84,62 @@ msgstr ""
msgid "Member ID"
msgstr ""
-#: t/skins/customer_join_template.pt:48 t/skins/customer_login_form.pt:45
+#: t/skins/customer_join_template.pt:45
+msgid ""
+"Your login must starts with a letter, followed only by <br /> letters, "
+"numbers or _ (underscore).<br /> No accent, nopunctuation or special chars."
+"<br /> Those restrictions are only for this login field."
+msgstr ""
+
+#: t/skins/customer_join_template.pt:56 t/skins/customer_login_form.pt:45
msgid "Password"
msgstr ""
-#: t/skins/customer_join_template.pt:54
+#: t/skins/customer_join_template.pt:62
msgid "Password (confirm)"
msgstr ""
-#: t/skins/customer_join_template.pt:93 t/skins/personalize_form.pt:46
+#: t/skins/customer_join_template.pt:73
+msgid "Access to private Images"
+msgstr ""
+
+#: t/skins/customer_join_template.pt:75
+msgid "Please enter the access code to view / purchase private images."
+msgstr ""
+
+#: t/skins/customer_join_template.pt:104 t/skins/personalize_form.pt:46
msgid "Billing informations"
msgstr ""
-#: t/skins/customer_join_template.pt:97 t/skins/order_view_template.pt:35
+#: t/skins/customer_join_template.pt:108 t/skins/order_view_template.pt:35
#: t/skins/order_view_template.pt:60 t/skins/personalize_form.pt:50
msgid "Address"
msgstr ""
-#: t/skins/customer_join_template.pt:104 t/skins/order_view_template.pt:39
+#: t/skins/customer_join_template.pt:115 t/skins/order_view_template.pt:39
#: t/skins/order_view_template.pt:64 t/skins/personalize_form.pt:57
msgid "City"
msgstr ""
-#: t/skins/customer_join_template.pt:110 t/skins/order_view_template.pt:43
+#: t/skins/customer_join_template.pt:121 t/skins/order_view_template.pt:43
#: t/skins/order_view_template.pt:68 t/skins/personalize_form.pt:63
msgid "Zip code"
msgstr ""
-#: t/skins/customer_join_template.pt:116 t/skins/order_view_template.pt:47
+#: t/skins/customer_join_template.pt:127 t/skins/order_view_template.pt:47
#: t/skins/order_view_template.pt:72 t/skins/personalize_form.pt:69
msgid "Country"
msgstr ""
-#: t/skins/customer_join_template.pt:126 t/skins/personalize_form.pt:79
+#: t/skins/customer_join_template.pt:137 t/skins/personalize_form.pt:79
msgid "Phone"
msgstr ""
-#: t/skins/customer_join_template.pt:136
+#: t/skins/customer_join_template.pt:147
msgid "Register"
msgstr ""
-#: t/skins/customer_join_template.pt:137
+#: t/skins/customer_join_template.pt:148
#: t/skins/photoprint_templates_edit_template.pt:142
msgid "Cancel"
msgstr ""
diff --git a/locales/fr/LC_MESSAGES/photoprint.mo b/locales/fr/LC_MESSAGES/photoprint.mo
index 351787e9922f0fc3473a340d812a242f7d6addd8..3bdcd3483c9a5c8b54eca738a6b1cef523f1411c 100644
GIT binary patch
delta 4170
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
delta 3542
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
P-Cc8~SE|2kfZO#iZ`(f=
diff --git a/locales/fr/LC_MESSAGES/photoprint.po b/locales/fr/LC_MESSAGES/photoprint.po
index bb0f5b3..840f7e4 100644
--- a/locales/fr/LC_MESSAGES/photoprint.po
+++ b/locales/fr/LC_MESSAGES/photoprint.po
@@ -1,7 +1,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Plinn 2.0\n"
-"POT-Creation-Date: Wed Sep 3 23:10:26 2014\n"
+"POT-Creation-Date: Wed Sep 3 23:34:02 2014\n"
"PO-Revision-Date: 2014-09-01 23:39+0200\n"
"Last-Translator: Benoît PIN\n"
"Language-Team: CRI http://cri.ensmp.fr\n"
@@ -104,47 +104,65 @@ msgstr "E-mail"
msgid "Member ID"
msgstr "Login"
-#: t/skins/customer_join_template.pt:48 t/skins/customer_login_form.pt:45
+#: t/skins/customer_join_template.pt:45
+msgid ""
+"Your login must starts with a letter, followed only by <br /> letters, "
+"numbers or _ (underscore).<br /> No accent, nopunctuation or special chars."
+"<br /> Those restrictions are only for this login field."
+msgstr ""
+"Votre login doit commencer par une lettre, suivi par des lettres,<br/>\n"
+"des chiffres ou _ (underscore). Pas d'accent, pas de ponctuation, pas de<br/>\n"
+"caractères spéciaux. Ces restrictions ne s'appliquent qu'à ce champ."
+
+#: t/skins/customer_join_template.pt:56 t/skins/customer_login_form.pt:45
msgid "Password"
msgstr "Mot de passe"
-#: t/skins/customer_join_template.pt:54
+#: t/skins/customer_join_template.pt:62
msgid "Password (confirm)"
msgstr "Mot de passe (confirmation)"
-#: t/skins/customer_join_template.pt:93 t/skins/personalize_form.pt:46
+#: t/skins/customer_join_template.pt:73
+msgid "Access to private Images"
+msgstr "Accès à des images privées"
+
+#: t/skins/customer_join_template.pt:75
+msgid "Please enter the access code to view / purchase private images."
+msgstr "Veuillez entrer le code d'accès pour voir / acheter des images privées."
+
+#: t/skins/customer_join_template.pt:104 t/skins/personalize_form.pt:46
msgid "Billing informations"
msgstr "Informations de facturation"
-#: t/skins/customer_join_template.pt:97 t/skins/order_view_template.pt:35
+#: t/skins/customer_join_template.pt:108 t/skins/order_view_template.pt:35
#: t/skins/order_view_template.pt:60 t/skins/personalize_form.pt:50
msgid "Address"
msgstr "Adresse"
-#: t/skins/customer_join_template.pt:104 t/skins/order_view_template.pt:39
+#: t/skins/customer_join_template.pt:115 t/skins/order_view_template.pt:39
#: t/skins/order_view_template.pt:64 t/skins/personalize_form.pt:57
msgid "City"
msgstr "Ville"
-#: t/skins/customer_join_template.pt:110 t/skins/order_view_template.pt:43
+#: t/skins/customer_join_template.pt:121 t/skins/order_view_template.pt:43
#: t/skins/order_view_template.pt:68 t/skins/personalize_form.pt:63
msgid "Zip code"
msgstr "Code postal"
-#: t/skins/customer_join_template.pt:116 t/skins/order_view_template.pt:47
+#: t/skins/customer_join_template.pt:127 t/skins/order_view_template.pt:47
#: t/skins/order_view_template.pt:72 t/skins/personalize_form.pt:69
msgid "Country"
msgstr "Pays"
-#: t/skins/customer_join_template.pt:126 t/skins/personalize_form.pt:79
+#: t/skins/customer_join_template.pt:137 t/skins/personalize_form.pt:79
msgid "Phone"
msgstr "Téléphone"
-#: t/skins/customer_join_template.pt:136
+#: t/skins/customer_join_template.pt:147
msgid "Register"
msgstr "S'enregistrer"
-#: t/skins/customer_join_template.pt:137
+#: t/skins/customer_join_template.pt:148
#: t/skins/photoprint_templates_edit_template.pt:142
msgid "Cancel"
msgstr "Annuler"
diff --git a/locales/photoprint.pot b/locales/photoprint.pot
index 3ade077..fef7ace 100644
--- a/locales/photoprint.pot
+++ b/locales/photoprint.pot
@@ -14,7 +14,7 @@
msgid ""
msgstr ""
"Project-Id-Version: Meaningless\n"
-"POT-Creation-Date: Wed Sep 3 23:10:26 2014\n"
+"POT-Creation-Date: Wed Sep 3 23:34:02 2014\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"
@@ -107,58 +107,70 @@ msgstr ""
msgid "Member ID"
msgstr ""
-#: t/skins/customer_join_template.pt:48
+#: t/skins/customer_join_template.pt:45
+msgid "Your login must starts with a letter, followed only by <br /> letters, numbers or _ (underscore).<br /> No accent, nopunctuation or special chars.<br /> Those restrictions are only for this login field."
+msgstr ""
+
+#: t/skins/customer_join_template.pt:56
#: t/skins/customer_login_form.pt:45
msgid "Password"
msgstr ""
-#: t/skins/customer_join_template.pt:54
+#: t/skins/customer_join_template.pt:62
msgid "Password (confirm)"
msgstr ""
-#: t/skins/customer_join_template.pt:93
+#: t/skins/customer_join_template.pt:73
+msgid "Access to private Images"
+msgstr ""
+
+#: t/skins/customer_join_template.pt:75
+msgid "Please enter the access code to view / purchase private images."
+msgstr ""
+
+#: t/skins/customer_join_template.pt:104
#: t/skins/personalize_form.pt:46
msgid "Billing informations"
msgstr ""
-#: t/skins/customer_join_template.pt:97
+#: t/skins/customer_join_template.pt:108
#: t/skins/order_view_template.pt:35
#: t/skins/order_view_template.pt:60
#: t/skins/personalize_form.pt:50
msgid "Address"
msgstr ""
-#: t/skins/customer_join_template.pt:104
+#: t/skins/customer_join_template.pt:115
#: t/skins/order_view_template.pt:39
#: t/skins/order_view_template.pt:64
#: t/skins/personalize_form.pt:57
msgid "City"
msgstr ""
-#: t/skins/customer_join_template.pt:110
+#: t/skins/customer_join_template.pt:121
#: t/skins/order_view_template.pt:43
#: t/skins/order_view_template.pt:68
#: t/skins/personalize_form.pt:63
msgid "Zip code"
msgstr ""
-#: t/skins/customer_join_template.pt:116
+#: t/skins/customer_join_template.pt:127
#: t/skins/order_view_template.pt:47
#: t/skins/order_view_template.pt:72
#: t/skins/personalize_form.pt:69
msgid "Country"
msgstr ""
-#: t/skins/customer_join_template.pt:126
+#: t/skins/customer_join_template.pt:137
#: t/skins/personalize_form.pt:79
msgid "Phone"
msgstr ""
-#: t/skins/customer_join_template.pt:136
+#: t/skins/customer_join_template.pt:147
msgid "Register"
msgstr ""
-#: t/skins/customer_join_template.pt:137
+#: t/skins/customer_join_template.pt:148
#: t/skins/photoprint_templates_edit_template.pt:142
msgid "Cancel"
msgstr ""
diff --git a/skins/customer_join_template.pt b/skins/customer_join_template.pt
index ba4878a..92680ff 100644
--- a/skins/customer_join_template.pt
+++ b/skins/customer_join_template.pt
@@ -41,6 +41,14 @@
<td>
<input type="text" name="member_id" size="30" value=""
tal:attributes="value options/member_id" />
+ <dl class="FieldHelp">
+ <dd i18n:translate="">
+ Your login must starts with a letter, followed only by <br/>
+ letters, numbers or _ (underscore).<br/>
+ No accent, nopunctuation or special chars.<br/>
+ Those restrictions are only for this login field.
+ </dd>
+ </dl>
</td>
</tr>
<tal:case tal:condition="not: options/validate_email">
@@ -62,9 +70,12 @@
</tr>
<tr>
<td colspan="2" style="text-align:center">
- <h3>Accès à des images privées</h3>
- veuillez entrer le code d'accès pour accéder / acheter les images<br/>
- d'un événement privé couvert par les photographes de notre agence.
+ <h3 i18n:translate="">Access to private Images</h3>
+ <dl class="FieldHelp">
+ <dd i18n:translate="">
+ Please enter the access code to view / purchase private images.
+ </dd>
+ </dl>
</td>
</tr>
<tr>
--
2.20.1