diff --git a/locale/en/LC_MESSAGES/django.mo b/locale/en/LC_MESSAGES/django.mo index 9fd5df8..060b64f 100644 Binary files a/locale/en/LC_MESSAGES/django.mo and b/locale/en/LC_MESSAGES/django.mo differ diff --git a/locale/en/LC_MESSAGES/django.po b/locale/en/LC_MESSAGES/django.po index aa7d329..07c88ba 100644 --- a/locale/en/LC_MESSAGES/django.po +++ b/locale/en/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-11-07 17:05+0200\n" +"POT-Creation-Date: 2021-01-14 22:24+0200\n" "PO-Revision-Date: 2017-11-02 23:09+0200\n" "Last-Translator: \n" "Language-Team: \n" @@ -37,7 +37,7 @@ msgstr "Sössö articles" msgid "Today's lunch" msgstr "" -#: infoscreen/models.py:212 webapp/models.py:68 +#: infoscreen/models.py:212 webapp/models.py:70 msgid "Events" msgstr "Events" @@ -112,9 +112,8 @@ msgstr "Preview" msgid "Delete" msgstr "Delete" -#: infoscreen/templates/tabs/add_remove.html:23 kaehmy/models.py:56 -#: kaehmy/templates/list.html:36 webapp/models.py:138 webapp/models.py:166 -#: webapp/models.py:192 +#: infoscreen/templates/tabs/add_remove.html:23 kaehmy/models.py:62 +#: kaehmy/templates/list.html:36 webapp/models.py:144 webapp/models.py:173 msgid "Name" msgstr "Name" @@ -202,157 +201,157 @@ msgstr "Invalid phone number" msgid "Custom role with the same name already exists." msgstr "Custom role with the same name already exists." -#: kaehmy/models.py:13 +#: kaehmy/models.py:18 msgid "Kaehmy" msgstr "Kaehmy" -#: kaehmy/models.py:19 +#: kaehmy/models.py:25 msgid "Corporate affairs" msgstr "Corporate affairs" -#: kaehmy/models.py:20 webapp/templates/freshmen.html:10 +#: kaehmy/models.py:26 webapp/templates/freshmen.html:10 #: webapp/templates/navigation.html:8 msgid "Freshmen" msgstr "Freshmen" -#: kaehmy/models.py:21 webapp/templates/international.html:10 +#: kaehmy/models.py:27 webapp/templates/international.html:10 #: webapp/templates/navigation.html:14 msgid "International" msgstr "International" -#: kaehmy/models.py:22 +#: kaehmy/models.py:28 msgid "External affairs" msgstr "External affairs" -#: kaehmy/models.py:23 +#: kaehmy/models.py:29 msgid "Media" msgstr "" -#: kaehmy/models.py:24 +#: kaehmy/models.py:30 msgid "Technology" msgstr "" -#: kaehmy/models.py:25 +#: kaehmy/models.py:31 msgid "Wellbeing" msgstr "" -#: kaehmy/models.py:26 +#: kaehmy/models.py:32 msgid "Elepaja" msgstr "" -#: kaehmy/models.py:27 +#: kaehmy/models.py:33 msgid "Ceremonies" msgstr "" -#: kaehmy/models.py:28 +#: kaehmy/models.py:34 msgid "Studies" msgstr "" -#: kaehmy/models.py:29 +#: kaehmy/models.py:35 msgid "Sössö magazine" msgstr "Sössö magazine" -#: kaehmy/models.py:30 +#: kaehmy/models.py:36 msgid "Alumni relations" msgstr "Alumni relations" -#: kaehmy/models.py:31 +#: kaehmy/models.py:37 msgid "Others" msgstr "" -#: kaehmy/models.py:33 +#: kaehmy/models.py:39 msgid "Category" msgstr "" -#: kaehmy/models.py:39 webapp/models.py:176 +#: kaehmy/models.py:45 msgid "Description" msgstr "Description" -#: kaehmy/models.py:42 +#: kaehmy/models.py:48 msgid "Preset kaehmy role" msgstr "Preset kaehmy role" -#: kaehmy/models.py:43 +#: kaehmy/models.py:49 msgid "Preset kaehmy roles" msgstr "Preset kaehmy roles" -#: kaehmy/models.py:50 +#: kaehmy/models.py:56 msgid "Custom kaehmy role" msgstr "Custom kaehmy role" -#: kaehmy/models.py:51 +#: kaehmy/models.py:57 msgid "Custom kaehmy roles" msgstr "Custom kaehmy roles" -#: kaehmy/models.py:57 kaehmy/templates/list.html:40 members/models.py:14 +#: kaehmy/models.py:63 kaehmy/templates/list.html:40 members/models.py:14 msgid "Email" msgstr "Email" -#: kaehmy/models.py:58 +#: kaehmy/models.py:64 msgid "Timestamp" msgstr "" -#: kaehmy/models.py:72 +#: kaehmy/models.py:78 msgid "Kaehmykommentti" msgstr "Kaehmy comment" -#: kaehmy/models.py:73 +#: kaehmy/models.py:79 msgid "Kaehmykommentit" msgstr "Kaehmy comments" -#: kaehmy/models.py:75 ohlhafv/models.py:36 +#: kaehmy/models.py:81 ohlhafv/models.py:36 msgid "Message" msgstr "" -#: kaehmy/models.py:94 kaehmy/templates/kaehmy.html:12 +#: kaehmy/models.py:100 kaehmy/templates/kaehmy.html:12 msgid "Kaehmylomake" msgstr "Kaehmy application" -#: kaehmy/models.py:95 +#: kaehmy/models.py:101 msgid "Kaehmylomakkeet" msgstr "Kaehmy applications" -#: kaehmy/models.py:98 webapp/models.py:252 +#: kaehmy/models.py:104 msgid "Phone number" msgstr "" -#: kaehmy/models.py:99 +#: kaehmy/models.py:105 msgid "Year" msgstr "" -#: kaehmy/models.py:100 +#: kaehmy/models.py:106 msgid "Text" msgstr "" -#: kaehmy/models.py:102 +#: kaehmy/models.py:108 msgid "Custom role name" msgstr "" -#: kaehmy/models.py:104 webapp/models.py:167 +#: kaehmy/models.py:110 webapp/models.py:174 msgid "Board member" msgstr "Board member" -#: kaehmy/models.py:112 +#: kaehmy/models.py:118 msgid "Kaehmy application: {}" msgstr "Kaehmy application: {}" -#: kaehmy/models.py:134 +#: kaehmy/models.py:140 msgid "Board: {}" msgstr "" -#: kaehmy/models.py:140 +#: kaehmy/models.py:146 msgid "Official: {}" msgstr "" -#: kaehmy/models.py:157 +#: kaehmy/models.py:163 msgid "Telegram channel" msgstr "" -#: kaehmy/models.py:158 +#: kaehmy/models.py:164 msgid "Telegram channels" msgstr "" -#: kaehmy/tables.py:13 webapp/models.py:207 +#: kaehmy/tables.py:13 msgid "Roles" msgstr "" @@ -410,7 +409,9 @@ msgstr "" msgid "" "(HUOM! Kaehmytekstin maksimipituus on 300 merkkiä. Tarvittaessa voit " "kirjoittaa lisätietoja kommenteihin.)" -msgstr "(NOTE! The application text is limited to 300 characters. You can use the comment section for additional info.)" +msgstr "" +"(NOTE! The application text is limited to 300 characters. You can use the " +"comment section for additional info.)" #: kaehmy/templates/kaehmy.html:26 msgid "" @@ -528,11 +529,11 @@ msgstr "I'm a member of AYY" msgid "I want to receive a weekly newsletter" msgstr "I want to receive a weekly newsletter" -#: members/models.py:12 webapp/models.py:249 +#: members/models.py:12 msgid "First name" msgstr "First name" -#: members/models.py:13 webapp/models.py:250 +#: members/models.py:13 msgid "Last name" msgstr "Last name" @@ -1135,111 +1136,67 @@ msgstr "" msgid "Feeds" msgstr "" -#: webapp/models.py:60 -msgid "Feed: {}" -msgstr "Feed: {}" +#: webapp/models.py:61 webapp/models.py:80 webapp/models.py:119 +#: webapp/models.py:152 webapp/models.py:198 +#| msgid "Delete" +msgid "Deleted: " +msgstr "Deleted: " -#: webapp/models.py:67 +#: webapp/models.py:62 +#, fuzzy +#| msgid "Feed: {}" +msgid "{}Feed: {}" +msgstr "" + +#: webapp/models.py:69 msgid "Event" msgstr "" -#: webapp/models.py:77 -msgid "Event: {}" +#: webapp/models.py:81 +msgid "{}Event: {}" msgstr "" -#: webapp/models.py:87 +#: webapp/models.py:91 msgid "Template question" msgstr "" -#: webapp/models.py:88 +#: webapp/models.py:92 msgid "Template questions" msgstr "" -#: webapp/models.py:94 +#: webapp/models.py:98 msgid "Template questions: {}" msgstr "" -#: webapp/models.py:101 +#: webapp/models.py:105 msgid "Signup form" msgstr "" -#: webapp/models.py:102 +#: webapp/models.py:106 msgid "Signup forms" msgstr "" -#: webapp/models.py:114 -msgid "#{} {}" +#: webapp/models.py:120 +msgid "#{} {delete_str}{}" msgstr "" -#: webapp/models.py:132 +#: webapp/models.py:138 msgid "Sign-up" msgstr "" -#: webapp/models.py:133 +#: webapp/models.py:139 msgid "Sign-ups" msgstr "" -#: webapp/models.py:171 +#: webapp/models.py:178 msgid "board member" msgstr "board member" -#: webapp/models.py:186 -msgid "Committee" -msgstr "" - -#: webapp/models.py:187 -msgid "Committees" -msgstr "" - -#: webapp/models.py:190 -msgid "Committee: {}" -msgstr "" - -#: webapp/models.py:206 -msgid "Role" -msgstr "" - -#: webapp/models.py:212 -msgid "Yes" -msgstr "" - -#: webapp/models.py:212 -msgid "No" -msgstr "" - -#: webapp/models.py:223 -msgid "Occupation" -msgstr "Occupation" - -#: webapp/models.py:224 -msgid "Occupations" -msgstr "Occupations" - -#: webapp/models.py:226 -msgid "Start date" -msgstr "" - -#: webapp/models.py:227 -msgid "End date" -msgstr "" - -#: webapp/models.py:244 -msgid "Official" -msgstr "" - -#: webapp/models.py:245 -msgid "Officials" -msgstr "" - -#: webapp/models.py:251 -msgid "Email address" -msgstr "" - -#: webapp/models.py:277 +#: webapp/models.py:185 msgid "JobAd" msgstr "" -#: webapp/models.py:278 +#: webapp/models.py:186 msgid "JobAds" msgstr "" diff --git a/locale/fi/LC_MESSAGES/django.mo b/locale/fi/LC_MESSAGES/django.mo index cb5b255..1539e67 100644 Binary files a/locale/fi/LC_MESSAGES/django.mo and b/locale/fi/LC_MESSAGES/django.mo differ diff --git a/locale/fi/LC_MESSAGES/django.po b/locale/fi/LC_MESSAGES/django.po index 9e1468a..91b3f11 100644 --- a/locale/fi/LC_MESSAGES/django.po +++ b/locale/fi/LC_MESSAGES/django.po @@ -7,7 +7,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2020-11-07 17:05+0200\n" +"POT-Creation-Date: 2021-01-14 22:24+0200\n" "PO-Revision-Date: 2017-11-02 23:04+0200\n" "Last-Translator: \n" "Language-Team: \n" @@ -38,7 +38,7 @@ msgstr "Sössön artikkelit" msgid "Today's lunch" msgstr "Päivän lounas" -#: infoscreen/models.py:212 webapp/models.py:68 +#: infoscreen/models.py:212 webapp/models.py:70 msgid "Events" msgstr "Tapahtumat" @@ -113,9 +113,8 @@ msgstr "Esikatsele" msgid "Delete" msgstr "Poista" -#: infoscreen/templates/tabs/add_remove.html:23 kaehmy/models.py:56 -#: kaehmy/templates/list.html:36 webapp/models.py:138 webapp/models.py:166 -#: webapp/models.py:192 +#: infoscreen/templates/tabs/add_remove.html:23 kaehmy/models.py:62 +#: kaehmy/templates/list.html:36 webapp/models.py:144 webapp/models.py:173 msgid "Name" msgstr "Nimi" @@ -203,157 +202,157 @@ msgstr "Virheellinen puhelinnumero" msgid "Custom role with the same name already exists." msgstr "Samanniminen virka on jo olemassa." -#: kaehmy/models.py:13 +#: kaehmy/models.py:18 msgid "Kaehmy" msgstr "Kaehmy" -#: kaehmy/models.py:19 +#: kaehmy/models.py:25 msgid "Corporate affairs" msgstr "Yrityssuhteet" -#: kaehmy/models.py:20 webapp/templates/freshmen.html:10 +#: kaehmy/models.py:26 webapp/templates/freshmen.html:10 #: webapp/templates/navigation.html:8 msgid "Freshmen" msgstr "Fuksit" -#: kaehmy/models.py:21 webapp/templates/international.html:10 +#: kaehmy/models.py:27 webapp/templates/international.html:10 #: webapp/templates/navigation.html:14 msgid "International" msgstr "International" -#: kaehmy/models.py:22 +#: kaehmy/models.py:28 msgid "External affairs" msgstr "Ulkosuhteet" -#: kaehmy/models.py:23 +#: kaehmy/models.py:29 msgid "Media" msgstr "Media" -#: kaehmy/models.py:24 +#: kaehmy/models.py:30 msgid "Technology" msgstr "Teknologia" -#: kaehmy/models.py:25 +#: kaehmy/models.py:31 msgid "Wellbeing" msgstr "Hyvinvointi" -#: kaehmy/models.py:26 +#: kaehmy/models.py:32 msgid "Elepaja" msgstr "Elepaja" -#: kaehmy/models.py:27 +#: kaehmy/models.py:33 msgid "Ceremonies" msgstr "Hupitapahtumat" -#: kaehmy/models.py:28 +#: kaehmy/models.py:34 msgid "Studies" msgstr "Opinnot" -#: kaehmy/models.py:29 +#: kaehmy/models.py:35 msgid "Sössö magazine" msgstr "Kiltalehti Sössö" -#: kaehmy/models.py:30 +#: kaehmy/models.py:36 msgid "Alumni relations" msgstr "Alumnisuhteet" -#: kaehmy/models.py:31 +#: kaehmy/models.py:37 msgid "Others" msgstr "Muut" -#: kaehmy/models.py:33 +#: kaehmy/models.py:39 msgid "Category" msgstr "Kategoria" -#: kaehmy/models.py:39 webapp/models.py:176 +#: kaehmy/models.py:45 msgid "Description" msgstr "Kuvaus" -#: kaehmy/models.py:42 +#: kaehmy/models.py:48 msgid "Preset kaehmy role" msgstr "Kaehmyvirka" -#: kaehmy/models.py:43 +#: kaehmy/models.py:49 msgid "Preset kaehmy roles" msgstr "Kaehmyvirat" -#: kaehmy/models.py:50 +#: kaehmy/models.py:56 msgid "Custom kaehmy role" msgstr "Uusi virka" -#: kaehmy/models.py:51 +#: kaehmy/models.py:57 msgid "Custom kaehmy roles" msgstr "Uudet kaehmyvirat" -#: kaehmy/models.py:57 kaehmy/templates/list.html:40 members/models.py:14 +#: kaehmy/models.py:63 kaehmy/templates/list.html:40 members/models.py:14 msgid "Email" msgstr "Sähköposti" -#: kaehmy/models.py:58 +#: kaehmy/models.py:64 msgid "Timestamp" msgstr "Aikaleima" -#: kaehmy/models.py:72 +#: kaehmy/models.py:78 msgid "Kaehmykommentti" msgstr "Kaehmykommentti" -#: kaehmy/models.py:73 +#: kaehmy/models.py:79 msgid "Kaehmykommentit" msgstr "Kaehmykommentit" -#: kaehmy/models.py:75 ohlhafv/models.py:36 +#: kaehmy/models.py:81 ohlhafv/models.py:36 msgid "Message" msgstr "Viesti" -#: kaehmy/models.py:94 kaehmy/templates/kaehmy.html:12 +#: kaehmy/models.py:100 kaehmy/templates/kaehmy.html:12 msgid "Kaehmylomake" msgstr "Kaehmylomake" -#: kaehmy/models.py:95 +#: kaehmy/models.py:101 msgid "Kaehmylomakkeet" msgstr "Kaehmylomakkeet" -#: kaehmy/models.py:98 webapp/models.py:252 +#: kaehmy/models.py:104 msgid "Phone number" msgstr "Puhelinnumero" -#: kaehmy/models.py:99 +#: kaehmy/models.py:105 msgid "Year" msgstr "Vuosi" -#: kaehmy/models.py:100 +#: kaehmy/models.py:106 msgid "Text" msgstr "Teksti" -#: kaehmy/models.py:102 +#: kaehmy/models.py:108 msgid "Custom role name" msgstr "Uusi virka" -#: kaehmy/models.py:104 webapp/models.py:167 +#: kaehmy/models.py:110 webapp/models.py:174 msgid "Board member" msgstr "Hallituksen jäsen" -#: kaehmy/models.py:112 +#: kaehmy/models.py:118 msgid "Kaehmy application: {}" msgstr "Kaehmy: {}" -#: kaehmy/models.py:134 +#: kaehmy/models.py:140 msgid "Board: {}" msgstr "Hallitus: {}" -#: kaehmy/models.py:140 +#: kaehmy/models.py:146 msgid "Official: {}" msgstr "Toimari: {}" -#: kaehmy/models.py:157 +#: kaehmy/models.py:163 msgid "Telegram channel" msgstr "Telegram-kanava" -#: kaehmy/models.py:158 +#: kaehmy/models.py:164 msgid "Telegram channels" msgstr "Telegram-kanavat" -#: kaehmy/tables.py:13 webapp/models.py:207 +#: kaehmy/tables.py:13 msgid "Roles" msgstr "Roolit" @@ -527,11 +526,11 @@ msgstr "Olen AYY:n jäsen" msgid "I want to receive a weekly newsletter" msgstr "Haluan saada viikottaisen jäsentiedotteen" -#: members/models.py:12 webapp/models.py:249 +#: members/models.py:12 msgid "First name" msgstr "Etunimi" -#: members/models.py:13 webapp/models.py:250 +#: members/models.py:13 msgid "Last name" msgstr "Sukunimi" @@ -1126,111 +1125,67 @@ msgstr "Uutinen" msgid "Feeds" msgstr "Uutiset" -#: webapp/models.py:60 -msgid "Feed: {}" -msgstr "Uutinen: {}" +#: webapp/models.py:61 webapp/models.py:80 webapp/models.py:119 +#: webapp/models.py:152 webapp/models.py:198 +msgid "Deleted: " +msgstr "Poistettu: " -#: webapp/models.py:67 +#, fuzzy +#| msgid "Feed: {}" +msgid "{}Feed: {}" +msgstr "{}Uutinen: {}" + +#: webapp/models.py:69 msgid "Event" msgstr "Tapahtuma" -#: webapp/models.py:77 -msgid "Event: {}" -msgstr "Tapahtuma: {}" +#: webapp/models.py:81 +#, fuzzy +#| msgid "Event: {}" +msgid "{}Event: {}" +msgstr "{}Tapahtuma: {}" -#: webapp/models.py:87 +#: webapp/models.py:91 msgid "Template question" msgstr "Vakiokysymys" -#: webapp/models.py:88 +#: webapp/models.py:92 msgid "Template questions" msgstr "Vakiokysymykset" -#: webapp/models.py:94 +#: webapp/models.py:98 msgid "Template questions: {}" msgstr "Vakiokysymykset: {}" -#: webapp/models.py:101 +#: webapp/models.py:105 msgid "Signup form" msgstr "Ilmoittautumislomake" -#: webapp/models.py:102 +#: webapp/models.py:106 msgid "Signup forms" msgstr "Ilmoittautumislomakkeet" -#: webapp/models.py:114 -msgid "#{} {}" +#: webapp/models.py:120 +msgid "#{} {delete_str}{}" msgstr "" -#: webapp/models.py:132 +#: webapp/models.py:138 msgid "Sign-up" msgstr "Ilmoittautuminen" -#: webapp/models.py:133 +#: webapp/models.py:139 msgid "Sign-ups" msgstr "Ilmoittautumiset" -#: webapp/models.py:171 +#: webapp/models.py:178 msgid "board member" msgstr "hallituksen jäsen" -#: webapp/models.py:186 -msgid "Committee" -msgstr "Toimikunta" - -#: webapp/models.py:187 -msgid "Committees" -msgstr "Toimikunnat" - -#: webapp/models.py:190 -msgid "Committee: {}" -msgstr "Toimikunta: {}" - -#: webapp/models.py:206 -msgid "Role" -msgstr "Rooli" - -#: webapp/models.py:212 -msgid "Yes" -msgstr "Kyllä" - -#: webapp/models.py:212 -msgid "No" -msgstr "Ei" - -#: webapp/models.py:223 -msgid "Occupation" -msgstr "Virka" - -#: webapp/models.py:224 -msgid "Occupations" -msgstr "Virat" - -#: webapp/models.py:226 -msgid "Start date" -msgstr "Alkupäivämäärä" - -#: webapp/models.py:227 -msgid "End date" -msgstr "Loppupäivämäärä" - -#: webapp/models.py:244 -msgid "Official" -msgstr "Toimihenkilö" - -#: webapp/models.py:245 -msgid "Officials" -msgstr "Toimihenkilöt" - -#: webapp/models.py:251 -msgid "Email address" -msgstr "Sähköposti" - -#: webapp/models.py:277 +#: webapp/models.py:185 msgid "JobAd" msgstr "Työpaikkailmoitus" -#: webapp/models.py:278 +#: webapp/models.py:186 msgid "JobAds" msgstr "Työpaikkailmoitukset" diff --git a/webapp/models.py b/webapp/models.py index f7db2a4..7e67c17 100644 --- a/webapp/models.py +++ b/webapp/models.py @@ -58,7 +58,8 @@ class Feed(BaseFeed): deleted = models.BooleanField(default=False) def __str__(self): - return _('Feed: {}').format(self.title) + delete_str = _("Deleted: ") if self.deleted else "" + return _('{}Feed: {}').format(delete_str, self.title) class Event(BaseFeed): @@ -76,7 +77,8 @@ class Event(BaseFeed): deleted = models.BooleanField(default=False) def __str__(self): - return _('Event: {}').format(self.title) + delete_str = _("Deleted: ") if self.deleted else "" + return _('{}Event: {}').format(delete_str, self.title) class TemplateQuestion(models.Model): @@ -114,7 +116,8 @@ class SignupForm(models.Model): deleted = models.BooleanField(default=False) def __str__(self): - return _('#{} {}').format(self.id, self.title) + delete_str = _("Deleted: ") if self.deleted else "" + return _('#{} {delete_str}{}').format(self.id, delete_str, self.title) @property def signups(self): @@ -146,7 +149,8 @@ class Signup(models.Model): deleted = models.BooleanField(default=False) def __str__(self): - return f"{self.signupForm}: {self.list_name} ({self.pk})" + delete_str = _("Deleted: ") if self.deleted else "" + return f"{self.signupForm}: {delete_str}{self.list_name} ({self.pk})" @receiver(post_save, sender=Signup) @@ -190,6 +194,10 @@ class JobAd(models.Model): autohide_enabled = models.BooleanField(default=False) deleted = models.BooleanField(default=False) + def __str__(self): + delete_str = _("Deleted: ") if self.deleted else "" + return f'{delete_str}{self.title}' + auditlog.register(Tag) auditlog.register(Feed)