almet/ihatemoney
1
0
Fork 0
mirror of https://github.com/spiral-project/ihatemoney.git synced 2025-04-30 10:12:37 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge pull request #226 from spiral-project/rename-delete-to-deactivate

Browse source 
Rename delete to deactivate for members. Fixes #177
This commit is contained in:
JocelynDelalande 2017-06-27 19:52:07 +02:00 committed by GitHub
commit ce90ff0ffd
4 changed files with 10 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
budget/templates/list_bills.html
View file

@ -66,7 +66,7 @@
{% if member.activated %} {% if member.activated %}
<td> <td>
<form class="action delete" action="{{ url_for(".remove_member", member_id=member.id) }}" method="POST"> <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"> <form class="action edit" action="{{ url_for(".edit_member", member_id=member.id) }}" method="GET">
<button type="submit">{{ _("edit") }}</button></form> <button type="submit">{{ _("edit") }}</button></form>
</td> </td>

BIN
budget/translations/fr/LC_MESSAGES/messages.mo
View file

Binary file not shown.

8
budget/translations/fr/LC_MESSAGES/messages.po
View file

@ -214,8 +214,8 @@ msgstr "Le membre '%(name)s' a été désactivé"
#: web.py:314 #: web.py:314
#, python-format #, python-format
msgid "User '%(name)s' has been removed" 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é supprimé" 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 #: web.py:331
msgid "The bill has been added" msgid "The bill has been added"
@ -291,6 +291,10 @@ msgstr "Annuler"
msgid "Edit the project" msgid "Edit the project"
msgstr "Éditer le projet" msgstr "Éditer le projet"
#: templates/list_bills.html:70
msgid "deactivate"
msgstr "désactiver"
#: templates/forms.html:69 templates/list_bills.html:70 #: templates/forms.html:69 templates/list_bills.html:70
#: templates/list_bills.html:114 #: templates/list_bills.html:114
msgid "delete" msgid "delete"

4
budget/web.py
View file

@ -388,7 +388,9 @@ def remove_member(member_id):
member = g.project.remove_member(member_id) member = g.project.remove_member(member_id)
if member: if member:
if member.activated == False: 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: else:
flash(_("User '%(name)s' has been removed", name=member.name)) flash(_("User '%(name)s' has been removed", name=member.name))
return redirect(url_for(".list_bills")) return redirect(url_for(".list_bills"))