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: Rename delete to deactivate for members. Fixes #177

---
 budget/templates/list_bills.html               |   2 +-
 budget/translations/fr/LC_MESSAGES/messages.mo | Bin 8226 -> 8265 bytes
 budget/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 a9af4de..4029bc9 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 c824b18..b8b2a74 100644
Binary files a/budget/translations/fr/LC_MESSAGES/messages.mo and b/budget/translations/fr/LC_MESSAGES/messages.mo differ
diff --git a/budget/translations/fr/LC_MESSAGES/messages.po b/budget/translations/fr/LC_MESSAGES/messages.po
index 609846f..2c2cb4a 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"
-- 
cgit v1.1


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: Explain better what is a deactivation of a member, per
 @JocelynDelalande's review

---
 budget/translations/fr/LC_MESSAGES/messages.mo | Bin 8265 -> 8425 bytes
 budget/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 b8b2a74..210852b 100644
Binary files a/budget/translations/fr/LC_MESSAGES/messages.mo and b/budget/translations/fr/LC_MESSAGES/messages.mo differ
diff --git a/budget/translations/fr/LC_MESSAGES/messages.po b/budget/translations/fr/LC_MESSAGES/messages.po
index 2c2cb4a..0f3339e 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 3bfa73a..47ff371 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"))
-- 
cgit v1.1