From 46df770d58b2dbf154a3da4d62d82ae30d39bc86 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Benoi=CC=82t=20Pin?= Date: Mon, 1 Sep 2014 23:43:31 +0200 Subject: [PATCH 1/1] =?utf8?q?D=C3=A9sactivation=20d'options=20obsol=C3=A8?= =?utf8?q?tes.=20Mise=20en=20place=20du=20script=20d'annulation=20d'un=20p?= =?utf8?q?aiement=20PayPal.?= MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit --- locales/en/LC_MESSAGES/photoprint.po | 48 ++++++++++---------- locales/fr/LC_MESSAGES/photoprint.mo | Bin 13327 -> 13368 bytes locales/fr/LC_MESSAGES/photoprint.po | 65 ++++++++++++++++----------- locales/photoprint.pot | 50 ++++++++++----------- skins/customer_add_control.py | 4 +- skins/customer_join_form.py | 4 +- skins/customer_join_template.pt | 16 ------- skins/photoprint_order_cancel.py | 6 +++ 8 files changed, 96 insertions(+), 97 deletions(-) create mode 100644 skins/photoprint_order_cancel.py diff --git a/locales/en/LC_MESSAGES/photoprint.po b/locales/en/LC_MESSAGES/photoprint.po index ddc0a0d..f0d7834 100644 --- a/locales/en/LC_MESSAGES/photoprint.po +++ b/locales/en/LC_MESSAGES/photoprint.po @@ -56,10 +56,6 @@ msgstr "" msgid "Please enter a phone." msgstr "" -#: t/skins/customer_add_control.py:28 -msgid "Please accept general conditions of sales." -msgstr "" - #: t/skins/customer_join_template.pt:11 msgid "New customer account" msgstr "" @@ -92,51 +88,39 @@ msgstr "" msgid "Password (confirm)" msgstr "" -#: t/skins/customer_join_template.pt:60 -msgid "Mail Password?" -msgstr "" - -#: t/skins/customer_join_template.pt:64 -msgid "Check this box to have the password mailed." -msgstr "" - -#: t/skins/customer_join_template.pt:102 t/skins/personalize_form.pt:46 +#: t/skins/customer_join_template.pt:93 t/skins/personalize_form.pt:46 msgid "Billing informations" msgstr "" -#: t/skins/customer_join_template.pt:106 t/skins/order_view_template.pt:35 +#: t/skins/customer_join_template.pt:97 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:113 t/skins/order_view_template.pt:39 +#: t/skins/customer_join_template.pt:104 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:119 t/skins/order_view_template.pt:43 +#: t/skins/customer_join_template.pt:110 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:125 t/skins/order_view_template.pt:47 +#: t/skins/customer_join_template.pt:116 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:135 t/skins/personalize_form.pt:79 +#: t/skins/customer_join_template.pt:126 t/skins/personalize_form.pt:79 msgid "Phone" msgstr "" -#: t/skins/customer_join_template.pt:144 -msgid "I accept general conditions of sales" -msgstr "" - -#: t/skins/customer_join_template.pt:152 +#: t/skins/customer_join_template.pt:136 msgid "Register" msgstr "" -#: t/skins/customer_join_template.pt:153 +#: t/skins/customer_join_template.pt:137 #: t/skins/photoprint_templates_edit_template.pt:142 msgid "Cancel" msgstr "" @@ -463,6 +447,10 @@ msgstr "" msgid "Change" msgstr "" +#: t/skins/photoprint_order_cancel.py:5 +msgid "Your payment has been canceled. You can retry later." +msgstr "" + #: t/skins/photoprint_order_confirm.py:7 msgid "Your payment has been accepted by PayPal." msgstr "" @@ -566,6 +554,18 @@ msgstr "" msgid "You must enter a numeric value for the VAT rate." msgstr "" +#: t/utils.py:53 +msgid "Wrong private collection identifier." +msgstr "" + +#: t/utils.py:56 +msgid "Collection's password does not match confirmation." +msgstr "" + +#: t/utils.py:60 +msgid "Wrong collection's password." +msgstr "" + # from photoprint-manual.pot msgid "Your payment is complete." msgstr "" diff --git a/locales/fr/LC_MESSAGES/photoprint.mo b/locales/fr/LC_MESSAGES/photoprint.mo index 4556162c1db81ee9dcdcd0af0122800151b8e5d9..b480a57512ef20573544d7d2d5b6ff385ff00de1 100644 GIT binary patch delta 3519 zcmZ|Qd2EzL7{~GHwiGCBEfk?#f_%&|+x`_^PW@Zdb3B(B(-S*lKK92h zcr}j0Sy+cVFav+O%tRA~W5{veG1N?J_|eG9_)V-wr3$Q=lfO>EfS@U1$kK-DLqmSPdA13&7) z8&DZ)LoMAtBnjq8)J$JNEzujc{+|8*6J!aZ<}3x>_#?LAdDM-q^r8Xm!!mr_)=!`^ zaSAn{-%*+B#3+@)9Mtm$qB2{I+Pqic2&}-q7{Gk`H+R{Fr*R-(yp6?p4hu1#X;$KF zq%X4@C*c7M;&=D~E+*eYaAY4kQys_SZd{G;V=i7#@7!Vn*opqlRth>U_u>G24z-Iv zM$PmzDy4tedS*X&AOldDDo15tvULt>ch{gcZ38M(5mbgYqMpAKqb#?1go1wfto2pY z1CH4GQB+DlLv?r>)!`4Q)Fv@4J+L$Cz8uu^`k~f-2)>(SOsQ>8aoqMShx`xb2fb;~ zCYo%Wj(Tu4>bNbm^$pf-s2Sah>gZ7+Y{9Ql_b^*S7D+2I_It$ouBIyL$jC#e+}-EJkgviKyS*XzRD4p0^5< zaVu)+qjyu#=Guok9?#-XJcU~8t^?hf_QtW)i*OOk0Y_&`YUQFiUzsIY&vQQ z>rolqiTZvIcF_5Mo&qm1^D>s>QPhCaxl3=fTvSF%Q7N5)K94c;QK^23Gp9G*8RW#8 z4vbzM(&#E$p^ zrr{yfo;ZS9k`vek&!AHOGipF7j9TrvsQ*7^D1}FHEb7KjkkpuyI32&S^-+ax$}3Q7 zHwX2`@mLk%FA7kwtCqdM+`x^EDw!xAJxW=7v#G<1{sB0Rb4RiysnixgsVi2av-AnGU z)p#4BU2q+dLa>%*6S18rBeoFA^~Gxsg$jbTG_|oW(h8#FE-}fysH80+bcKkUi8`W? z&=n(=CQ9xW$fmr8m|@$t;uvBXv5k0$SWg6r?!-_+TT1)bUcJp7lr|D9M&g>wUmbOC z?6EG{(b1F|iA992Yl+rG$^E~4JLUU`TZ#F^JR(B)2=ydO=;h9-wf& zt?0#bqb=`7PKU>=jg3q%o41Z?8ljV}!?c{ZlbAs08b)aEhKX53FQScTA#^QvF}rXi zp>twlhtjhP8&u+&L=+`T#@u4P24@qS32oe!v80Ub!eUDQzM5^r!&pu9AS#K;@yd*x zq}b-nF~b`heKiq(Fi;S7mV3kDmSCvXsSWzVP9PX@n!J&k2B#(%sPl&?^RxJinV%+I z-sG+KnJRBM;sm@+l!En+KM?;sYpy4LOLjwt@$*B$Kt1>U$HR+^`{nYGzu6n{{o_ZD zzt$Is`0M=f_M8trooc)RC*+HSV*C3Hj_>aClBZ*7d1+aB$>`XE-24>EW8&*`+dZ+n z^QtPVd`=U?t@S15;8Wr6&K+OG341S@g%b`2__@EX?(h>KIt|B<=M{OfrzPe!GuUJ% z2Ll1$O3imk{)puGk%G0U)z|%h5B@++Fccz@MP{0vgjXG0G7Qc5@Dn~VWq%x>S~My- Wt=YHA3DF)7$2N@^9*>M@^ZW%2yRE|j delta 3539 zcma*od2EzL7{~G1Z3|Lb3RDEk;ae#py=V(aDVEA576e2o;LWmq+g)vU%kH*-h)YyJ z2}Z-#s}&VBYKnE>@ymd^wimV!QzFLcQQ=)XZK$WooDO zm~HPv?+)#QtrIYx>&19JhHx0(nWUl=cO!r18UD$@S1||o;KleZk|c8ynS}Atn>rlK zKgz&GSd67O!f(t{)PNIATNCO;Elm#=;6Btql1Jxz{s2A)*b^IwRQ>RdS>NJuZlf_M%@K9talE$$O#i$!5pq64b>cP3#jSZ*= zPof5J8YiPhrR!>B(qP#L}l`|^IXg-Rt2oj3yD!7+FoE3hBa zDZ?6^jv?gT<^`OA`!R}HoG6 zf2Tp4rO5FtL3Lb(I$kyQdWH2C)Qn=N4%Z{uHCs^6J&!uJFQGE{InKsYs0mCdBr7|?$3`w*nb6ksV{is~Eb<0E5i_{1L8WvW>U>{;8gLM`+2W{) z-e<2o?{A zY6-?MYGq;xa+1wT)E?Q4%E+@gROf#$75>a&`$I;F_vsvonqe*K_cfS_&mdznJ*a^m zME0*aj@knmyuB}u!E7u;Wvm*tL|0;eT!Oj0->jgb5w+PLHlx1r58)H|9O}V2WnP9B z;askl+UuuKsec}Omk{;*Amf zYR$K!W|FqPg__|Z)H(hR^YCZ;d*%c$eqV`rT>i(IiPw_Pqn!UA&(U4EW zM(l%Ks1CNH9@v3O zEo=yL6`^g-8kxI@&BPR96QNyowme2<8o|s=bLz|NvB?{#X_DIrCCw$ymgQ8!#CY3~ zLTv>VhtNr0M=T&z?jf`lwVm!I9wF8fF+wX|Levr3R<;zFyQ$qtXpgEaCG=@%Ol|L< zpVY@AO58-K=*T?UTl2nHw^83p1c~d2Wkfp>B3L$aGoj6?(m}Kkm+Hcnhwy4!*9YcC zTkph`#`sNfYEsVRhAX+$)<_bU6LDfAF`ZB;CA3Eq#5IJz1l`1HLS==Ac>pI9Iw!ZJ z_T}W4-D-c)(X6obfb|M&AT|)%xNB0r-25_*$=~G;TU%xA!o{{e6KAKV=MM7~huq+; zP9hYJJ1e5AokY|L1v*?BT&FD%kFScx8lBcaxW#QOPc0oVHU0L0!@ki@AQ*Jp5>B%l zabtlNCm4-1h7;jvB<@6;oOqzcjiUXxK1z-cbz~}IO42q zcb$%CBIY`+(S+0JO+roWaVH)PCmc7@5nXejhsniy=T)9sUN}GfV_~WPrnzIi(YX%e z|L2^V5A;M1^e|DH8;K4#l5pduzBSP7ng!8TGcy{AxT~4JnXT^K7(M)J0Q;Y;OOG$A e%ouOqpd0?jE6USL#%}79t|*_Fk$$#vtN$;@d9)q? diff --git a/locales/fr/LC_MESSAGES/photoprint.po b/locales/fr/LC_MESSAGES/photoprint.po index 4854769..e2a0659 100644 --- a/locales/fr/LC_MESSAGES/photoprint.po +++ b/locales/fr/LC_MESSAGES/photoprint.po @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: Plinn 2.0\n" -"POT-Creation-Date: Mon Sep 1 20:58:12 2014\n" -"PO-Revision-Date: 2014-09-01 21:22+0200\n" +"POT-Creation-Date: Mon Sep 1 23:37:28 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" "Language: \n" @@ -76,10 +76,6 @@ msgstr "Veuillez entrer un pays." msgid "Please enter a phone." msgstr "Veuillez entrer un numéro de téléphone." -#: t/skins/customer_add_control.py:28 -msgid "Please accept general conditions of sales." -msgstr "Veuillez accepter les conditions générales des ventes." - #: t/skins/customer_join_template.pt:11 msgid "New customer account" msgstr "Nouveau compte client" @@ -112,51 +108,39 @@ msgstr "Mot de passe" msgid "Password (confirm)" msgstr "Mot de passe (confirmation)" -#: t/skins/customer_join_template.pt:60 -msgid "Mail Password?" -msgstr "Envoyer le mot de passe ?" - -#: t/skins/customer_join_template.pt:64 -msgid "Check this box to have the password mailed." -msgstr "Cochez cette case afin que votre mot de passe vous soit envoyé par mail." - -#: t/skins/customer_join_template.pt:102 t/skins/personalize_form.pt:46 +#: t/skins/customer_join_template.pt:93 t/skins/personalize_form.pt:46 msgid "Billing informations" msgstr "Informations de facturation" -#: t/skins/customer_join_template.pt:106 t/skins/order_view_template.pt:35 +#: t/skins/customer_join_template.pt:97 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:113 t/skins/order_view_template.pt:39 +#: t/skins/customer_join_template.pt:104 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:119 t/skins/order_view_template.pt:43 +#: t/skins/customer_join_template.pt:110 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:125 t/skins/order_view_template.pt:47 +#: t/skins/customer_join_template.pt:116 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:135 t/skins/personalize_form.pt:79 +#: t/skins/customer_join_template.pt:126 t/skins/personalize_form.pt:79 msgid "Phone" msgstr "Téléphone" -#: t/skins/customer_join_template.pt:144 -msgid "I accept general conditions of sales" -msgstr "J'accepte les conditions générales des ventes" - -#: t/skins/customer_join_template.pt:152 +#: t/skins/customer_join_template.pt:136 msgid "Register" msgstr "S'enregistrer" -#: t/skins/customer_join_template.pt:153 +#: t/skins/customer_join_template.pt:137 #: t/skins/photoprint_templates_edit_template.pt:142 msgid "Cancel" msgstr "Annuler" @@ -508,6 +492,10 @@ msgstr "Adresse e-mail" msgid "Change" msgstr "Modifier" +#: t/skins/photoprint_order_cancel.py:5 +msgid "Your payment has been canceled. You can retry later." +msgstr "Votre paiement a été annulé. Vous pouvez réessayer plus tard." + #: t/skins/photoprint_order_confirm.py:7 msgid "Your payment has been accepted by PayPal." msgstr "Votre paiement a été accepté par PayPal." @@ -618,6 +606,18 @@ msgstr "Vous devez saisir une valeur numérique pour le prix." msgid "You must enter a numeric value for the VAT rate." msgstr "Vous devez saisir une valeur numérique pour la TVA (pourcentage)." +#: t/utils.py:53 +msgid "Wrong private collection identifier." +msgstr "Identifiant de collection privée incorrect." + +#: t/utils.py:56 +msgid "Collection's password does not match confirmation." +msgstr "Le mot de passe de collection et sa confirmation sont différents." + +#: t/utils.py:60 +msgid "Wrong collection's password." +msgstr "Mot de passe de collection incorrect." + msgid "Your payment is complete." msgstr "Votre paiement a été accepté." @@ -705,6 +705,19 @@ msgstr "[%s] expédition de la commande %s" msgid "paypal_pay" msgstr "Paiement PayPal" +#~ msgid "Please accept general conditions of sales." +#~ msgstr "Veuillez accepter les conditions générales des ventes." + +#~ msgid "Mail Password?" +#~ msgstr "Envoyer le mot de passe ?" + +#~ msgid "Check this box to have the password mailed." +#~ msgstr "" +#~ "Cochez cette case afin que votre mot de passe vous soit envoyé par mail." + +#~ msgid "I accept general conditions of sales" +#~ msgstr "J'accepte les conditions générales des ventes" + #~ msgid "Use one of these button to pay:" #~ msgstr "Utilisez un de ces bouton pour payer :" diff --git a/locales/photoprint.pot b/locales/photoprint.pot index ce8cb2e..9965dd2 100644 --- a/locales/photoprint.pot +++ b/locales/photoprint.pot @@ -14,7 +14,7 @@ msgid "" msgstr "" "Project-Id-Version: Meaningless\n" -"POT-Creation-Date: Mon Sep 1 20:58:12 2014\n" +"POT-Creation-Date: Mon Sep 1 23:37:28 2014\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: Zope 3 Developers \n" @@ -79,10 +79,6 @@ msgstr "" msgid "Please enter a phone." msgstr "" -#: t/skins/customer_add_control.py:28 -msgid "Please accept general conditions of sales." -msgstr "" - #: t/skins/customer_join_template.pt:11 msgid "New customer account" msgstr "" @@ -116,61 +112,49 @@ msgstr "" msgid "Password (confirm)" msgstr "" -#: t/skins/customer_join_template.pt:60 -msgid "Mail Password?" -msgstr "" - -#: t/skins/customer_join_template.pt:64 -msgid "Check this box to have the password mailed." -msgstr "" - -#: t/skins/customer_join_template.pt:102 +#: t/skins/customer_join_template.pt:93 #: t/skins/personalize_form.pt:46 msgid "Billing informations" msgstr "" -#: t/skins/customer_join_template.pt:106 +#: t/skins/customer_join_template.pt:97 #: 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:113 +#: t/skins/customer_join_template.pt:104 #: 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:119 +#: t/skins/customer_join_template.pt:110 #: 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:125 +#: t/skins/customer_join_template.pt:116 #: 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:135 +#: t/skins/customer_join_template.pt:126 #: t/skins/personalize_form.pt:79 msgid "Phone" msgstr "" -#: t/skins/customer_join_template.pt:144 -msgid "I accept general conditions of sales" -msgstr "" - -#: t/skins/customer_join_template.pt:152 +#: t/skins/customer_join_template.pt:136 msgid "Register" msgstr "" -#: t/skins/customer_join_template.pt:153 +#: t/skins/customer_join_template.pt:137 #: t/skins/photoprint_templates_edit_template.pt:142 msgid "Cancel" msgstr "" @@ -500,6 +484,10 @@ msgstr "" msgid "Change" msgstr "" +#: t/skins/photoprint_order_cancel.py:5 +msgid "Your payment has been canceled. You can retry later." +msgstr "" + #: t/skins/photoprint_order_confirm.py:7 msgid "Your payment has been accepted by PayPal." msgstr "" @@ -601,6 +589,18 @@ msgstr "" msgid "You must enter a numeric value for the VAT rate." msgstr "" +#: t/utils.py:53 +msgid "Wrong private collection identifier." +msgstr "" + +#: t/utils.py:56 +msgid "Collection's password does not match confirmation." +msgstr "" + +#: t/utils.py:60 +msgid "Wrong collection's password." +msgstr "" + # from photoprint-manual.pot msgid "Your payment is complete." diff --git a/skins/customer_add_control.py b/skins/customer_add_control.py index 8280dbc..00b4de3 100755 --- a/skins/customer_add_control.py +++ b/skins/customer_add_control.py @@ -25,7 +25,6 @@ mandatoryFields = [ , ('billing_zipcode', _('Please enter zip code.')) , ('country', _('Please enter a country.')) , ('phone', _('Please enter a phone.')) - , ('accept_gcs', _('Please accept general conditions of sales.')) ] for name, failMessage in mandatoryFields : @@ -45,8 +44,7 @@ try: ,'billing_city' : kg('billing_city') ,'billing_zipcode' : kg('billing_zipcode') ,'country' : kg('country') - ,'phone' : kg('phone') - ,'accept_gcs' : kg('accep_gcs')} ) + ,'phone' : kg('phone')} ) except ValueError, errmsg: return context.setStatus(False, _(errmsg)) diff --git a/skins/customer_join_form.py b/skins/customer_join_form.py index f5f0f7c..3f5beac 100755 --- a/skins/customer_join_form.py +++ b/skins/customer_join_form.py @@ -39,7 +39,6 @@ continuationFields = [ , 'member_id' , 'password' , 'confirm' - , 'send_password' , 'collection_id' , 'collection_password' , 'collection_password_confirm' @@ -47,8 +46,7 @@ continuationFields = [ , 'billing_city' , 'billing_zipcode' , 'country' - , 'phone' - , 'accept_gcs'] + , 'phone'] for name in continuationFields : diff --git a/skins/customer_join_template.pt b/skins/customer_join_template.pt index 503c825..ba4878a 100644 --- a/skins/customer_join_template.pt +++ b/skins/customer_join_template.pt @@ -56,15 +56,6 @@ - - Mail Password? - - - - -
@@ -137,13 +128,6 @@ - -
- - - I accept general conditions of sales - -   diff --git a/skins/photoprint_order_cancel.py b/skins/photoprint_order_cancel.py new file mode 100644 index 0000000..d5b5f81 --- /dev/null +++ b/skins/photoprint_order_cancel.py @@ -0,0 +1,6 @@ +##parameters=token=None +from Products.photoprint.utils import Message as _ +if token : + context.ppCancel(token) +context.setStatus(False, _('Your payment has been canceled. You can retry later.')) +return context.order_view() \ No newline at end of file -- 2.20.1