projects / photoprint.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 8044c73)
Aide + localisation.
authorBenoît Pin <benoit.pin@gmail.com>
Wed, 3 Sep 2014 21:39:33 +0000 (23:39 +0200)
committerBenoît Pin <benoit.pin@gmail.com>
Wed, 3 Sep 2014 21:39:33 +0000 (23:39 +0200)
locales/en/LC_MESSAGES/photoprint.po patch | blob | history
locales/fr/LC_MESSAGES/photoprint.mo patch | blob | history
locales/fr/LC_MESSAGES/photoprint.po patch | blob | history
locales/photoprint.pot patch | blob | history
skins/customer_join_template.pt patch | blob | history

diff --git a/locales/en/LC_MESSAGES/photoprint.po b/locales/en/LC_MESSAGES/photoprint.po
index 10842db..9dff8f9 100644 (file)
--- a/locales/en/LC_MESSAGES/photoprint.po
+++ b/locales/en/LC_MESSAGES/photoprint.po
@@ -84,47 +84,62 @@ msgstr ""
 msgid "Member ID"
 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 ""
 
 msgid "Password"
 msgstr ""
 
-#: t/skins/customer_join_template.pt:54
+#: t/skins/customer_join_template.pt:62
 msgid "Password (confirm)"
 msgstr ""
 
 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 ""
 
 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/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/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/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/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 ""
 
 msgid "Phone"
 msgstr ""
 
-#: t/skins/customer_join_template.pt:136
+#: t/skins/customer_join_template.pt:147
 msgid "Register"
 msgstr ""
 
 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 ""
 #: 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 351787e..3bdcd34 100644 (file)
Binary files a/locales/fr/LC_MESSAGES/photoprint.mo and b/locales/fr/LC_MESSAGES/photoprint.mo differ
diff --git a/locales/fr/LC_MESSAGES/photoprint.po b/locales/fr/LC_MESSAGES/photoprint.po
index bb0f5b3..840f7e4 100644 (file)
--- 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"
 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"
 "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"
 
 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"
 
 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)"
 
 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"
 
 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/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/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/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/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"
 
 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"
 
 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"
 #: 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 (file)
--- a/locales/photoprint.pot
+++ b/locales/photoprint.pot
@@ -14,7 +14,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Meaningless\n"
 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"
 "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 ""
 
 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_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 ""
 
 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/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/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/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/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/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/personalize_form.pt:79
 msgid "Phone"
 msgstr ""
 
-#: t/skins/customer_join_template.pt:136
+#: t/skins/customer_join_template.pt:147
 msgid "Register"
 msgstr ""
 
 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 ""
 #: 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 (file)
--- 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" />
          <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">
          </td>
         </tr>
         <tal:case tal:condition="not: options/validate_email">
@@ -62,9 +70,12 @@
         </tr>
         <tr>
           <td colspan="2" style="text-align:center">
         </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>
           </td>
         </tr>
         <tr>
photoprint Plinn product