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

Change "Person" to "Participant" in history view

Browse source 
Currently, the main user-facing term is "Participant", as seen for
instance in the "Add participant" form.  "Person" is not used anywhere in
the interface.

See #302 for a more general discussion on choosing the right terminology.
This commit is contained in:
Baptiste Jonglez 2020-04-24 20:00:25 +02:00
parent 60a7bb62e1
commit b7845faeed
14 changed files with 65 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
ihatemoney/history.py
View file

@ -70,7 +70,7 @@ def get_history(project, human_readable_names=True):
for version_list in [person_query.all(), project_query.all(), bill_query.all()]: for version_list in [person_query.all(), project_query.all(), bill_query.all()]:
for version in version_list: for version in version_list:
object_type = { object_type = {
"Person": _("Person"), "Person": _("Participant"),
"Bill": _("Bill"), "Bill": _("Bill"),
"Project": _("Project"), "Project": _("Project"),
}[parent_class(type(version)).__name__] }[parent_class(type(version)).__name__]

2
ihatemoney/messages.pot
View file

@ -118,7 +118,7 @@ msgstr ""
msgid "The email %(email)s is not valid" msgid "The email %(email)s is not valid"
msgstr "" msgstr ""
msgid "Person" msgid "Participant"
msgstr "" msgstr ""
msgid "Bill" msgid "Bill"

14
ihatemoney/tests/tests.py
View file

@ -2123,7 +2123,7 @@ class APITestCase(IhatemoneyTestCase):
resp = self.client.get("/raclette/history", follow_redirects=True) resp = self.client.get("/raclette/history", follow_redirects=True)
self.assertEqual(resp.status_code, 200) self.assertEqual(resp.status_code, 200)
self.assertIn( self.assertIn(
f"Person {em_surround('alexis')} added", resp.data.decode("utf-8") f"Participant {em_surround('alexis')} added", resp.data.decode("utf-8")
) )
self.assertIn( self.assertIn(
f"Project {em_surround('raclette')} added", resp.data.decode("utf-8"), f"Project {em_surround('raclette')} added", resp.data.decode("utf-8"),
@ -2578,7 +2578,7 @@ class HistoryTestCase(IhatemoneyTestCase):
resp = self.client.get("/demo/history") resp = self.client.get("/demo/history")
self.assertEqual(resp.status_code, 200) self.assertEqual(resp.status_code, 200)
self.assertIn( self.assertIn(
f"Person {em_surround('alexis')} added", resp.data.decode("utf-8") f"Participant {em_surround('alexis')} added", resp.data.decode("utf-8")
) )
# create a bill # create a bill
@ -2666,7 +2666,7 @@ class HistoryTestCase(IhatemoneyTestCase):
self.assertEqual(resp.status_code, 200) self.assertEqual(resp.status_code, 200)
self.assertRegex( self.assertRegex(
resp.data.decode("utf-8"), resp.data.decode("utf-8"),
r"Person %s:\s* Weight changed\s* from %s\s* to %s" r"Participant %s:\s* Weight changed\s* from %s\s* to %s"
% ( % (
em_surround("alexis", regex_escape=True), em_surround("alexis", regex_escape=True),
em_surround("1.0", regex_escape=True), em_surround("1.0", regex_escape=True),
@ -2674,12 +2674,14 @@ class HistoryTestCase(IhatemoneyTestCase):
), ),
) )
self.assertIn( self.assertIn(
"Person %s renamed to %s" "Participant %s renamed to %s"
% (em_surround("alexis"), em_surround("new name"),), % (em_surround("alexis"), em_surround("new name"),),
resp.data.decode("utf-8"), resp.data.decode("utf-8"),
) )
self.assertLess( self.assertLess(
resp.data.decode("utf-8").index(f"Person {em_surround('alexis')} renamed"), resp.data.decode("utf-8").index(
f"Participant {em_surround('alexis')} renamed"
),
resp.data.decode("utf-8").index("Weight changed"), resp.data.decode("utf-8").index("Weight changed"),
) )
@ -2690,7 +2692,7 @@ class HistoryTestCase(IhatemoneyTestCase):
resp = self.client.get("/demo/history") resp = self.client.get("/demo/history")
self.assertEqual(resp.status_code, 200) self.assertEqual(resp.status_code, 200)
self.assertIn( self.assertIn(
f"Person {em_surround('new name')} removed", resp.data.decode("utf-8") f"Participant {em_surround('new name')} removed", resp.data.decode("utf-8")
) )
def test_double_bill_double_person_edit_second(self): def test_double_bill_double_person_edit_second(self):

7
ihatemoney/translations/cs/LC_MESSAGES/messages.po
View file

@ -3,7 +3,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-04-24 19:33+0200\n" "POT-Creation-Date: 2020-04-24 19:59+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Automatically generated\n" "Last-Translator: Automatically generated\n"
"Language: cs\n" "Language: cs\n"
@ -134,7 +134,7 @@ msgstr ""
msgid "The email %(email)s is not valid" msgid "The email %(email)s is not valid"
msgstr "" msgstr ""
msgid "Person" msgid "Participant"
msgstr "" msgstr ""
msgid "Bill" msgid "Bill"
@ -742,3 +742,6 @@ msgstr ""
#~ msgid "%(member)s had been added" #~ msgid "%(member)s had been added"
#~ msgstr "" #~ msgstr ""
#~ msgid "Person"
#~ msgstr ""

7
ihatemoney/translations/de/LC_MESSAGES/messages.po
View file

@ -3,7 +3,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-04-24 19:33+0200\n" "POT-Creation-Date: 2020-04-24 19:59+0200\n"
"PO-Revision-Date: 2020-02-12 10:50+0000\n" "PO-Revision-Date: 2020-02-12 10:50+0000\n"
"Last-Translator: flolilo <flolilo@mailbox.org>\n" "Last-Translator: flolilo <flolilo@mailbox.org>\n"
"Language: de\n" "Language: de\n"
@ -139,7 +139,7 @@ msgstr "Einladung senden"
msgid "The email %(email)s is not valid" msgid "The email %(email)s is not valid"
msgstr "Die E-Mail-Adresse(n) %(email)s ist/sind nicht gültig" msgstr "Die E-Mail-Adresse(n) %(email)s ist/sind nicht gültig"
msgid "Person" msgid "Participant"
msgstr "" msgstr ""
msgid "Bill" msgid "Bill"
@ -764,3 +764,6 @@ msgstr ""
#~ msgid "%(member)s had been added" #~ msgid "%(member)s had been added"
#~ msgstr "%(member)s wurde(n) hinzugefügt" #~ msgstr "%(member)s wurde(n) hinzugefügt"
#~ msgid "Person"
#~ msgstr ""

7
ihatemoney/translations/el/LC_MESSAGES/messages.po
View file

@ -3,7 +3,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-04-24 19:33+0200\n" "POT-Creation-Date: 2020-04-24 19:59+0200\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: Automatically generated\n" "Last-Translator: Automatically generated\n"
"Language: el\n" "Language: el\n"
@ -134,7 +134,7 @@ msgstr ""
msgid "The email %(email)s is not valid" msgid "The email %(email)s is not valid"
msgstr "" msgstr ""
msgid "Person" msgid "Participant"
msgstr "" msgstr ""
msgid "Bill" msgid "Bill"
@ -824,3 +824,6 @@ msgstr ""
#~ msgid "%(member)s had been added" #~ msgid "%(member)s had been added"
#~ msgstr "" #~ msgstr ""
#~ msgid "Person"
#~ msgstr ""

7
ihatemoney/translations/es_419/LC_MESSAGES/messages.po
View file

@ -3,7 +3,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-04-24 19:33+0200\n" "POT-Creation-Date: 2020-04-24 19:59+0200\n"
"PO-Revision-Date: 2019-09-25 22:28+0000\n" "PO-Revision-Date: 2019-09-25 22:28+0000\n"
"Last-Translator: Diego Caraballo <diegocaraballo84@gmail.com>\n" "Last-Translator: Diego Caraballo <diegocaraballo84@gmail.com>\n"
"Language: es_419\n" "Language: es_419\n"
@ -139,7 +139,7 @@ msgstr "Enviar invitaciones"
msgid "The email %(email)s is not valid" msgid "The email %(email)s is not valid"
msgstr "El correo electrónico %(email)s no es válido" msgstr "El correo electrónico %(email)s no es válido"
msgid "Person" msgid "Participant"
msgstr "" msgstr ""
msgid "Bill" msgid "Bill"
@ -767,3 +767,6 @@ msgstr ""
#~ msgid "%(member)s had been added" #~ msgid "%(member)s had been added"
#~ msgstr "se han añadido %(member)s" #~ msgstr "se han añadido %(member)s"
#~ msgid "Person"
#~ msgstr ""

7
ihatemoney/translations/fr/LC_MESSAGES/messages.po
View file

@ -7,7 +7,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PROJECT VERSION\n" "Project-Id-Version: PROJECT VERSION\n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2020-04-24 19:33+0200\n" "POT-Creation-Date: 2020-04-24 19:59+0200\n"
"PO-Revision-Date: 2020-04-22 22:11+0000\n" "PO-Revision-Date: 2020-04-22 22:11+0000\n"
"Last-Translator: Glandos <bugs-github@antipoul.fr>\n" "Last-Translator: Glandos <bugs-github@antipoul.fr>\n"
"Language: fr\n" "Language: fr\n"
@ -143,7 +143,7 @@ msgstr "Envoyer les invitations"
msgid "The email %(email)s is not valid" msgid "The email %(email)s is not valid"
msgstr "L’email %(email)s est invalide" msgstr "L’email %(email)s est invalide"
msgid "Person" msgid "Participant"
msgstr "" msgstr ""
msgid "Bill" msgid "Bill"
@ -916,3 +916,6 @@ msgstr ""
#~ msgid "%(member)s had been added" #~ msgid "%(member)s had been added"
#~ msgstr "%(member)s a bien été ajouté" #~ msgstr "%(member)s a bien été ajouté"
#~ msgid "Person"
#~ msgstr ""

7
ihatemoney/translations/id/LC_MESSAGES/messages.po
View file

@ -3,7 +3,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-04-24 19:33+0200\n" "POT-Creation-Date: 2020-04-24 19:59+0200\n"
"PO-Revision-Date: 2019-11-16 10:04+0000\n" "PO-Revision-Date: 2019-11-16 10:04+0000\n"
"Last-Translator: Muhammad Fauzi <fauzi.padlaw@gmail.com>\n" "Last-Translator: Muhammad Fauzi <fauzi.padlaw@gmail.com>\n"
"Language: id\n" "Language: id\n"
@ -139,7 +139,7 @@ msgstr "Kirim undangan"
msgid "The email %(email)s is not valid" msgid "The email %(email)s is not valid"
msgstr "Surel %(email)s tidak valid" msgstr "Surel %(email)s tidak valid"
msgid "Person" msgid "Participant"
msgstr "" msgstr ""
msgid "Bill" msgid "Bill"
@ -761,3 +761,6 @@ msgstr ""
#~ msgid "%(member)s had been added" #~ msgid "%(member)s had been added"
#~ msgstr "%(member)s telah ditambahkan" #~ msgstr "%(member)s telah ditambahkan"
#~ msgid "Person"
#~ msgstr ""

7
ihatemoney/translations/nb_NO/LC_MESSAGES/messages.po
View file

@ -3,7 +3,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-04-24 19:33+0200\n" "POT-Creation-Date: 2020-04-24 19:59+0200\n"
"PO-Revision-Date: 2019-11-12 09:04+0000\n" "PO-Revision-Date: 2019-11-12 09:04+0000\n"
"Last-Translator: Allan Nordhøy <epost@anotheragency.no>\n" "Last-Translator: Allan Nordhøy <epost@anotheragency.no>\n"
"Language: nb_NO\n" "Language: nb_NO\n"
@ -141,7 +141,7 @@ msgstr "Send invitasjoner"
msgid "The email %(email)s is not valid" msgid "The email %(email)s is not valid"
msgstr "E-posten \"%(email)s\" er ikke gyldig" msgstr "E-posten \"%(email)s\" er ikke gyldig"
msgid "Person" msgid "Participant"
msgstr "" msgstr ""
msgid "Bill" msgid "Bill"
@ -898,3 +898,6 @@ msgstr ""
#~ msgid "%(member)s had been added" #~ msgid "%(member)s had been added"
#~ msgstr "%(member)s lagt til" #~ msgstr "%(member)s lagt til"
#~ msgid "Person"
#~ msgstr ""

7
ihatemoney/translations/nl/LC_MESSAGES/messages.po
View file

@ -3,7 +3,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: \n" "Project-Id-Version: \n"
"Report-Msgid-Bugs-To: EMAIL@ADDRESS\n" "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
"POT-Creation-Date: 2020-04-24 19:33+0200\n" "POT-Creation-Date: 2020-04-24 19:59+0200\n"
"PO-Revision-Date: 2019-10-07 22:56+0000\n" "PO-Revision-Date: 2019-10-07 22:56+0000\n"
"Last-Translator: Heimen Stoffels <vistausss@outlook.com>\n" "Last-Translator: Heimen Stoffels <vistausss@outlook.com>\n"
"Language: nl\n" "Language: nl\n"
@ -135,7 +135,7 @@ msgstr "Uitnodigingen versturen"
msgid "The email %(email)s is not valid" msgid "The email %(email)s is not valid"
msgstr "Het e-mailadres '%(email)s' is onjuist" msgstr "Het e-mailadres '%(email)s' is onjuist"
msgid "Person" msgid "Participant"
msgstr "" msgstr ""
msgid "Bill" msgid "Bill"
@ -873,3 +873,6 @@ msgstr ""
#~ msgid "%(member)s had been added" #~ msgid "%(member)s had been added"
#~ msgstr "%(member)s is toegevoegd" #~ msgstr "%(member)s is toegevoegd"
#~ msgid "Person"
#~ msgstr ""

7
ihatemoney/translations/tr/LC_MESSAGES/messages.po
View file

@ -3,7 +3,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-04-24 19:33+0200\n" "POT-Creation-Date: 2020-04-24 19:59+0200\n"
"PO-Revision-Date: 2019-08-07 13:24+0000\n" "PO-Revision-Date: 2019-08-07 13:24+0000\n"
"Last-Translator: Mesut Akcan <makcan@gmail.com>\n" "Last-Translator: Mesut Akcan <makcan@gmail.com>\n"
"Language: tr\n" "Language: tr\n"
@ -139,7 +139,7 @@ msgstr ""
msgid "The email %(email)s is not valid" msgid "The email %(email)s is not valid"
msgstr "" msgstr ""
msgid "Person" msgid "Participant"
msgstr "" msgstr ""
msgid "Bill" msgid "Bill"
@ -823,3 +823,6 @@ msgstr ""
#~ msgid "%(member)s had been added" #~ msgid "%(member)s had been added"
#~ msgstr "" #~ msgstr ""
#~ msgid "Person"
#~ msgstr ""

7
ihatemoney/translations/uk/LC_MESSAGES/messages.po
View file

@ -3,7 +3,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-04-24 19:33+0200\n" "POT-Creation-Date: 2020-04-24 19:59+0200\n"
"PO-Revision-Date: 2019-12-08 16:26+0000\n" "PO-Revision-Date: 2019-12-08 16:26+0000\n"
"Last-Translator: Tymofij Lytvynenko <till.svit@gmail.com>\n" "Last-Translator: Tymofij Lytvynenko <till.svit@gmail.com>\n"
"Language: uk\n" "Language: uk\n"
@ -136,7 +136,7 @@ msgstr ""
msgid "The email %(email)s is not valid" msgid "The email %(email)s is not valid"
msgstr "" msgstr ""
msgid "Person" msgid "Participant"
msgstr "" msgstr ""
msgid "Bill" msgid "Bill"
@ -744,3 +744,6 @@ msgstr ""
#~ msgid "%(member)s had been added" #~ msgid "%(member)s had been added"
#~ msgstr "" #~ msgstr ""
#~ msgid "Person"
#~ msgstr ""

7
ihatemoney/translations/zh_HANS-CN/LC_MESSAGES/messages.po
View file

@ -3,7 +3,7 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: PACKAGE VERSION\n" "Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n" "Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2020-04-24 19:33+0200\n" "POT-Creation-Date: 2020-04-24 19:59+0200\n"
"PO-Revision-Date: 2020-02-09 12:01+0000\n" "PO-Revision-Date: 2020-02-09 12:01+0000\n"
"Last-Translator: Muge Niu <mugeniu12138@gmail.com>\n" "Last-Translator: Muge Niu <mugeniu12138@gmail.com>\n"
"Language: zh_HANS_CN\n" "Language: zh_HANS_CN\n"
@ -136,7 +136,7 @@ msgstr ""
msgid "The email %(email)s is not valid" msgid "The email %(email)s is not valid"
msgstr "" msgstr ""
msgid "Person" msgid "Participant"
msgstr "" msgstr ""
msgid "Bill" msgid "Bill"
@ -837,3 +837,6 @@ msgstr ""
#~ msgid "%(member)s had been added" #~ msgid "%(member)s had been added"
#~ msgstr "" #~ msgstr ""
#~ msgid "Person"
#~ msgstr ""