From c0e872f01aab79bff8bbd4ff9af6787c36445038 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= <alexis@notmyidea.org>
Date: Wed, 21 Jun 2017 02:03:06 +0200
Subject: [PATCH 1/2] Rename delete to deactivate for members. Fixes #177

---
 budget/templates/list_bills.html              |   2 +-
 .../translations/fr/LC_MESSAGES/messages.mo   | Bin 8226 -> 8265 bytes
 .../translations/fr/LC_MESSAGES/messages.po   |   4 ++++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/budget/templates/list_bills.html b/budget/templates/list_bills.html
index a9af4def..4029bc95 100644
--- a/budget/templates/list_bills.html
+++ b/budget/templates/list_bills.html
@@ -66,7 +66,7 @@
         {% if member.activated %}
         <td>
             <form class="action delete" action="{{ url_for(".remove_member", member_id=member.id) }}" method="POST">
-                <button type="submit">{{ _("delete") }}</button></form>
+                <button type="submit">{{ _("deactivate") }}</button></form>
             <form class="action edit" action="{{ url_for(".edit_member", member_id=member.id) }}" method="GET">
                 <button type="submit">{{ _("edit") }}</button></form>
         </td>
diff --git a/budget/translations/fr/LC_MESSAGES/messages.mo b/budget/translations/fr/LC_MESSAGES/messages.mo
index c824b18aeafe0f26a114e334bc629711589a1e0d..b8b2a749ab71a1cf050d74bf7644c14ff2633fff 100644
GIT binary patch
delta 2013
zcmYM!duW$c7zgm9uDs-Q)6`7e=A|tqE0na0l&!=vqOc?em6;hEbb*?Ng#9p>1QIHt
zC>4$*v#^U5T|}f1Rtou7mQ+ZhQeaU;QR_yZufEWD_kPYf?|IKT&vVZEdujf``L$!C
z>NXdDtNl;(e{xW2|NreCT*`RW*Ex%yu$6yu04EPAWhAFkQ<=>SaSey@I*#C?$_}2V
z-pPhiYNcD@91T4j&GpPew)0%><M}+mQ9Q~zo~En(?3VuhG+-G!^z4LfOnnX;xsaKs
zgL!W$N14BLD!9s%l|9VF8`#V(Rr`A!tNsz|`6Z|D6ffiu;pV-mY~u`Op^KS_@1m<L
zcbm>fIMV!Ot3p<|i|M$xs`oJ~KFUOLjKld8lj^^jjMRB4?c<n!)0m80L0!sXy2?Fn
z>DR?<=_=Ne+KmcX`OBQl-Q2;$%$7Xntqin|>9>g&a4W}g4>RCFCKD&v!hfswX6gD~
z{VKL|iUYBdD@Mrw#R^|*$Ut>YQY$C&BHqA6(#7oAIwrym%))w^OuWl!+{YFkubvOo
z*&51Np4l2Usn1|Cdvk;Qr*NAF+gO%VF6BJ+E?&)@%mR-yXQH1u1LN)6Otvu@TEb-J
zK4#q2oWvS4{)<e%SC|F8od-E2A6D+Cs~m7kha*gc-!KuMWCr+yiENMqkk6}unV^|z
zpUxc4IaPZHH~C(dGXeZ&uuE7Q;{YVZ?HtIZ)Ti9fOuVvk4YPnA3chUP1in^1@8cNt
z!^~El<YoMk$<QPZGu|yshVGzoYULq?WMB=G(x=(RjTB`0fUa`LEuY`FRr~Kuiic`+
zPRmH<@J*=dbC^uEGnu@V$;h2drk-F^zW=ofiKv%J$sVTTF*-+OfQ?Tijm$6G^-Kf{
zn1Sx)Y<4o4dx2T_n@qot=_+5jWg)-N(50XC<}VF;B{fY<q^(RQ<}m{;VitHe6Y0au
zp08#Geug<@y;XgG_52IY)qaX=ImtJg_qH>Ey}?>0-mj3)r;jZ>%?vnPK65r^FrUrB
z$_IH!y@xmQb_Zb%H**0;d&#5H!AsfAR_<UTKg4X!@rm-E$bQg}!}Sjnd866$yU@(M
zcoTEj9;NeC)-!wG%bez&Oltd>fIef!Il_#8g6;g3*K)3CvcOeM@}G$|X-I1Kau)lT
z1@%)hO1)Wfs@ph|m-EctGw*d)^=@V%PcaMWVHWZ%^I1M$weMoK?yV~oGQg+I;rX1I
z_&a98znDF%YdO2n(ab>ec5E9wY{;_Z-Ce7eb+345OXK_XLmxQs>f>ixo?Fy>^gnYE
ByIcSO

delta 1978
zcmYM!ZD?0j90%}|E|)spoSHS4&dN>8Whh}vm@UO5hCPz2*b50GBkF~dDC*y!g%M$4
zS}(M)iBvO;lp=#3h)NA2D~U=idJ!5TBvYhUeZF>~ad$uGoO|wh_?_SVA6W9{lG?H6
zy3NJk<NjOy9~qh2|9@NSOSx2a8|U#uw(~DuzzG+X(#VO_RIXr#xSC@)m*cspas|h#
zuVPavweo<%g&O)ekxw!U*~n4c#Yx=5X6|Plf2FJZ?w0;1XuvXR^nVjhVe0Lizy-`a
zE136Ivf2D)m4d50T-nD=T;p^;SGDit#p>^I9KYt}Jj@oJW8Rx++Z}9S7TU$^csX6=
zPPf_YWuy7a28FEfHKyY`Rs92I#rv6^e9H#@#)SGL6OrMnz23{|H;IYJOnOwh=qlZA
zdB2A_(lx9lw9hDH<(oN!TRF&2m?K&3tqioD>DSLoxPeo+of+^WCK5leji;*iM&UZH
zKAT-^mJofsd%XD1Quszg1{!8N8)Vc>&S!Sg!<^ZAW`{LqVJ|U}*ug8gi)}nqJwHur
zD5Jb|{%AN&y@iSF!Y1)g;YJOPuPm!v$s5#rxQJVr1s-B@;slceqn%qPr!Wy(#zf{e
zX55E(86RcFf00?pt4waZUaJa&bd|T<(qSL7v(K5G9$+Ro%IxSk^I4r?2CkC`X&=ud
z<y5A9F<<tb-oh;W7lX~=KTKq69TH%K!cyu}mNOIITe+H9z*^dLd74wXv3fql$?AKU
zBRasj{GN%-2oE#fwM=BLXU4gmB2X)<6%xt^*}*>ARM|#X+3l9k?#rtE2ou^<l%Hjo
zNxF1OeJT^F4knWGn20Q7B62^I18dln?|(ocA=$!o{DShP{K@R(Ec1)jE&;NGtC)dq
z=6rTDk?Us`{tDA?Ctc-Jw=Co*8mb&)HhhNl<}V}lwuv&9c`$<+Xf6|~o0y&5!JK(7
zy;~k(l53!<4_41V<^t^p+0PNa&Aj(4v$0Lgkqoky&t^!Wjo&c?{>>yuqqrtib1HA;
zLG`s<%IhS;Q+$HUc#a;G#a_OKJ#6O&X6L(^qxp*2*r8VOPjdaCAv-_I{2tU<MPBS=
zlI<?ar}7wc_5(~dzrcich}qHm%sBg)3HGy#KXWl#?IsJnkC|uvH1SVp-_S6RL(GDX
zQ4q>$CaW9F*2&2{fA*E#%mVIV7SPKqU=8y*uB+PnnIn6inQuFjGw;q)$b_FU6aC1X
b)lp`JCz*jJ558SLX3yRUd&g~BH~sLx-E^-B

diff --git a/budget/translations/fr/LC_MESSAGES/messages.po b/budget/translations/fr/LC_MESSAGES/messages.po
index 609846ff..2c2cb4ae 100644
--- a/budget/translations/fr/LC_MESSAGES/messages.po
+++ b/budget/translations/fr/LC_MESSAGES/messages.po
@@ -291,6 +291,10 @@ msgstr "Annuler"
 msgid "Edit the project"
 msgstr "Éditer le projet"
 
+#: templates/list_bills.html:70
+msgid "deactivate"
+msgstr "désactiver"
+
 #: templates/forms.html:69 templates/list_bills.html:70
 #: templates/list_bills.html:114
 msgid "delete"

From a585a73d8b387fee47b1df1caf9ea6b0ff5793af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Alexis=20M=C3=A9taireau?= <alexis@notmyidea.org>
Date: Mon, 26 Jun 2017 22:59:22 +0200
Subject: [PATCH 2/2] Explain better what is a deactivation of a member, per
 @JocelynDelalande's review

---
 .../translations/fr/LC_MESSAGES/messages.mo   | Bin 8265 -> 8425 bytes
 .../translations/fr/LC_MESSAGES/messages.po   |   4 ++--
 budget/web.py                                 |   4 +++-
 3 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/budget/translations/fr/LC_MESSAGES/messages.mo b/budget/translations/fr/LC_MESSAGES/messages.mo
index b8b2a749ab71a1cf050d74bf7644c14ff2633fff..210852b0cf2b263ee5f84967ecea82579ef5145b 100644
GIT binary patch
delta 1448
zcmX}rTSyd99LMpaX_{rGnO&`uR7$y)^<Wo?Zbm(HCx}vFbVps?*4mjh5Mrqw>Lnq%
zAqE)~WOuTl-ik%SZWIJP<ckkMQV<mMP!xTC?hq{VnK@_XfBygfIXkp&bp8ETnaQXz
zW~9KFsknWLF_W+n$72W1#ZJt|3xT~jf#<7%x3HGyN4Ofl<8%xa8Z!^;FdtnEp@(^R
zwa_HZ3~p{Spall86knni7!6+hflBBvW?^<w+B{^)6rkqkV-8lJ3R;F*XcMZi9XJ{5
zQSsZ0lIe*A17!@H2qv!M*$iXup(<EkY)mCOI0w5i6K^4}n7gQjp9Kz~5_pF+!+gTo
z_%oO<nq~|?Gb_n8mz!m{6jz~I6hQ^NgzC^0RG`PG4h*4M`UcB!7}bfal62q_<Yy|m
zXnZ58!+UWe9>7_cYzYQVpjy?9YGn_qBYmh=rBG+#H7b#>sE+(Wy|<VR=NOr7s6rZW
z9G*cHa26HkCa%DTNavE~GdIfcH|oWFF5H?$s6^HxYnVDz#r3Gpv>`>Ccrbn%73U%<
z!5gSbpP=@95Eb`5>WqCIduIRhW~N^#!x|>4@i<0;@h_;#exVl5qi+ka2rbs20`5bd
zjZRdj&ILZe7d*eiO?a7ua12MVj`ht!zGBW?$0~e^i|`w&@)DwJYeJ~XR-z8qR#ZnC
zuman$3(untTLD>c-pmrz-mgO)=FO<iHe*s19pXlT5~u}E;s!jAYw-gr!4kgKLe;3&
z?#JcWj7q2nX_C2vI@HfGgl|!M{}=ULu1!A|Thlz2$y^4M$U;;iA=LkM4QhM~YVUTU
z0<@z3c0Ow1Q>X=dQG0z2mFNH}&hS8g&aT`&Vb^K$Bb|=#hO6vW-yV%bqt^3vbq*hP
zow$v}tl#R|gy+UR8;y9rO~jbD5#O_oPSlAtxwg@5>Nw<jw#$uoR1IWI3Fn`yEuFZV
zh*8_r!RxVv8+UBDoS07BN!|71u5C+rM-t_!K1+Zj3D<hg|9D}yGvdZ#u1)o~I8o@c
NU8#P>j+K7Q{0H<7xA*`6

delta 1295
zcmXZbPe@cz6vy%7Xz7%rGfrA&&Pat*k`)CCA(2DUKcu2u2$4}L3Jr>>;ldsULJ&bN
zT0}(yfn|%bW>YN$5r&d#l`SeF$%v>nQItf`_cwE4c%OIwymRk4_s*BbXS*h!`@AYM
zn=dvCqc3Pyh-J7G*I@)}a0%{n9z;Lw7H1na(C)?^IF2iE9;3L30W1%h)nW{nVN1w7
zTgA%>I<&wLR-%Vm;D(!c8?~W_n1_#@Q^?O|cxZeM^YI-jp#{`Je^80#mY5Y`5EVaK
z;$;Um(y^9~IycaYV>xE0P#OFp+9oVrVYUY2=)*Q-ik(C)Jm4HgZD15h-mYQ=-gV<?
zET#R@<E4O?1>Az)Q6;KmQ~?j5Ds%)D=rpPV!>E#;#~5BllC($2&t`d);Ro0M8&zRH
zoy)NpSEE<qI_glRila)|jH<{{RH@FQ?!pLaBS}<69-!vEN3N0OaPUebgt^#=N}vf9
z=QwW1E~IjvUFStRzmJ+Yjr{Bl4{hWJ65AG083&o9%0y6^R-^hGP;vI7Hh2t`X##cT
zL#VhHP<JeuX><NlZo+G<XW$c#U}bss!<(qg?x7Z*!u6QOD*TEHSV%o}H)>Fo+T-lR
zS=ytx8xL_2hVcqEvA%`*iZN@&&Df9Ccng*JEb3_HQJH;1U9Nwq%tNfc0i&qz_M$FZ
z4|1LCBI@jusLMQ#s%#oPW%Pm<1)4)G@Dbzq6L(@g>1cz4sD;K*rG0|iFpb*KB2o+s
zu!=5q3~O;KX3ie<U6*V3N3AonlXG-vBcrH|TtfX{uets^sI!|y1$c`3+r2_9{28_2
wU({LWRb@9CM#X7JP2?Xg$nWb&^bB^ir<#N90sonS-rm0M#LPshDDu|#A4Pb7*#H0l

diff --git a/budget/translations/fr/LC_MESSAGES/messages.po b/budget/translations/fr/LC_MESSAGES/messages.po
index 2c2cb4ae..0f3339ef 100644
--- a/budget/translations/fr/LC_MESSAGES/messages.po
+++ b/budget/translations/fr/LC_MESSAGES/messages.po
@@ -214,8 +214,8 @@ msgstr "Le membre '%(name)s' a été désactivé"
 
 #: web.py:314
 #, python-format
-msgid "User '%(name)s' has been removed"
-msgstr "Le membre '%(name)s' a été supprimé"
+msgid "User '%(name)s' has been deactivated. It will still appear in the users list until its balance becomes zero."
+msgstr "Le membre '%(name)s' a été désactivé. Il continuera d'apparaître jusqu'à ce que sa balance devienne égale à zéro."
 
 #: web.py:331
 msgid "The bill has been added"
diff --git a/budget/web.py b/budget/web.py
index 3bfa73a1..47ff371f 100644
--- a/budget/web.py
+++ b/budget/web.py
@@ -386,7 +386,9 @@ def remove_member(member_id):
     member = g.project.remove_member(member_id)
     if member:
         if member.activated == False:
-            flash(_("User '%(name)s' has been deactivated", name=member.name))
+            flash(_("User '%(name)s' has been deactivated. It will still "
+                    "appear in the users list until its balance "
+                    "becomes zero.", name=member.name))
         else:
             flash(_("User '%(name)s' has been removed", name=member.name))
     return redirect(url_for(".list_bills"))