Merge pull request #96 from aavenel/master

New feature : Settle the bill

1 files changed, 147 insertions, 106 deletions

diff --git a/budget/messages.pot b/budget/messages.pot
index effeccf..b3cb0cc 100644
--- a/budget/messages.pot
+++ b/budget/messages.pot
@@ -1,203 +1,211 @@
 # Translations template for PROJECT.
-# Copyright (C) 2011 ORGANIZATION
+# Copyright (C) 2013 ORGANIZATION
 # This file is distributed under the same license as the PROJECT project.
-# Alexis Métaireau <alexis@notmyidea.org>, 2011.
+# FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
 #
 #, fuzzy
 msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2011-11-20 14:05+0100\n"
+"POT-Creation-Date: 2013-05-09 22:24+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: Quentin Roy <royque@gmail.com>\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: forms.py:20
-msgid "Select All/None"
+#: forms.py:22
+msgid "Select all"
 msgstr ""
 
-#: forms.py:57
+#: forms.py:22
+msgid "Select none"
+msgstr ""
+
+#: forms.py:61
 msgid "Project name"
 msgstr ""
 
-#: forms.py:58 forms.py:82 forms.py:93
+#: forms.py:62 forms.py:86 forms.py:102
 msgid "Private code"
 msgstr ""
 
-#: forms.py:59
+#: forms.py:63
 msgid "Email"
 msgstr ""
 
-#: forms.py:81 forms.py:92 forms.py:98
+#: forms.py:85 forms.py:101 forms.py:107
 msgid "Project identifier"
 msgstr ""
 
-#: forms.py:83 templates/send_invites.html:5
+#: forms.py:87 templates/send_invites.html:5
 msgid "Create the project"
 msgstr ""
 
-#: forms.py:88
+#: forms.py:92
 msgid ""
 "The project identifier is used to log in and for the URL of the project. "
 "We tried to generate an identifier for you but a project with this "
-"identifier already exists. Please create a new identifier you will be "
-"able to remember."
+"identifier already exists. Please create a new identifier that you will "
+"be able to remember."
 msgstr ""
 
-#: forms.py:94
+#: forms.py:103
 msgid "Get in"
 msgstr ""
 
-#: forms.py:99
+#: forms.py:108
 msgid "Send me the code by email"
 msgstr ""
 
-#: forms.py:103
+#: forms.py:112
 msgid "This project does not exists"
 msgstr ""
 
-#: forms.py:107
+#: forms.py:116
 msgid "Date"
 msgstr ""
 
-#: forms.py:108
+#: forms.py:117
 msgid "What?"
 msgstr ""
 
-#: forms.py:109
+#: forms.py:118
 msgid "Payer"
 msgstr ""
 
-#: forms.py:110
+#: forms.py:119
 msgid "Amount paid"
 msgstr ""
 
-#: forms.py:111 templates/list_bills.html:154
+#: forms.py:120 templates/list_bills.html:103
 msgid "For whom?"
 msgstr ""
 
-#: forms.py:113
-msgid "Send the bill"
+#: forms.py:122
+msgid "Submit"
 msgstr ""
 
-#: forms.py:139
-msgid "Bills can't be null"
+#: forms.py:123
+msgid "Submit and add a new one"
 msgstr ""
 
-#: forms.py:144
-msgid "Name"
+#: forms.py:149
+msgid "Bills can't be null"
 msgstr ""
 
-#: forms.py:144
-msgid "Type user name here"
+#: forms.py:154
+msgid "Name"
 msgstr ""
 
-#: forms.py:145 templates/forms.html:94
+#: forms.py:155 templates/forms.html:95
 msgid "Add"
 msgstr ""
 
-#: forms.py:153
+#: forms.py:163
 msgid "User name incorrect"
 msgstr ""
 
-#: forms.py:157
+#: forms.py:167
 msgid "This project already have this member"
 msgstr ""
 
-#: forms.py:167
+#: forms.py:178
 msgid "People to notify"
 msgstr ""
 
-#: forms.py:168
+#: forms.py:179
 msgid "Send invites"
 msgstr ""
 
-#: forms.py:174
+#: forms.py:185
 #, python-format
 msgid "The email %(email)s is not valid"
 msgstr ""
 
-#: forms.py:179
-msgid "Start date"
+#: forms.py:190
+msgid "Name for this archive (optional)"
 msgstr ""
 
-#: forms.py:180
-msgid "End date"
+#: forms.py:191
+msgid "Start date"
 msgstr ""
 
-#: forms.py:181
-msgid "Name for this archive (optional)"
+#: forms.py:192
+msgid "End date"
 msgstr ""
 
-#: web.py:89
+#: web.py:95
 msgid "This private code is not the right one"
 msgstr ""
 
-#: web.py:137
+#: web.py:147
 #, python-format
 msgid "You have just created '%(project)s' to share your expenses"
 msgstr ""
 
-#: web.py:148
+#: web.py:165
 #, python-format
-msgid "The project identifier is %(project)s"
+msgid "%(msg_compl)sThe project identifier is %(project)s"
 msgstr ""
 
-#: web.py:166
+#: web.py:185
 msgid "a mail has been sent to you with the password"
 msgstr ""
 
-#: web.py:229
+#: web.py:211
+msgid "Project successfully deleted"
+msgstr ""
+
+#: web.py:254
 #, python-format
 msgid "You have been invited to share your expenses for %(project)s"
 msgstr ""
 
-#: web.py:236
+#: web.py:261
 msgid "Your invitations have been sent"
 msgstr ""
 
-#: web.py:261
+#: web.py:290
 #, python-format
 msgid "%(member)s had been added"
 msgstr ""
 
-#: web.py:273
+#: web.py:303
 #, python-format
 msgid "%(name)s is part of this project again"
 msgstr ""
 
-#: web.py:281
+#: web.py:311
 #, python-format
 msgid "User '%(name)s' has been deactivated"
 msgstr ""
 
-#: web.py:283
+#: web.py:313
 #, python-format
 msgid "User '%(name)s' has been removed"
 msgstr ""
 
-#: web.py:300
+#: web.py:331
 msgid "The bill has been added"
 msgstr ""
 
-#: web.py:315
+#: web.py:351
 msgid "The bill has been deleted"
 msgstr ""
 
-#: web.py:333
+#: web.py:369
 msgid "The bill has been modified"
 msgstr ""
 
-#: web.py:357
+#: web.py:399
 msgid "The data from XX to XX has been archived"
 msgstr ""
 
-#: templates/add_bill.html:19
+#: templates/add_bill.html:9
 msgid "Back to the list"
 msgstr ""
 
@@ -219,8 +227,27 @@ msgstr ""
 msgid "Create a new project"
 msgstr ""
 
-#: templates/edit_project.html:6 templates/list_bills.html:77
-#: templates/list_bills.html:87
+#: templates/dashboard.html:5
+msgid "Project"
+msgstr ""
+
+#: templates/dashboard.html:5
+msgid "Number of members"
+msgstr ""
+
+#: templates/dashboard.html:5
+msgid "Number of bills"
+msgstr ""
+
+#: templates/dashboard.html:5
+msgid "Newest bill"
+msgstr ""
+
+#: templates/dashboard.html:5
+msgid "Oldest bill"
+msgstr ""
+
+#: templates/edit_project.html:6 templates/list_bills.html:24
 msgid "you sure?"
 msgstr ""
 
@@ -228,31 +255,35 @@ msgstr ""
 msgid "Edit this project"
 msgstr ""
 
-#: templates/forms.html:24
+#: templates/forms.html:23
 msgid "Can't remember the password?"
 msgstr ""
 
-#: templates/forms.html:27
+#: templates/forms.html:26
 msgid "Cancel"
 msgstr ""
 
-#: templates/forms.html:69
+#: templates/forms.html:68
 msgid "Edit the project"
 msgstr ""
 
-#: templates/forms.html:70 templates/list_bills.html:139
-#: templates/list_bills.html:167
+#: templates/forms.html:69 templates/list_bills.html:70
+#: templates/list_bills.html:114
 msgid "delete"
 msgstr ""
 
-#: templates/forms.html:78
+#: templates/forms.html:77
 msgid "Edit this bill"
 msgstr ""
 
-#: templates/forms.html:78
+#: templates/forms.html:77 templates/list_bills.html:94
 msgid "Add a bill"
 msgstr ""
 
+#: templates/forms.html:95
+msgid "Type user name here"
+msgstr ""
+
 #: templates/forms.html:102
 msgid "Send the invitations"
 msgstr ""
@@ -265,35 +296,35 @@ msgstr ""
 msgid "Create an archive"
 msgstr ""
 
-#: templates/forms.html:115
+#: templates/forms.html:116
 msgid "Create the archive"
 msgstr ""
 
-#: templates/home.html:9
+#: templates/home.html:8
 msgid "Manage your shared <br>expenses, easily"
 msgstr ""
 
-#: templates/home.html:10
+#: templates/home.html:9
 msgid "Try out the demo"
 msgstr ""
 
-#: templates/home.html:13
+#: templates/home.html:12
 msgid "You're sharing a house?"
 msgstr ""
 
-#: templates/home.html:13
+#: templates/home.html:12
 msgid "Going on holidays with friends?"
 msgstr ""
 
-#: templates/home.html:13
+#: templates/home.html:12
 msgid "Simply sharing money with others?"
 msgstr ""
 
-#: templates/home.html:13
+#: templates/home.html:12
 msgid "We can help!"
 msgstr ""
 
-#: templates/home.html:26
+#: templates/home.html:24
 msgid "Log to an existing project"
 msgstr ""
 
@@ -305,107 +336,109 @@ msgstr ""
 msgid "can't remember your password?"
 msgstr ""
 
-#: templates/home.html:34
+#: templates/home.html:36
 msgid "or create a new one"
 msgstr ""
 
-#: templates/home.html:36
+#: templates/home.html:40
 msgid "let's get started"
 msgstr ""
 
+#: templates/home.html:51
+msgid ""
+"This access code will be sent to your friends. It is stored as-is by the "
+"server, so don\\'t reuse a personal password!"
+msgstr ""
+
 #: templates/layout.html:5
 msgid "Account manager"
 msgstr ""
 
-#: templates/layout.html:54
+#: templates/layout.html:45 templates/settle_bills.html:4
 msgid "Bills"
 msgstr ""
 
-#: templates/layout.html:58
+#: templates/layout.html:46 templates/settle_bills.html:5
+msgid "Settle"
+msgstr ""
+
+#: templates/layout.html:53
 msgid "options"
 msgstr ""
 
-#: templates/layout.html:60
+#: templates/layout.html:55
 msgid "Project settings"
 msgstr ""
 
-#: templates/layout.html:64
+#: templates/layout.html:59
 msgid "switch to"
 msgstr ""
 
-#: templates/layout.html:67
+#: templates/layout.html:62
 msgid "Start a new project"
 msgstr ""
 
-#: templates/layout.html:69
+#: templates/layout.html:64
 msgid "Logout"
 msgstr ""
 
-#: templates/layout.html:95
+#: templates/layout.html:92
 msgid "This is a free software"
 msgstr ""
 
-#: templates/layout.html:95
+#: templates/layout.html:92
 msgid "you can contribute and improve it!"
 msgstr ""
 
-#: templates/list_bills.html:115
-msgid "Balance"
-msgstr ""
-
-#: templates/list_bills.html:140
+#: templates/list_bills.html:74
 msgid "reactivate"
 msgstr ""
 
-#: templates/list_bills.html:144
+#: templates/list_bills.html:88
 msgid "The project identifier is"
 msgstr ""
 
-#: templates/list_bills.html:144
+#: templates/list_bills.html:88
 msgid "remember it!"
 msgstr ""
 
-#: templates/list_bills.html:145
+#: templates/list_bills.html:89
 msgid "Add a new bill"
 msgstr ""
 
-#: templates/list_bills.html:148
-msgid "hide this form"
-msgstr ""
-
-#: templates/list_bills.html:154
+#: templates/list_bills.html:103
 msgid "When?"
 msgstr ""
 
-#: templates/list_bills.html:154
+#: templates/list_bills.html:103
 msgid "Who paid?"
 msgstr ""
 
-#: templates/list_bills.html:154
+#: templates/list_bills.html:103
 msgid "For what?"
 msgstr ""
 
-#: templates/list_bills.html:154
+#: templates/list_bills.html:103 templates/settle_bills.html:31
 msgid "How much?"
 msgstr ""
 
-#: templates/list_bills.html:154
+#: templates/list_bills.html:103
 msgid "Actions"
 msgstr ""
 
-#: templates/list_bills.html:162
+#: templates/list_bills.html:111
 msgid "each"
 msgstr ""
 
-#: templates/list_bills.html:164
+#: templates/list_bills.html:113
 msgid "edit"
 msgstr ""
 
-#: templates/list_bills.html:177
+#: templates/list_bills.html:122
 msgid "Nothing to list yet. You probably want to"
 msgstr ""
 
-#: templates/list_bills.html:177
+#: templates/list_bills.html:122
 msgid "add a bill"
 msgstr ""
 
@@ -449,3 +482,11 @@ msgstr ""
 msgid "and notify them yourself"
 msgstr ""
 
+#: templates/settle_bills.html:31
+msgid "Who pays?"
+msgstr ""
+
+#: templates/settle_bills.html:31
+msgid "To whom?"
+msgstr ""
+