Merge branch 'master' into wsgi-module

CHANGELOG.rst

@@ -9,9 +9,14 @@ This document describes changes between each past release.
 ### Changed
 
 - **BREAKING CHANGE** Use a hashed ``ADMIN_PASSWORD`` instead of a clear text one, ``./budget/manage.py generate_password_hash`` can be used to generate a proper password HASH (#236)
-- **BREAKING CHANGE** Turn the WSGI file into a python module, renamed from budget/ihatemoney.wsgi to budget/wsgi.py. Please update your Apache configuration !
+- **BREAKING CHANGE** Turn the WSGI file into a python module, renamed from budget/ihatemoney.wsgi to budget/wsgi.py. Please update your Apache configuration!
 - Changed the recommended gunicorn configuration to use the wsgi module as an entrypoint
 
+
+### Removed
+
+- Remove unused option in the setup script
+
 1.0 (2017-06-20)
 ----------------
 

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>

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"
@@ -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"

budget/web.py

@@ -388,7 +388,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"))

setup.py

@@ -59,9 +59,6 @@ setup(name='ihatemoney',
       author_email='alexis@notmyidea.org',
       url='https://github.com/spiral-project/ihatemoney',
       packages=find_packages(),
-      package_data={'': ['*.rst', '*.py', '*.yaml', '*.po', '*.mo', '*.html',
-                         '*.css', '*.js', '*.eot', '*.svg', '*.woff', '*.txt',
-                         '*.png', '*.ini', '*.cfg']},
       include_package_data=True,
       zip_safe=False,
       install_requires=REQUIREMENTS,