Add more human "for who?" description.

The limit for displaying "Everyone but …" instead of the ower's list is completely empirical.
spiral-project · Sep 30, 2019 · 54ce277 · 54ce277
1 parent ad6c6a4
commit 54ce277
Show file tree

Hide file tree

Showing 9 changed files with 79 additions and 16 deletions.
diff --git a/ihatemoney/messages.pot b/ihatemoney/messages.pot
@@ -402,6 +402,13 @@ msgstr ""
 msgid "Added on %(date)s"
 msgstr ""
 
+msgid "Everyone"
+msgstr ""
+
+#, python-format
+msgid "Everyone but %(excluded)s"
+msgstr ""
+
 msgid "each"
 msgstr ""
 

diff --git a/ihatemoney/templates/list_bills.html b/ihatemoney/templates/list_bills.html
@@ -123,7 +123,13 @@ <h3 class="modal-title">{{ _('Add a bill') }}</h3>
                 </td>
                 <td>{{ bill.payer }}</td>
                 <td>{{ bill.what }}</td>
-                <td>{{ bill.owers|join(', ', 'name') }} </td>
+                <td>{% if bill.owers|length == g.project.members|length -%}
+                {{ _("Everyone") }}
+                {%- elif bill.owers|length > g.project.members|length / 2 + 1 -%}
+                {{ _("Everyone but %(excluded)s", excluded=g.project.members|reject('in', bill.owers)|join(', ', 'name')) }}
+                {%- else -%}
+                {{ bill.owers|join(', ', 'name') }}
+                {%- endif %}</td>
                 <td>{{ "%0.2f"|format(bill.amount) }} ({{ "%0.2f"|format(bill.pay_each()) }} {{ _("each") }})</td>
                 <td class="bill-actions">
                     <a class="edit" href="{{ url_for(".edit_bill", bill_id=bill.id) }}" title="{{ _("edit") }}">{{ _('edit') }}</a>

diff --git a/ihatemoney/translations/el/LC_MESSAGES/messages.po b/ihatemoney/translations/el/LC_MESSAGES/messages.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-24 16:56+0200\n"
+"POT-Creation-Date: 2019-09-30 23:53+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: Automatically generated\n"
 "Language: el\n"
@@ -418,6 +418,13 @@ msgstr ""
 msgid "Added on %(date)s"
 msgstr ""
 
+msgid "Everyone"
+msgstr ""
+
+#, python-format
+msgid "Everyone but %(excluded)s"
+msgstr ""
+
 msgid "each"
 msgstr ""
 

diff --git a/ihatemoney/translations/es_419/LC_MESSAGES/messages.po b/ihatemoney/translations/es_419/LC_MESSAGES/messages.po
@@ -1,18 +1,18 @@
+
 msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-24 16:56+0200\n"
+"POT-Creation-Date: 2019-09-30 23:53+0200\n"
 "PO-Revision-Date: 2019-09-25 22:28+0000\n"
 "Last-Translator: Diego Caraballo <[email protected]>\n"
-"Language-Team: Spanish (Latin America) <https://hosted.weblate.org/projects/"
-"i-hate-money/i-hate-money/es_419/>\n"
 "Language: es_419\n"
+"Language-Team: Spanish (Latin America) "
+"<https://hosted.weblate.org/projects/i-hate-money/i-hate-money/es_419/>\n"
+"Plural-Forms: nplurals=2; plural=n != 1\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 3.9-dev\n"
 "Generated-By: Babel 2.7.0\n"
 
 msgid ""
@@ -433,6 +433,13 @@ msgstr "¿Cuánto?"
 msgid "Added on %(date)s"
 msgstr "Agregado el %(date)s"
 
+msgid "Everyone"
+msgstr ""
+
+#, python-format
+msgid "Everyone but %(excluded)s"
+msgstr ""
+
 msgid "each"
 msgstr "Cada"
 
@@ -525,3 +532,4 @@ msgstr "gastado"
 
 msgid "Balance"
 msgstr "Balance"
+
diff --git a/ihatemoney/translations/fr/LC_MESSAGES/messages.po b/ihatemoney/translations/fr/LC_MESSAGES/messages.po
@@ -7,17 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PROJECT VERSION\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-09-18 21:34+0200\n"
+"POT-Creation-Date: 2019-09-30 23:53+0200\n"
 "PO-Revision-Date: 2019-09-24 15:13+0000\n"
 "Last-Translator: Alexis Metaireau <[email protected]>\n"
-"Language-Team: French <https://hosted.weblate.org/projects/i-hate-money/"
-"i-hate-money/fr/>\n"
 "Language: fr\n"
+"Language-Team: French <https://hosted.weblate.org/projects/i-hate-money/i"
+"-hate-money/fr/>\n"
+"Plural-Forms: nplurals=2; plural=n > 1\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=utf-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n > 1;\n"
-"X-Generator: Weblate 3.9-dev\n"
 "Generated-By: Babel 2.7.0\n"
 
 msgid ""
@@ -434,6 +433,13 @@ msgstr "Combien ?"
 msgid "Added on %(date)s"
 msgstr "Ajouté le %(date)s"
 
+msgid "Everyone"
+msgstr ""
+
+#, python-format
+msgid "Everyone but %(excluded)s"
+msgstr ""
+
 msgid "each"
 msgstr "chacun"
 
@@ -669,3 +675,4 @@ msgstr "Solde"
 
 #~ msgid "A link to reset your password has been sent to your email."
 #~ msgstr "Un lien pour changer votre mot de passe vous a été envoyé par mail."
+
diff --git a/ihatemoney/translations/nb_NO/LC_MESSAGES/messages.po b/ihatemoney/translations/nb_NO/LC_MESSAGES/messages.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-24 16:56+0200\n"
+"POT-Creation-Date: 2019-09-30 23:53+0200\n"
 "PO-Revision-Date: 2019-09-19 23:27+0000\n"
 "Last-Translator: Allan Nordhøy <[email protected]>\n"
 "Language: nb_NO\n"
@@ -446,6 +446,13 @@ msgstr "Hvor meget?"
 msgid "Added on %(date)s"
 msgstr "Lagt til %(date)s"
 
+msgid "Everyone"
+msgstr ""
+
+#, python-format
+msgid "Everyone but %(excluded)s"
+msgstr ""
+
 msgid "each"
 msgstr "hver"
 

diff --git a/ihatemoney/translations/nl/LC_MESSAGES/messages.po b/ihatemoney/translations/nl/LC_MESSAGES/messages.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  \n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2019-09-24 16:56+0200\n"
+"POT-Creation-Date: 2019-09-30 23:53+0200\n"
 "PO-Revision-Date: 2019-09-19 23:27+0000\n"
 "Last-Translator: Heimen Stoffels <[email protected]>\n"
 "Language: nl\n"
@@ -427,6 +427,13 @@ msgstr "Hoeveel?"
 msgid "Added on %(date)s"
 msgstr "Toegevoegd op %(date)s"
 
+msgid "Everyone"
+msgstr ""
+
+#, python-format
+msgid "Everyone but %(excluded)s"
+msgstr ""
+
 msgid "each"
 msgstr "per persoon"
 

diff --git a/ihatemoney/translations/tr/LC_MESSAGES/messages.po b/ihatemoney/translations/tr/LC_MESSAGES/messages.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-24 16:56+0200\n"
+"POT-Creation-Date: 2019-09-30 23:53+0200\n"
 "PO-Revision-Date: 2019-08-07 13:24+0000\n"
 "Last-Translator: Mesut Akcan <[email protected]>\n"
 "Language: tr\n"
@@ -423,6 +423,13 @@ msgstr ""
 msgid "Added on %(date)s"
 msgstr ""
 
+msgid "Everyone"
+msgstr ""
+
+#, python-format
+msgid "Everyone but %(excluded)s"
+msgstr ""
+
 msgid "each"
 msgstr ""
 

diff --git a/ihatemoney/translations/zh_HANS-CN/LC_MESSAGES/messages.po b/ihatemoney/translations/zh_HANS-CN/LC_MESSAGES/messages.po
@@ -3,7 +3,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2019-09-24 16:56+0200\n"
+"POT-Creation-Date: 2019-09-30 23:53+0200\n"
 "PO-Revision-Date: 2019-07-02 00:02+0000\n"
 "Last-Translator: Elizabeth Sherrock <[email protected]>\n"
 "Language: zh_HANS_CN\n"
@@ -420,6 +420,13 @@ msgstr "多少？"
 msgid "Added on %(date)s"
 msgstr ""
 
+msgid "Everyone"
+msgstr ""
+
+#, python-format
+msgid "Everyone but %(excluded)s"
+msgstr ""
+
 msgid "each"
 msgstr ""