Mise à jour localisation.

diff --git a/locales/en/LC_MESSAGES/photoprint.po b/locales/en/LC_MESSAGES/photoprint.po
index acae00d..7f97f28 100644 (file)
--- a/locales/en/LC_MESSAGES/photoprint.po
+++ b/locales/en/LC_MESSAGES/photoprint.po
@@ -61,7 +61,7 @@ msgid "Please accept general conditions of sales."
 msgstr ""
 
 #: t/skins/my_orders.py:17 t/skins/order_list.py:14
-#: t/skins/order_view_template.pt:182
+#: t/skins/order_view_template.pt:181
 msgid "Date"
 msgstr ""
 
@@ -91,7 +91,7 @@ msgstr ""
 #: t/skins/order_list_template.pt:37 t/skins/order_list_template.pt:50
 #: t/skins/order_manual_payment_form.pt:19
 #: t/skins/order_notify_done_form.pt:19 t/skins/order_notify_sent_form.pt:19
-#: t/skins/order_view_template.pt:87 t/skins/order_view_template.pt:193
+#: t/skins/order_view_template.pt:86 t/skins/order_view_template.pt:191
 msgid "${DYNAMIC_CONTENT}"
 msgstr ""
 
@@ -209,7 +209,7 @@ msgid "Tracking url"
 msgstr ""
 
 #: t/skins/order_printing_list_template.pt:22
-#: t/skins/order_view_template.pt:97
+#: t/skins/order_view_template.pt:96
 msgid "Image"
 msgstr ""
 
@@ -222,7 +222,7 @@ msgid "Format / type"
 msgstr ""
 
 #: t/skins/order_printing_list_template.pt:25
-#: t/skins/order_view_template.pt:99
+#: t/skins/order_view_template.pt:98
 msgid "Quantity"
 msgstr ""
 
@@ -254,53 +254,53 @@ msgstr ""
 msgid "Country"
 msgstr ""
 
-#: t/skins/order_view_template.pt:53 t/skins/order_view_template.pt:134
+#: t/skins/order_view_template.pt:53 t/skins/order_view_template.pt:133
 msgid "Shipping"
 msgstr ""
 
-#: t/skins/order_view_template.pt:84
+#: t/skins/order_view_template.pt:83
 msgid "Processing"
 msgstr ""
 
-#: t/skins/order_view_template.pt:98
+#: t/skins/order_view_template.pt:97
 msgid "Printing format and type"
 msgstr ""
 
-#: t/skins/order_view_template.pt:100
+#: t/skins/order_view_template.pt:99
 msgid "Unit price"
 msgstr ""
 
-#: t/skins/order_view_template.pt:101
+#: t/skins/order_view_template.pt:100
 #: t/skins/photoprint_templates_edit_template.pt:45
 #: t/skins/photoprint_templates_edit_template.pt:131
 msgid "VAT (%)"
 msgstr ""
 
-#: t/skins/order_view_template.pt:102
+#: t/skins/order_view_template.pt:101
 msgid "Amount<br />(tax incl.)"
 msgstr ""
 
-#: t/skins/order_view_template.pt:111
+#: t/skins/order_view_template.pt:110
 msgid "image removed"
 msgstr ""
 
-#: t/skins/order_view_template.pt:138
+#: t/skins/order_view_template.pt:137
 msgid "VAT"
 msgstr ""
 
-#: t/skins/order_view_template.pt:142
+#: t/skins/order_view_template.pt:141
 msgid "Total amount to pay"
 msgstr ""
 
-#: t/skins/order_view_template.pt:152
+#: t/skins/order_view_template.pt:151
 msgid "Pay with PayPal:"
 msgstr ""
 
-#: t/skins/order_view_template.pt:153 t/skins/order_view_template.pt:155
+#: t/skins/order_view_template.pt:152 t/skins/order_view_template.pt:154
 msgid "Pay with PayPal"
 msgstr ""
 
-#: t/skins/order_view_template.pt:165
+#: t/skins/order_view_template.pt:164
 msgid ""
 "Please check the preceding table and proceed to payment. By clicking on the "
 "PayPal button, you will temporarily leave the site: you will be redirected "
@@ -312,15 +312,15 @@ msgid ""
 "or by credit card."
 msgstr ""
 
-#: t/skins/order_view_template.pt:177
+#: t/skins/order_view_template.pt:176
 msgid "Order processing history"
 msgstr ""
 
-#: t/skins/order_view_template.pt:183
+#: t/skins/order_view_template.pt:182
 msgid "Actor"
 msgstr ""
 
-#: t/skins/order_view_template.pt:184
+#: t/skins/order_view_template.pt:183
 msgid "Action"
 msgstr ""
 
@@ -366,11 +366,11 @@ msgid ""
 "credit card by cliking on the PayPal button.<br/>"
 msgstr ""
 
-#: t/skins/photoprint_templates_edit_form.py:56
+#: t/skins/photoprint_templates_edit_form.py:55
 msgid "Printing options added."
 msgstr ""
 
-#: t/skins/photoprint_templates_edit_form.py:60
+#: t/skins/photoprint_templates_edit_form.py:59
 msgid "Printing options deleted."
 msgstr ""
 
@@ -547,3 +547,6 @@ msgstr ""
 
 msgid "[%s] order %s sending notification"
 msgstr ""
+
+msgid "paypal_pay"
+msgstr ""

diff --git a/locales/fr/LC_MESSAGES/photoprint.mo b/locales/fr/LC_MESSAGES/photoprint.mo
index 17ace82..2246a9b 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 bd2625b..31b0546 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"
-"POT-Creation-Date: Thu Oct  3 17:53:20 2013\n"
+"POT-Creation-Date: Fri Oct  4 21:36:58 2013\n"
 "PO-Revision-Date: 2013-10-03 17:55+0200\n"
 "Last-Translator:  Benoît PIN\n"
 "Language-Team: CRI http://cri.ensmp.fr\n"
@@ -81,7 +81,7 @@ msgid "Please accept general conditions of sales."
 msgstr "Veuillez accepter les conditions générales des ventes."
 
 #: t/skins/my_orders.py:17 t/skins/order_list.py:14
-#: t/skins/order_view_template.pt:182
+#: t/skins/order_view_template.pt:181
 msgid "Date"
 msgstr "Date"
 
@@ -111,7 +111,7 @@ msgstr "Mes commandes"
 #: t/skins/order_list_template.pt:37 t/skins/order_list_template.pt:50
 #: t/skins/order_manual_payment_form.pt:19
 #: t/skins/order_notify_done_form.pt:19 t/skins/order_notify_sent_form.pt:19
-#: t/skins/order_view_template.pt:87 t/skins/order_view_template.pt:193
+#: t/skins/order_view_template.pt:86 t/skins/order_view_template.pt:191
 msgid "${DYNAMIC_CONTENT}"
 msgstr ""
 
@@ -238,7 +238,7 @@ msgid "Tracking url"
 msgstr "url de suivi"
 
 #: t/skins/order_printing_list_template.pt:22
-#: t/skins/order_view_template.pt:97
+#: t/skins/order_view_template.pt:96
 msgid "Image"
 msgstr "Image"
 
@@ -251,7 +251,7 @@ msgid "Format / type"
 msgstr "Format / type"
 
 #: t/skins/order_printing_list_template.pt:25
-#: t/skins/order_view_template.pt:99
+#: t/skins/order_view_template.pt:98
 msgid "Quantity"
 msgstr "Quantité"
 
@@ -283,53 +283,53 @@ msgstr "Code postal"
 msgid "Country"
 msgstr "Pays"
 
-#: t/skins/order_view_template.pt:53 t/skins/order_view_template.pt:134
+#: t/skins/order_view_template.pt:53 t/skins/order_view_template.pt:133
 msgid "Shipping"
 msgstr "Livraison"
 
-#: t/skins/order_view_template.pt:84
+#: t/skins/order_view_template.pt:83
 msgid "Processing"
 msgstr "Traitement"
 
-#: t/skins/order_view_template.pt:98
+#: t/skins/order_view_template.pt:97
 msgid "Printing format and type"
 msgstr "Format d'impression et type de support"
 
-#: t/skins/order_view_template.pt:100
+#: t/skins/order_view_template.pt:99
 msgid "Unit price"
 msgstr "Prix unitaire"
 
-#: t/skins/order_view_template.pt:101
+#: t/skins/order_view_template.pt:100
 #: t/skins/photoprint_templates_edit_template.pt:45
 #: t/skins/photoprint_templates_edit_template.pt:131
 msgid "VAT (%)"
 msgstr "TVA (%)"
 
-#: t/skins/order_view_template.pt:102
+#: t/skins/order_view_template.pt:101
 msgid "Amount<br />(tax incl.)"
 msgstr "Montant (TTC)"
 
-#: t/skins/order_view_template.pt:111
+#: t/skins/order_view_template.pt:110
 msgid "image removed"
 msgstr "image supprimée"
 
-#: t/skins/order_view_template.pt:138
+#: t/skins/order_view_template.pt:137
 msgid "VAT"
 msgstr "TVA"
 
-#: t/skins/order_view_template.pt:142
+#: t/skins/order_view_template.pt:141
 msgid "Total amount to pay"
 msgstr "Montant total à payer"
 
-#: t/skins/order_view_template.pt:152
+#: t/skins/order_view_template.pt:151
 msgid "Pay with PayPal:"
 msgstr "Payer avec PayPal :"
 
-#: t/skins/order_view_template.pt:153 t/skins/order_view_template.pt:155
+#: t/skins/order_view_template.pt:152 t/skins/order_view_template.pt:154
 msgid "Pay with PayPal"
 msgstr "Payer avec PayPal"
 
-#: t/skins/order_view_template.pt:165
+#: t/skins/order_view_template.pt:164
 msgid ""
 "Please check the preceding table and proceed to payment. By clicking on the "
 "PayPal button, you will temporarily leave the site: you will be redirected "
@@ -350,15 +350,15 @@ msgstr ""
 "vous pourrez, à votre convenance, payer par virement PayPal ou par carte "
 "bancaire."
 
-#: t/skins/order_view_template.pt:177
+#: t/skins/order_view_template.pt:176
 msgid "Order processing history"
 msgstr "Historique du traitement de la commande"
 
-#: t/skins/order_view_template.pt:183
+#: t/skins/order_view_template.pt:182
 msgid "Actor"
 msgstr "Acteur"
 
-#: t/skins/order_view_template.pt:184
+#: t/skins/order_view_template.pt:183
 msgid "Action"
 msgstr "Action"
 
@@ -406,11 +406,11 @@ msgstr ""
 "Votre paiement a été annulé.<br/>\n"
 "Vous pouvez réessayer avec un autre compte / autre carte bancaire.<br/>"
 
-#: t/skins/photoprint_templates_edit_form.py:56
+#: t/skins/photoprint_templates_edit_form.py:55
 msgid "Printing options added."
 msgstr "Options d'impression ajoutées."
 
-#: t/skins/photoprint_templates_edit_form.py:60
+#: t/skins/photoprint_templates_edit_form.py:59
 msgid "Printing options deleted."
 msgstr "Options d'impression supprimées."
 
@@ -592,6 +592,9 @@ msgstr "[%s] annulation de la commande %s"
 msgid "[%s] order %s sending notification"
 msgstr "[%s] expédition de la commande %s"
 
+msgid "paypal_pay"
+msgstr "Paiement PayPal"
+
 #~ msgid "Use one of these button to pay:"
 #~ msgstr "Utilisez un de ces bouton pour payer :"
 

diff --git a/locales/photoprint-manual.pot b/locales/photoprint-manual.pot
index 688317d..efd99d8 100644 (file)
--- a/locales/photoprint-manual.pot
+++ b/locales/photoprint-manual.pot
@@ -83,3 +83,7 @@ msgstr ""
 
 msgid "[%s] order %s sending notification"
 msgstr ""
+
+msgid "paypal_pay"
+msgstr ""
+

diff --git a/locales/photoprint.pot b/locales/photoprint.pot
index 3a7b635..2e1b21d 100644 (file)
--- a/locales/photoprint.pot
+++ b/locales/photoprint.pot
@@ -14,7 +14,7 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: Meaningless\n"
-"POT-Creation-Date: Thu Oct  3 17:53:20 2013\n"
+"POT-Creation-Date: Fri Oct  4 21:36:58 2013\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"
@@ -85,7 +85,7 @@ msgstr ""
 
 #: t/skins/my_orders.py:17
 #: t/skins/order_list.py:14
-#: t/skins/order_view_template.pt:182
+#: t/skins/order_view_template.pt:181
 msgid "Date"
 msgstr ""
 
@@ -123,8 +123,8 @@ msgstr ""
 #: t/skins/order_manual_payment_form.pt:19
 #: t/skins/order_notify_done_form.pt:19
 #: t/skins/order_notify_sent_form.pt:19
-#: t/skins/order_view_template.pt:87
-#: t/skins/order_view_template.pt:193
+#: t/skins/order_view_template.pt:86
+#: t/skins/order_view_template.pt:191
 msgid "${DYNAMIC_CONTENT}"
 msgstr ""
 
@@ -245,7 +245,7 @@ msgid "Tracking url"
 msgstr ""
 
 #: t/skins/order_printing_list_template.pt:22
-#: t/skins/order_view_template.pt:97
+#: t/skins/order_view_template.pt:96
 msgid "Image"
 msgstr ""
 
@@ -258,7 +258,7 @@ msgid "Format / type"
 msgstr ""
 
 #: t/skins/order_printing_list_template.pt:25
-#: t/skins/order_view_template.pt:99
+#: t/skins/order_view_template.pt:98
 msgid "Quantity"
 msgstr ""
 
@@ -295,66 +295,66 @@ msgid "Country"
 msgstr ""
 
 #: t/skins/order_view_template.pt:53
-#: t/skins/order_view_template.pt:134
+#: t/skins/order_view_template.pt:133
 msgid "Shipping"
 msgstr ""
 
-#: t/skins/order_view_template.pt:84
+#: t/skins/order_view_template.pt:83
 msgid "Processing"
 msgstr ""
 
-#: t/skins/order_view_template.pt:98
+#: t/skins/order_view_template.pt:97
 msgid "Printing format and type"
 msgstr ""
 
-#: t/skins/order_view_template.pt:100
+#: t/skins/order_view_template.pt:99
 msgid "Unit price"
 msgstr ""
 
-#: t/skins/order_view_template.pt:101
+#: t/skins/order_view_template.pt:100
 #: t/skins/photoprint_templates_edit_template.pt:45
 #: t/skins/photoprint_templates_edit_template.pt:131
 msgid "VAT (%)"
 msgstr ""
 
-#: t/skins/order_view_template.pt:102
+#: t/skins/order_view_template.pt:101
 msgid "Amount<br />(tax incl.)"
 msgstr ""
 
-#: t/skins/order_view_template.pt:111
+#: t/skins/order_view_template.pt:110
 msgid "image removed"
 msgstr ""
 
-#: t/skins/order_view_template.pt:138
+#: t/skins/order_view_template.pt:137
 msgid "VAT"
 msgstr ""
 
-#: t/skins/order_view_template.pt:142
+#: t/skins/order_view_template.pt:141
 msgid "Total amount to pay"
 msgstr ""
 
-#: t/skins/order_view_template.pt:152
+#: t/skins/order_view_template.pt:151
 msgid "Pay with PayPal:"
 msgstr ""
 
-#: t/skins/order_view_template.pt:153
-#: t/skins/order_view_template.pt:155
+#: t/skins/order_view_template.pt:152
+#: t/skins/order_view_template.pt:154
 msgid "Pay with PayPal"
 msgstr ""
 
-#: t/skins/order_view_template.pt:165
+#: t/skins/order_view_template.pt:164
 msgid "Please check the preceding table and proceed to payment. By clicking on the PayPal button, you will temporarily leave the site: you will be redirected to the payment provider PayPal. Please follow given instructions. The transaction will be final as soon as you are back on the ${site_name} site. For your information, there is no need to create a PayPal account, even if you will be prompted: you can simply use your credit card. If you already have a PayPal account, you can, at your convenience, pay by PayPal transfer or by credit card."
 msgstr ""
 
-#: t/skins/order_view_template.pt:177
+#: t/skins/order_view_template.pt:176
 msgid "Order processing history"
 msgstr ""
 
-#: t/skins/order_view_template.pt:183
+#: t/skins/order_view_template.pt:182
 msgid "Actor"
 msgstr ""
 
-#: t/skins/order_view_template.pt:184
+#: t/skins/order_view_template.pt:183
 msgid "Action"
 msgstr ""
 
@@ -398,11 +398,11 @@ msgstr ""
 msgid "Your payment has been canceled.<br/>You can retry with an other account / credit card by cliking on the PayPal button.<br/>"
 msgstr ""
 
-#: t/skins/photoprint_templates_edit_form.py:56
+#: t/skins/photoprint_templates_edit_form.py:55
 msgid "Printing options added."
 msgstr ""
 
-#: t/skins/photoprint_templates_edit_form.py:60
+#: t/skins/photoprint_templates_edit_form.py:59
 msgid "Printing options deleted."
 msgstr ""
 
@@ -580,3 +580,7 @@ msgstr ""
 
 msgid "[%s] order %s sending notification"
 msgstr ""
+
+msgid "paypal_pay"
+msgstr ""
+

diff --git a/skins/order_view_template.pt b/skins/order_view_template.pt
index 0678456..5f748b2 100644 (file)
--- a/skins/order_view_template.pt
+++ b/skins/order_view_template.pt
@@ -186,7 +186,6 @@
                <tr tal:define="oddrow repeat/item/odd" tal:attributes="class python:test(oddrow, 'even', 'odd')"
                                tal:condition="item/action">
                        <td tal:content="python:item['time'].strftime(locale_date_fmt)">time</td>
-                       <td tal:condition="python:item['action'].startswith('auto_')">Cyberplus</td>
                        <td tal:condition="python:not item['action'].startswith('auto_')"
                            tal:content="python:mtool.getMemberFullNameById(item['actor'], nameBefore=0)">actor</td>
             <td tal:content="item/action" i18n:translate=""></td>