From b7845faeeda22fd4ba61351ebeabfbe26a76faa4 Mon Sep 17 00:00:00 2001 From: Baptiste Jonglez Date: Fri, 24 Apr 2020 20:00:25 +0200 Subject: [PATCH] Change "Person" to "Participant" in history view 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. --- ihatemoney/history.py | 2 +- ihatemoney/messages.pot | 2 +- ihatemoney/tests/tests.py | 14 ++++++++------ ihatemoney/translations/cs/LC_MESSAGES/messages.po | 7 +++++-- ihatemoney/translations/de/LC_MESSAGES/messages.po | 7 +++++-- ihatemoney/translations/el/LC_MESSAGES/messages.po | 7 +++++-- .../translations/es_419/LC_MESSAGES/messages.po | 7 +++++-- ihatemoney/translations/fr/LC_MESSAGES/messages.po | 7 +++++-- ihatemoney/translations/id/LC_MESSAGES/messages.po | 7 +++++-- .../translations/nb_NO/LC_MESSAGES/messages.po | 7 +++++-- ihatemoney/translations/nl/LC_MESSAGES/messages.po | 7 +++++-- ihatemoney/translations/tr/LC_MESSAGES/messages.po | 7 +++++-- ihatemoney/translations/uk/LC_MESSAGES/messages.po | 7 +++++-- .../zh_HANS-CN/LC_MESSAGES/messages.po | 7 +++++-- 14 files changed, 65 insertions(+), 30 deletions(-) diff --git a/ihatemoney/history.py b/ihatemoney/history.py index 40aa7619..9dda3de6 100644 --- a/ihatemoney/history.py +++ b/ihatemoney/history.py @@ -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 in version_list: object_type = { - "Person": _("Person"), + "Person": _("Participant"), "Bill": _("Bill"), "Project": _("Project"), }[parent_class(type(version)).__name__] diff --git a/ihatemoney/messages.pot b/ihatemoney/messages.pot index 39fbffdf..a03f8e26 100644 --- a/ihatemoney/messages.pot +++ b/ihatemoney/messages.pot @@ -118,7 +118,7 @@ msgstr "" msgid "The email %(email)s is not valid" msgstr "" -msgid "Person" +msgid "Participant" msgstr "" msgid "Bill" diff --git a/ihatemoney/tests/tests.py b/ihatemoney/tests/tests.py index c836c970..b50fae6c 100644 --- a/ihatemoney/tests/tests.py +++ b/ihatemoney/tests/tests.py @@ -2123,7 +2123,7 @@ class APITestCase(IhatemoneyTestCase): resp = self.client.get("/raclette/history", follow_redirects=True) self.assertEqual(resp.status_code, 200) 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( f"Project {em_surround('raclette')} added", resp.data.decode("utf-8"), @@ -2578,7 +2578,7 @@ class HistoryTestCase(IhatemoneyTestCase): resp = self.client.get("/demo/history") self.assertEqual(resp.status_code, 200) 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 @@ -2666,7 +2666,7 @@ class HistoryTestCase(IhatemoneyTestCase): self.assertEqual(resp.status_code, 200) self.assertRegex( 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("1.0", regex_escape=True), @@ -2674,12 +2674,14 @@ class HistoryTestCase(IhatemoneyTestCase): ), ) self.assertIn( - "Person %s renamed to %s" + "Participant %s renamed to %s" % (em_surround("alexis"), em_surround("new name"),), resp.data.decode("utf-8"), ) 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"), ) @@ -2690,7 +2692,7 @@ class HistoryTestCase(IhatemoneyTestCase): resp = self.client.get("/demo/history") self.assertEqual(resp.status_code, 200) 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): diff --git a/ihatemoney/translations/cs/LC_MESSAGES/messages.po b/ihatemoney/translations/cs/LC_MESSAGES/messages.po index 14d5460f..0175b619 100644 --- a/ihatemoney/translations/cs/LC_MESSAGES/messages.po +++ b/ihatemoney/translations/cs/LC_MESSAGES/messages.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\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" "Last-Translator: Automatically generated\n" "Language: cs\n" @@ -134,7 +134,7 @@ msgstr "" msgid "The email %(email)s is not valid" msgstr "" -msgid "Person" +msgid "Participant" msgstr "" msgid "Bill" @@ -742,3 +742,6 @@ msgstr "" #~ msgid "%(member)s had been added" #~ msgstr "" +#~ msgid "Person" +#~ msgstr "" + diff --git a/ihatemoney/translations/de/LC_MESSAGES/messages.po b/ihatemoney/translations/de/LC_MESSAGES/messages.po index 7c6e9f2a..4d11bb81 100644 --- a/ihatemoney/translations/de/LC_MESSAGES/messages.po +++ b/ihatemoney/translations/de/LC_MESSAGES/messages.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\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" "Last-Translator: flolilo \n" "Language: de\n" @@ -139,7 +139,7 @@ msgstr "Einladung senden" msgid "The email %(email)s is not valid" msgstr "Die E-Mail-Adresse(n) %(email)s ist/sind nicht gültig" -msgid "Person" +msgid "Participant" msgstr "" msgid "Bill" @@ -764,3 +764,6 @@ msgstr "" #~ msgid "%(member)s had been added" #~ msgstr "%(member)s wurde(n) hinzugefügt" +#~ msgid "Person" +#~ msgstr "" + diff --git a/ihatemoney/translations/el/LC_MESSAGES/messages.po b/ihatemoney/translations/el/LC_MESSAGES/messages.po index eb36ee29..a598aeb3 100644 --- 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: 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" "Last-Translator: Automatically generated\n" "Language: el\n" @@ -134,7 +134,7 @@ msgstr "" msgid "The email %(email)s is not valid" msgstr "" -msgid "Person" +msgid "Participant" msgstr "" msgid "Bill" @@ -824,3 +824,6 @@ msgstr "" #~ msgid "%(member)s had been added" #~ msgstr "" +#~ msgid "Person" +#~ msgstr "" + diff --git a/ihatemoney/translations/es_419/LC_MESSAGES/messages.po b/ihatemoney/translations/es_419/LC_MESSAGES/messages.po index aa612dad..04ac92fd 100644 --- a/ihatemoney/translations/es_419/LC_MESSAGES/messages.po +++ b/ihatemoney/translations/es_419/LC_MESSAGES/messages.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\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" "Last-Translator: Diego Caraballo \n" "Language: es_419\n" @@ -139,7 +139,7 @@ msgstr "Enviar invitaciones" msgid "The email %(email)s is not valid" msgstr "El correo electrónico %(email)s no es válido" -msgid "Person" +msgid "Participant" msgstr "" msgid "Bill" @@ -767,3 +767,6 @@ msgstr "" #~ msgid "%(member)s had been added" #~ msgstr "se han añadido %(member)s" +#~ msgid "Person" +#~ msgstr "" + diff --git a/ihatemoney/translations/fr/LC_MESSAGES/messages.po b/ihatemoney/translations/fr/LC_MESSAGES/messages.po index b7452202..fbfd2b3f 100644 --- a/ihatemoney/translations/fr/LC_MESSAGES/messages.po +++ b/ihatemoney/translations/fr/LC_MESSAGES/messages.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: PROJECT VERSION\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" "Last-Translator: Glandos \n" "Language: fr\n" @@ -143,7 +143,7 @@ msgstr "Envoyer les invitations" msgid "The email %(email)s is not valid" msgstr "L’email %(email)s est invalide" -msgid "Person" +msgid "Participant" msgstr "" msgid "Bill" @@ -916,3 +916,6 @@ msgstr "" #~ msgid "%(member)s had been added" #~ msgstr "%(member)s a bien été ajouté" +#~ msgid "Person" +#~ msgstr "" + diff --git a/ihatemoney/translations/id/LC_MESSAGES/messages.po b/ihatemoney/translations/id/LC_MESSAGES/messages.po index ff5cbc98..73506206 100644 --- a/ihatemoney/translations/id/LC_MESSAGES/messages.po +++ b/ihatemoney/translations/id/LC_MESSAGES/messages.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\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" "Last-Translator: Muhammad Fauzi \n" "Language: id\n" @@ -139,7 +139,7 @@ msgstr "Kirim undangan" msgid "The email %(email)s is not valid" msgstr "Surel %(email)s tidak valid" -msgid "Person" +msgid "Participant" msgstr "" msgid "Bill" @@ -761,3 +761,6 @@ msgstr "" #~ msgid "%(member)s had been added" #~ msgstr "%(member)s telah ditambahkan" +#~ msgid "Person" +#~ msgstr "" + diff --git a/ihatemoney/translations/nb_NO/LC_MESSAGES/messages.po b/ihatemoney/translations/nb_NO/LC_MESSAGES/messages.po index 99387d1a..40e9d135 100644 --- 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: 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" "Last-Translator: Allan Nordhøy \n" "Language: nb_NO\n" @@ -141,7 +141,7 @@ msgstr "Send invitasjoner" msgid "The email %(email)s is not valid" msgstr "E-posten \"%(email)s\" er ikke gyldig" -msgid "Person" +msgid "Participant" msgstr "" msgid "Bill" @@ -898,3 +898,6 @@ msgstr "" #~ msgid "%(member)s had been added" #~ msgstr "%(member)s lagt til" +#~ msgid "Person" +#~ msgstr "" + diff --git a/ihatemoney/translations/nl/LC_MESSAGES/messages.po b/ihatemoney/translations/nl/LC_MESSAGES/messages.po index 2aa62ca8..845eba95 100644 --- 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: 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" "Last-Translator: Heimen Stoffels \n" "Language: nl\n" @@ -135,7 +135,7 @@ msgstr "Uitnodigingen versturen" msgid "The email %(email)s is not valid" msgstr "Het e-mailadres '%(email)s' is onjuist" -msgid "Person" +msgid "Participant" msgstr "" msgid "Bill" @@ -873,3 +873,6 @@ msgstr "" #~ msgid "%(member)s had been added" #~ msgstr "%(member)s is toegevoegd" +#~ msgid "Person" +#~ msgstr "" + diff --git a/ihatemoney/translations/tr/LC_MESSAGES/messages.po b/ihatemoney/translations/tr/LC_MESSAGES/messages.po index c00a0a7c..39461714 100644 --- 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: 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" "Last-Translator: Mesut Akcan \n" "Language: tr\n" @@ -139,7 +139,7 @@ msgstr "" msgid "The email %(email)s is not valid" msgstr "" -msgid "Person" +msgid "Participant" msgstr "" msgid "Bill" @@ -823,3 +823,6 @@ msgstr "" #~ msgid "%(member)s had been added" #~ msgstr "" +#~ msgid "Person" +#~ msgstr "" + diff --git a/ihatemoney/translations/uk/LC_MESSAGES/messages.po b/ihatemoney/translations/uk/LC_MESSAGES/messages.po index 179feda6..b1ea5edd 100644 --- a/ihatemoney/translations/uk/LC_MESSAGES/messages.po +++ b/ihatemoney/translations/uk/LC_MESSAGES/messages.po @@ -3,7 +3,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\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" "Last-Translator: Tymofij Lytvynenko \n" "Language: uk\n" @@ -136,7 +136,7 @@ msgstr "" msgid "The email %(email)s is not valid" msgstr "" -msgid "Person" +msgid "Participant" msgstr "" msgid "Bill" @@ -744,3 +744,6 @@ msgstr "" #~ msgid "%(member)s had been added" #~ msgstr "" +#~ msgid "Person" +#~ msgstr "" + diff --git a/ihatemoney/translations/zh_HANS-CN/LC_MESSAGES/messages.po b/ihatemoney/translations/zh_HANS-CN/LC_MESSAGES/messages.po index 03b9fb20..167a7839 100644 --- 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: 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" "Last-Translator: Muge Niu \n" "Language: zh_HANS_CN\n" @@ -136,7 +136,7 @@ msgstr "" msgid "The email %(email)s is not valid" msgstr "" -msgid "Person" +msgid "Participant" msgstr "" msgid "Bill" @@ -837,3 +837,6 @@ msgstr "" #~ msgid "%(member)s had been added" #~ msgstr "" +#~ msgid "Person" +#~ msgstr "" +