diff --git a/module/Application/language/en.po b/module/Application/language/en.po index 9a8d4699c4..366480980e 100644 --- a/module/Application/language/en.po +++ b/module/Application/language/en.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: GEWISweb 0.1.0-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-01-09 17:03+0100\n" -"PO-Revision-Date: 2024-01-09 17:04+0100\n" +"POT-Creation-Date: 2024-03-14 21:49+0100\n" +"PO-Revision-Date: 2024-03-14 21:55+0100\n" "Last-Translator: Tom Udding \n" "Language-Team: English \n" "Language: en\n" @@ -17,7 +17,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 3.4.1\n" +"X-Generator: Poedit 3.4.2\n" msgid " has a limited capacity and " msgstr " has a limited capacity and " @@ -237,6 +237,9 @@ msgstr "" "can have optional fields to collect specific information from the " "participants." +msgid "Add sub-album" +msgstr "Add sub-album" + msgid "Additional actions" msgstr "Additional actions" @@ -276,6 +279,13 @@ msgstr "Age" msgid "Agenda" msgstr "Agenda" +msgid "" +"Album name can only contain letters, numbers, -, ., :, @, ^, &, *, ?, !, " +"(, ), ', \", and spaces" +msgstr "" +"Album name can only contain letters, numbers, -, ., :, @, ^, &, *, ?, !, " +"(, ), ', \", and spaces" + msgid "Album title" msgstr "Album title" @@ -285,6 +295,9 @@ msgstr "Alcohol Policy" msgid "All Activities" msgstr "All Activities" +msgid "All Meetings" +msgstr "All Meetings" + msgid "All rights reserved." msgstr "All rights reserved." @@ -443,13 +456,6 @@ msgstr "Are you sure you want to delete this option?" msgid "Are you sure you want to delete this package?" msgstr "Are you sure you want to delete this package?" -msgid "" -"Are you sure you want to delete this photo? This action can not be " -"reverted." -msgstr "" -"Are you sure you want to delete this photo? This action can not be " -"reverted." - msgid "Are you sure you want to delete this poll?" msgstr "Are you sure you want to delete this poll?" @@ -580,6 +586,9 @@ msgstr "Camera" msgid "Cancel" msgstr "Cancel" +msgid "Cancel selection" +msgstr "Cancel selection" + msgid "Cannot load metadata" msgstr "Cannot load metadata" @@ -797,9 +806,6 @@ msgstr "Courses" msgid "Cover photo to upload" msgstr "Cover photo to upload" -msgid "Create" -msgstr "Create" - msgid "Create API token" msgstr "Create API token" @@ -830,15 +836,9 @@ msgstr "Create a new page" msgid "Create activity proposal" msgstr "Create activity proposal" -msgid "Create album" -msgstr "Create album" - msgid "Create an activity" msgstr "Create an activity" -msgid "Create new album" -msgstr "Create new album" - msgid "Create news item" msgstr "Create news item" @@ -911,9 +911,6 @@ msgstr "Delete package" msgid "Delete period" msgstr "Delete period" -msgid "Delete photo" -msgstr "Delete photo" - msgid "Delete photos" msgstr "Delete photos" @@ -1305,6 +1302,13 @@ msgstr "Full name" msgid "GEWIKI" msgstr "GEWIKI" +msgid "" +"GEWIS has had many different committees over the years, learn more about " +"this rich history below!" +msgstr "" +"GEWIS has had many different committees over the years, learn more about " +"this rich history below!" + msgid "GEWIS has many different committees, learn more about them below!" msgstr "GEWIS has many different committees, learn more about them below!" @@ -1853,15 +1857,9 @@ msgstr "Move album" msgid "Move down" msgstr "Move down" -msgid "Move photo" -msgstr "Move photo" - msgid "Move the album" msgstr "Move the album" -msgid "Move the photo to another album" -msgstr "Move the photo to another album" - msgid "Move the photos to another album" msgstr "Move the photos to another album" @@ -1966,9 +1964,6 @@ msgstr "Not allowed to add tags." msgid "Not allowed to create albums" msgstr "Not allowed to create albums" -msgid "Not allowed to create albums." -msgstr "Not allowed to create albums." - msgid "Not allowed to delete albums." msgstr "Not allowed to delete albums." @@ -2038,6 +2033,9 @@ msgstr "Number" msgid "Old activities" msgstr "Old activities" +msgid "Old committees" +msgstr "Old committees" + msgid "Old members" msgstr "Old members" @@ -2151,9 +2149,6 @@ msgstr "" msgid "Other" msgstr "Other" -msgid "Other albums" -msgstr "Other albums" - #, php-format msgid "Other exam material from %s (%s)" msgstr "Other exam material from %s (%s)" @@ -2203,13 +2198,6 @@ msgstr "Phone Number" msgid "Phone number" msgstr "Phone number" -#, php-format -msgid "Photo #%d" -msgstr "Photo #%d" - -msgid "Photo admin" -msgstr "Photo admin" - msgid "Photo of the Week:
Week" msgstr "Photo of the Week:
Week" @@ -2274,9 +2262,6 @@ msgstr "Please wait while the album is being deleted." msgid "Please wait while the photos are being deleted." msgstr "Please wait while the photos are being deleted." -msgid "Please wait while your photo is being deleted." -msgstr "Please wait while your photo is being deleted." - msgid "Poll" msgstr "Poll" @@ -2493,6 +2478,9 @@ msgstr "Select a target job package" msgid "Select a type" msgstr "Select a type" +msgid "Select an association year to continue." +msgstr "Select an association year to continue." + msgid "Select an option" msgstr "Select an option" @@ -2503,6 +2491,9 @@ msgstr "" "Select an organ to edit its information. Changes will not be displayed until " "they have been approved." +msgid "Select photos" +msgstr "Select photos" + msgid "Select the jobs that you want to transfer to another job package." msgstr "Select the jobs that you want to transfer to another job package." @@ -2846,12 +2837,6 @@ msgstr "The option period must end after it starts." msgid "The option period must start after the planning period ends." msgstr "The option period must start after the planning period ends." -msgid "The photo has been deleted" -msgstr "The photo has been deleted" - -msgid "The photo has been moved" -msgstr "The photo has been moved" - msgid "The photos have been been deleted" msgstr "The photos have been been deleted" @@ -2942,6 +2927,12 @@ msgstr "There are no activities in the archive." msgid "There are no activities." msgstr "There are no activities." +msgid "There are no albums in this year." +msgstr "There are no albums in this year." + +msgid "There are no albums, create one to continue." +msgstr "There are no albums, create one to continue." + msgid "There are no exams to be edited. Upload exams to edit them." msgstr "There are no exams to be edited. Upload exams to edit them." @@ -2966,6 +2957,9 @@ msgstr "There are no revoked authorizations for this GMM." msgid "There are no summaries to be edited. Upload exams to edit them." msgstr "There are no summaries to be edited. Upload exams to edit them." +msgid "There are no undated albums." +msgstr "There are no undated albums." + msgid "" "There are no upcoming meetings for which you can authorize someone.\n" "You may still be able to authorize someone or revoke an authorization by " @@ -3204,6 +3198,9 @@ msgstr "Unapproved Companies" msgid "Unapproved Jobs" msgstr "Unapproved Jobs" +msgid "Undated" +msgstr "Undated" + msgid "Unfortunately there currently is no poll :(" msgstr "Unfortunately there currently is no poll :(" @@ -3605,6 +3602,9 @@ msgstr "You are not allowed to add courses" msgid "You are not allowed to administer activities" msgstr "You are not allowed to administer activities" +msgid "You are not allowed to administer albums" +msgstr "You are not allowed to administer albums" + msgid "You are not allowed to administer career settings" msgstr "You are not allowed to administer career settings" @@ -3659,6 +3659,9 @@ msgstr "You are not allowed to create activity option proposals" msgid "You are not allowed to create activity proposals" msgstr "You are not allowed to create activity proposals" +msgid "You are not allowed to create albums" +msgstr "You are not allowed to create albums" + msgid "You are not allowed to create an activity" msgstr "You are not allowed to create an activity" @@ -3695,6 +3698,9 @@ msgstr "You are not allowed to create option calendar periods" msgid "You are not allowed to create packages" msgstr "You are not allowed to create packages" +msgid "You are not allowed to delete albums" +msgstr "You are not allowed to delete albums" + msgid "You are not allowed to delete an activity category" msgstr "You are not allowed to delete an activity category" @@ -3737,6 +3743,9 @@ msgstr "You are not allowed to delete this option" msgid "You are not allowed to download course documents" msgstr "You are not allowed to download course documents" +msgid "You are not allowed to edit albums" +msgstr "You are not allowed to edit albums" + msgid "You are not allowed to edit an activity category" msgstr "You are not allowed to edit an activity category" @@ -3872,6 +3881,12 @@ msgstr "You are not allowed to view activities" msgid "You are not allowed to view activity categories" msgstr "You are not allowed to view activity categories" +msgid "You are not allowed to view albums" +msgstr "You are not allowed to view albums" + +msgid "You are not allowed to view albums without dates" +msgstr "You are not allowed to view albums without dates" + msgid "You are not allowed to view all authorizations." msgstr "You are not allowed to view all authorizations." @@ -3947,6 +3962,9 @@ msgstr "You are not allowed to view unapproved activities" msgid "You are not allowed to view unapproved polls" msgstr "You are not allowed to view unapproved polls" +msgid "You are not allowed to view unpublished albums" +msgstr "You are not allowed to view unpublished albums" + msgid "" "You are not allowed to view upcoming activities coupled to a member account" msgstr "" diff --git a/module/Application/language/gewisweb.pot b/module/Application/language/gewisweb.pot index 203545f14c..f2c34bd763 100644 --- a/module/Application/language/gewisweb.pot +++ b/module/Application/language/gewisweb.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: GEWISweb v2.8.6-587-g838eb6f2e-dirty\n" +"Project-Id-Version: GEWISweb v2.8.6-623-g6c81b4349-dirty\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-01-09 17:03+0100\n" +"POT-Creation-Date: 2024-03-14 21:49+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -228,6 +228,9 @@ msgid "" "participants." msgstr "" +msgid "Add sub-album" +msgstr "" + msgid "Additional actions" msgstr "" @@ -267,6 +270,11 @@ msgstr "" msgid "Agenda" msgstr "" +msgid "" +"Album name can only contain letters, numbers, -, ., :, @, ^, &, *, ?, !, " +"(, ), ', \", and spaces" +msgstr "" + msgid "Album title" msgstr "" @@ -276,6 +284,9 @@ msgstr "" msgid "All Activities" msgstr "" +msgid "All Meetings" +msgstr "" + msgid "All rights reserved." msgstr "" @@ -418,11 +429,6 @@ msgstr "" msgid "Are you sure you want to delete this package?" msgstr "" -msgid "" -"Are you sure you want to delete this photo? This action can not be " -"reverted." -msgstr "" - msgid "Are you sure you want to delete this poll?" msgstr "" @@ -545,6 +551,9 @@ msgstr "" msgid "Cancel" msgstr "" +msgid "Cancel selection" +msgstr "" + msgid "Cannot load metadata" msgstr "" @@ -753,9 +762,6 @@ msgstr "" msgid "Cover photo to upload" msgstr "" -msgid "Create" -msgstr "" - msgid "Create API token" msgstr "" @@ -786,15 +792,9 @@ msgstr "" msgid "Create activity proposal" msgstr "" -msgid "Create album" -msgstr "" - msgid "Create an activity" msgstr "" -msgid "Create new album" -msgstr "" - msgid "Create news item" msgstr "" @@ -867,9 +867,6 @@ msgstr "" msgid "Delete period" msgstr "" -msgid "Delete photo" -msgstr "" - msgid "Delete photos" msgstr "" @@ -1249,6 +1246,11 @@ msgstr "" msgid "GEWIKI" msgstr "" +msgid "" +"GEWIS has had many different committees over the years, learn more about " +"this rich history below!" +msgstr "" + msgid "GEWIS has many different committees, learn more about them below!" msgstr "" @@ -1752,15 +1754,9 @@ msgstr "" msgid "Move down" msgstr "" -msgid "Move photo" -msgstr "" - msgid "Move the album" msgstr "" -msgid "Move the photo to another album" -msgstr "" - msgid "Move the photos to another album" msgstr "" @@ -1864,9 +1860,6 @@ msgstr "" msgid "Not allowed to create albums" msgstr "" -msgid "Not allowed to create albums." -msgstr "" - msgid "Not allowed to delete albums." msgstr "" @@ -1936,6 +1929,9 @@ msgstr "" msgid "Old activities" msgstr "" +msgid "Old committees" +msgstr "" + msgid "Old members" msgstr "" @@ -2044,9 +2040,6 @@ msgstr "" msgid "Other" msgstr "" -msgid "Other albums" -msgstr "" - #, php-format msgid "Other exam material from %s (%s)" msgstr "" @@ -2096,13 +2089,6 @@ msgstr "" msgid "Phone number" msgstr "" -#, php-format -msgid "Photo #%d" -msgstr "" - -msgid "Photo admin" -msgstr "" - msgid "Photo of the Week:
Week" msgstr "" @@ -2162,9 +2148,6 @@ msgstr "" msgid "Please wait while the photos are being deleted." msgstr "" -msgid "Please wait while your photo is being deleted." -msgstr "" - msgid "Poll" msgstr "" @@ -2371,6 +2354,9 @@ msgstr "" msgid "Select a type" msgstr "" +msgid "Select an association year to continue." +msgstr "" + msgid "Select an option" msgstr "" @@ -2379,6 +2365,9 @@ msgid "" "they have been approved." msgstr "" +msgid "Select photos" +msgstr "" + msgid "Select the jobs that you want to transfer to another job package." msgstr "" @@ -2689,12 +2678,6 @@ msgstr "" msgid "The option period must start after the planning period ends." msgstr "" -msgid "The photo has been deleted" -msgstr "" - -msgid "The photo has been moved" -msgstr "" - msgid "The photos have been been deleted" msgstr "" @@ -2775,6 +2758,12 @@ msgstr "" msgid "There are no activities." msgstr "" +msgid "There are no albums in this year." +msgstr "" + +msgid "There are no albums, create one to continue." +msgstr "" + msgid "There are no exams to be edited. Upload exams to edit them." msgstr "" @@ -2799,6 +2788,9 @@ msgstr "" msgid "There are no summaries to be edited. Upload exams to edit them." msgstr "" +msgid "There are no undated albums." +msgstr "" + msgid "" "There are no upcoming meetings for which you can authorize someone.\n" "You may still be able to authorize someone or revoke an authorization by " @@ -3009,6 +3001,9 @@ msgstr "" msgid "Unapproved Jobs" msgstr "" +msgid "Undated" +msgstr "" + msgid "Unfortunately there currently is no poll :(" msgstr "" @@ -3376,6 +3371,9 @@ msgstr "" msgid "You are not allowed to administer activities" msgstr "" +msgid "You are not allowed to administer albums" +msgstr "" + msgid "You are not allowed to administer career settings" msgstr "" @@ -3430,6 +3428,9 @@ msgstr "" msgid "You are not allowed to create activity proposals" msgstr "" +msgid "You are not allowed to create albums" +msgstr "" + msgid "You are not allowed to create an activity" msgstr "" @@ -3466,6 +3467,9 @@ msgstr "" msgid "You are not allowed to create packages" msgstr "" +msgid "You are not allowed to delete albums" +msgstr "" + msgid "You are not allowed to delete an activity category" msgstr "" @@ -3508,6 +3512,9 @@ msgstr "" msgid "You are not allowed to download course documents" msgstr "" +msgid "You are not allowed to edit albums" +msgstr "" + msgid "You are not allowed to edit an activity category" msgstr "" @@ -3640,6 +3647,12 @@ msgstr "" msgid "You are not allowed to view activity categories" msgstr "" +msgid "You are not allowed to view albums" +msgstr "" + +msgid "You are not allowed to view albums without dates" +msgstr "" + msgid "You are not allowed to view all authorizations." msgstr "" @@ -3715,6 +3728,9 @@ msgstr "" msgid "You are not allowed to view unapproved polls" msgstr "" +msgid "You are not allowed to view unpublished albums" +msgstr "" + msgid "" "You are not allowed to view upcoming activities coupled to a member account" msgstr "" diff --git a/module/Application/language/nl.po b/module/Application/language/nl.po index e211bb3d3b..71ad6be9ee 100644 --- a/module/Application/language/nl.po +++ b/module/Application/language/nl.po @@ -8,8 +8,8 @@ msgid "" msgstr "" "Project-Id-Version: GEWISweb 0.1.0-dev\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-01-09 17:03+0100\n" -"PO-Revision-Date: 2024-01-09 17:04+0100\n" +"POT-Creation-Date: 2024-03-14 21:49+0100\n" +"PO-Revision-Date: 2024-03-14 21:53+0100\n" "Last-Translator: Tom Udding \n" "Language-Team: English \n" "Language: nl\n" @@ -17,7 +17,7 @@ msgstr "" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" "Plural-Forms: nplurals=2; plural=(n != 1);\n" -"X-Generator: Poedit 3.4.1\n" +"X-Generator: Poedit 3.4.2\n" msgid " has a limited capacity and " msgstr " heeft een beperkte capaciteit en " @@ -238,6 +238,9 @@ msgstr "" "activiteit in te schrijven. Elke lijst kan optionele velden hebben om " "specifieke informatie van de deelnemers te verzamelen." +msgid "Add sub-album" +msgstr "Subalbum toevoegen" + msgid "Additional actions" msgstr "Aanvullende acties" @@ -277,6 +280,13 @@ msgstr "Leeftijd" msgid "Agenda" msgstr "Agenda" +msgid "" +"Album name can only contain letters, numbers, -, ., :, @, ^, &, *, ?, !, " +"(, ), ', \", and spaces" +msgstr "" +"Albumnaam kan alleen letters, nummers, -, ., :, @, ^, &, *, ?, !, (, ), ', " +"\" en spaties bevatten" + msgid "Album title" msgstr "Album titel" @@ -286,6 +296,9 @@ msgstr "Alcoholreglement" msgid "All Activities" msgstr "Alle Activiteiten" +msgid "All Meetings" +msgstr "Alle vergaderingen" + msgid "All rights reserved." msgstr "Alle rechten voorbehouden." @@ -444,13 +457,6 @@ msgstr "Weet je zeker dat je deze optie wil verwijderen?" msgid "Are you sure you want to delete this package?" msgstr "Weet je zeker dat je dit pakket wilt verwijderen?" -msgid "" -"Are you sure you want to delete this photo? This action can not be " -"reverted." -msgstr "" -"Weet je zeker dat je deze foto wilt verwijderen? Deze actie kan niet " -"ongedaan gemaakt worden." - msgid "Are you sure you want to delete this poll?" msgstr "Weet je zeker dat je deze poll wilt verwijderen?" @@ -582,6 +588,9 @@ msgstr "Camera" msgid "Cancel" msgstr "Annuleer" +msgid "Cancel selection" +msgstr "Selectie annuleren" + msgid "Cannot load metadata" msgstr "Kan metadata niet laden" @@ -802,9 +811,6 @@ msgstr "Vakken" msgid "Cover photo to upload" msgstr "Coverfoto om te uploaden" -msgid "Create" -msgstr "Maak" - msgid "Create API token" msgstr "Maak een API token" @@ -835,15 +841,9 @@ msgstr "Maak een nieuwe pagina" msgid "Create activity proposal" msgstr "Creëer activiteitenvoorstel" -msgid "Create album" -msgstr "Nieuw album" - msgid "Create an activity" msgstr "Maak een activiteit" -msgid "Create new album" -msgstr "Maak nieuw album" - msgid "Create news item" msgstr "Maak een nieuw nieuwsitem" @@ -916,9 +916,6 @@ msgstr "Verwijder pakket" msgid "Delete period" msgstr "Verwijder periode" -msgid "Delete photo" -msgstr "Verwijder foto" - msgid "Delete photos" msgstr "Verwijder foto's" @@ -1316,6 +1313,13 @@ msgstr "Volledige naam" msgid "GEWIKI" msgstr "GEWIKI" +msgid "" +"GEWIS has had many different committees over the years, learn more about " +"this rich history below!" +msgstr "" +"GEWIS heeft door de jaren heen veel verschillende commissies gehad. Lees " +"hieronder meer over deze rijke geschiedenis." + msgid "GEWIS has many different committees, learn more about them below!" msgstr "" "GEWIS heeft veel verschillende commissies, zie hieronder voor meer " @@ -1877,15 +1881,9 @@ msgstr "Verplaats album" msgid "Move down" msgstr "Verplaats omlaag" -msgid "Move photo" -msgstr "Verplaats foto" - msgid "Move the album" msgstr "Verplaats het album" -msgid "Move the photo to another album" -msgstr "Verplaats de foto naar een ander album" - msgid "Move the photos to another album" msgstr "Verplaats de foto's naar een ander album" @@ -1989,9 +1987,6 @@ msgstr "Het is niet toegestaan om tags toe te voegen." msgid "Not allowed to create albums" msgstr "Het is niet toegestaan om albums te maken" -msgid "Not allowed to create albums." -msgstr "Het is niet toegestaan om albums te maken." - msgid "Not allowed to delete albums." msgstr "Het is niet toegestaan om albums te verwijderen." @@ -2061,6 +2056,9 @@ msgstr "Getal" msgid "Old activities" msgstr "Oude activiteiten" +msgid "Old committees" +msgstr "Oude commissies" + msgid "Old members" msgstr "Oud leden" @@ -2174,9 +2172,6 @@ msgstr "" msgid "Other" msgstr "Anders" -msgid "Other albums" -msgstr "Andere albums" - #, php-format msgid "Other exam material from %s (%s)" msgstr "Ander tentamenmateriaal van %s (%s)" @@ -2226,13 +2221,6 @@ msgstr "Telefoonnummer" msgid "Phone number" msgstr "Telefoonnummer" -#, php-format -msgid "Photo #%d" -msgstr "Foto #%d" - -msgid "Photo admin" -msgstr "Foto admin" - msgid "Photo of the Week:
Week" msgstr "Foto van de week
Week" @@ -2297,9 +2285,6 @@ msgstr "Wacht terwijl dit album verwijderd wordt." msgid "Please wait while the photos are being deleted." msgstr "Wacht a.u.b. terwijl de foto's verwijderd worden." -msgid "Please wait while your photo is being deleted." -msgstr "Wacht terwijl de foto verwijderd wordt." - msgid "Poll" msgstr "Poll" @@ -2517,6 +2502,9 @@ msgstr "Selecteer een vacaturepakket als bestemming" msgid "Select a type" msgstr "Selecteer een type" +msgid "Select an association year to continue." +msgstr "Selecteer een verenigingsjaar om verder te gaan." + msgid "Select an option" msgstr "Selecteer een optie" @@ -2527,6 +2515,9 @@ msgstr "" "Selecteer een orgaan om de informatie te wijzigen. Wijzigingen worden niet " "getoond totdat deze goedgekeurd zijn." +msgid "Select photos" +msgstr "Foto's selecteren" + msgid "Select the jobs that you want to transfer to another job package." msgstr "" "Selecteer de vacatures die je wilt verplaatsen naar een ander vacaturepakket." @@ -2872,12 +2863,6 @@ msgstr "De optieperiode moet eindigen nadat deze begonnen is." msgid "The option period must start after the planning period ends." msgstr "De optieperiode moet ingaan na afloop van de planningsperiode." -msgid "The photo has been deleted" -msgstr "De foto is verwijderd" - -msgid "The photo has been moved" -msgstr "De foto is verplaatst" - msgid "The photos have been been deleted" msgstr "De foto's zijn verwijderd" @@ -2969,6 +2954,12 @@ msgstr "Er zijn geen activiteiten in het archief." msgid "There are no activities." msgstr "Er zijn geen activiteiten." +msgid "There are no albums in this year." +msgstr "Er zijn geen albums in dit jaar." + +msgid "There are no albums, create one to continue." +msgstr "Er zijn geen albums, maak er een aan om verder te gaan." + msgid "There are no exams to be edited. Upload exams to edit them." msgstr "" "Er zijn geen tentamens om te wijzigen. Upload nieuwe tentamens om deze " @@ -2998,6 +2989,9 @@ msgstr "" "Er zijn geen samenvattingen om te wijzigen. Upload nieuwe samenvattingen om " "deze correct in de Website te zetten." +msgid "There are no undated albums." +msgstr "Er zijn geen ongedateerde albums." + msgid "" "There are no upcoming meetings for which you can authorize someone.\n" "You may still be able to authorize someone or revoke an authorization by " @@ -3243,6 +3237,9 @@ msgstr "Niet goedgekeurde bedrijven" msgid "Unapproved Jobs" msgstr "Niet goedgekeurde vacatures" +msgid "Undated" +msgstr "Ongedateerd" + msgid "Unfortunately there currently is no poll :(" msgstr "Helaas is er op het moment geen poll :(" @@ -3646,6 +3643,9 @@ msgstr "Je hebt niet de rechten om vakken toe te voegen" msgid "You are not allowed to administer activities" msgstr "Je hebt niet de rechten om activiteiten te beheren" +msgid "You are not allowed to administer albums" +msgstr "Je hebt niet de rechten om albums te beheren" + msgid "You are not allowed to administer career settings" msgstr "Je hebt niet de rechten om carrière-instellingen te beheren" @@ -3706,6 +3706,9 @@ msgstr "Je hebt niet de rechten om opties voor activiteiten te maken" msgid "You are not allowed to create activity proposals" msgstr "Je hebt niet de rechten om opties voor activiteiten te maken" +msgid "You are not allowed to create albums" +msgstr "Je hebt niet de rechten om albums te maken" + msgid "You are not allowed to create an activity" msgstr "Je hebt niet de rechten om een activiteit te maken" @@ -3742,6 +3745,9 @@ msgstr "Je hebt niet de rechten om optieperiodes toe te voegen" msgid "You are not allowed to create packages" msgstr "Je hebt niet de rechten om pakketten toe te voegen" +msgid "You are not allowed to delete albums" +msgstr "Je hebt niet de rechten om albums te verwijderen" + msgid "You are not allowed to delete an activity category" msgstr "Je hebt niet de rechten om een activiteitencategorie te verwijderen" @@ -3784,6 +3790,9 @@ msgstr "Je hebt niet de rechten om deze optie te verwijderen" msgid "You are not allowed to download course documents" msgstr "Je hebt niet de rechten om documenten van vakken te downloaden" +msgid "You are not allowed to edit albums" +msgstr "Je hebt niet de rechten om albums te wijzigen" + msgid "You are not allowed to edit an activity category" msgstr "Je hebt niet de rechten om een activiteitencategorie bij te werken" @@ -3924,6 +3933,12 @@ msgstr "Je hebt niet de rechten om de activiteiten in te zien" msgid "You are not allowed to view activity categories" msgstr "Je hebt niet de rechten om activiteitencategorieën te bekijken" +msgid "You are not allowed to view albums" +msgstr "Je hebt niet de rechten om albums te bekijken" + +msgid "You are not allowed to view albums without dates" +msgstr "Je hebt niet de rechten om ongedateerde albums te bekijken" + msgid "You are not allowed to view all authorizations." msgstr "Je hebt niet de rechten om alle machtigingen te bekijken." @@ -4003,6 +4018,9 @@ msgstr "Je hebt niet de rechten om niet goedgekeurde activiteiten in te zien" msgid "You are not allowed to view unapproved polls" msgstr "Je hebt niet de rechten om niet-goedgekeurde polls te bekijken" +msgid "You are not allowed to view unpublished albums" +msgstr "Je hebt niet de rechten om ongepubliceerde albums bekijken" + msgid "" "You are not allowed to view upcoming activities coupled to a member account" msgstr "" diff --git a/module/Decision/config/module.config.php b/module/Decision/config/module.config.php index 330e4d589e..0ad5802ac3 100644 --- a/module/Decision/config/module.config.php +++ b/module/Decision/config/module.config.php @@ -249,10 +249,10 @@ ], 'priority' => 100, ], - 'organ' => [ + 'organs' => [ 'type' => Literal::class, 'options' => [ - 'route' => '/organ', + 'route' => '/organs', 'defaults' => [ 'controller' => OrganController::class, 'action' => 'index', @@ -260,15 +260,24 @@ ], 'may_terminate' => true, 'child_routes' => [ - 'show' => [ + 'history' => [ + 'type' => Literal::class, + 'options' => [ + 'route' => '/history', + 'defaults' => [ + 'action' => 'history', + ], + ], + ], + 'view' => [ 'type' => Segment::class, 'options' => [ - 'route' => '/show/:organ', + 'route' => '/view/:organ', 'constraints' => [ 'organ' => '[0-9]+', ], 'defaults' => [ - 'action' => 'show', + 'action' => 'view', ], ], ], @@ -400,6 +409,9 @@ 'template_path_stack' => [ 'decision' => __DIR__ . '/../view/', ], + 'template_map' => [ + 'decision/organ/history' => __DIR__ . '/../view/decision/organ/index.phtml', + ], ], 'doctrine' => [ 'driver' => [ diff --git a/module/Decision/src/Controller/OrganController.php b/module/Decision/src/Controller/OrganController.php index 367190f8f6..356fcb6e6f 100644 --- a/module/Decision/src/Controller/OrganController.php +++ b/module/Decision/src/Controller/OrganController.php @@ -23,15 +23,26 @@ public function indexAction(): ViewModel { return new ViewModel( [ + 'historical' => false, 'organs' => $this->organService->getOrgans(), ], ); } + public function historyAction(): ViewModel + { + return new ViewModel( + [ + 'historical' => true, + 'organs' => $this->organService->getOrgans(true), + ], + ); + } + /** * Show an organ. */ - public function showAction(): ViewModel + public function viewAction(): ViewModel { $organId = (int) $this->params()->fromRoute('organ'); $organ = $this->organService->getOrgan($organId); diff --git a/module/Decision/src/Mapper/Organ.php b/module/Decision/src/Mapper/Organ.php index 944d08ac2e..5d4b6b9be7 100644 --- a/module/Decision/src/Mapper/Organ.php +++ b/module/Decision/src/Mapper/Organ.php @@ -58,7 +58,8 @@ public function findActiveById(int $id): ?OrganModel public function findAbrogated(?OrganTypes $type = null): array { $qb = $this->getRepository()->createQueryBuilder('o'); - $qb->where('o.abrogationDate IS NOT NULL'); + $qb->where('o.abrogationDate IS NOT NULL') + ->orderBy('o.abrogationDate', 'DESC'); if (null !== $type) { $qb->andWhere('o.type = :type') diff --git a/module/Decision/src/Model/Organ.php b/module/Decision/src/Model/Organ.php index 0df8c01868..6fc053cba0 100644 --- a/module/Decision/src/Model/Organ.php +++ b/module/Decision/src/Model/Organ.php @@ -314,7 +314,16 @@ public function getOrderedSubdecisions(): array { $array = $this->subdecisions->toArray(); usort($array, static function ($dA, $dB) { - return $dA->getDecision()->getMeeting()->getDate() > $dB->getDecision()->getMeeting()->getDate() ? -1 : 1; + // Compare the meeting dates first (note that we compare B against A). + $dateComparison = $dB->getDecision()->getMeeting()->getDate() + <=> $dA->getDecision()->getMeeting()->getDate(); + + if (0 === $dateComparison) { + // If the meeting dates are equal, compare the subdecision numbers (note that we compare B against A). + return $dB->getNumber() <=> $dA->getNumber(); + } + + return $dateComparison; }); return $array; diff --git a/module/Decision/src/Service/Organ.php b/module/Decision/src/Service/Organ.php index 7aff10a038..18b4c998ad 100644 --- a/module/Decision/src/Service/Organ.php +++ b/module/Decision/src/Service/Organ.php @@ -70,13 +70,17 @@ public function __construct( * * @return OrganModel[] */ - public function getOrgans(): array + public function getOrgans(bool $abrogated = false): array { if (!$this->aclService->isAllowed('list', 'organ')) { throw new NotAllowedException($this->translator->translate('Not allowed to view the list of organs')); } - return $this->organMapper->findActive(); + if (!$abrogated) { + return $this->organMapper->findActive(); + } + + return $this->organMapper->findAbrogated(); } /** diff --git a/module/Decision/view/decision/member/index.phtml b/module/Decision/view/decision/member/index.phtml index 949735bb3f..ac02dc9348 100644 --- a/module/Decision/view/decision/member/index.phtml +++ b/module/Decision/view/decision/member/index.phtml @@ -68,7 +68,7 @@ $this->headTitle($this->translate('Members'));

translate('Association') ?>

- +
translate('Organs') ?>
 diff --git a/module/Decision/view/decision/organ/index.phtml b/module/Decision/view/decision/organ/index.phtml index 67551fff09..692e06a4cd 100644 --- a/module/Decision/view/decision/organ/index.phtml +++ b/module/Decision/view/decision/organ/index.phtml @@ -8,6 +8,7 @@ use Laminas\View\Renderer\PhpRenderer; /** * @var PhpRenderer|HelperTrait $this + * @var bool $historical * @var OrganModel[] $organs */ @@ -22,11 +23,14 @@ $this->headTitle($this->translate('Organ list')); translate('Abbreviation') ?> translate('Name') ?> translate('Type') ?> + + translate('Abrogation Date') ?> + - url('organ/show', ['organ' => $organ->getId()]) ?> + url('organs/view', ['organ' => $organ->getId()]) ?> @@ -43,6 +47,11 @@ $this->headTitle($this->translate('Organ list')); getType()->getName($this->plugin('translate')->getTranslator()) ?> + + + getAbrogationDate()?->format('Y-m-d') ?> + + diff --git a/module/Decision/view/decision/organ/show.phtml b/module/Decision/view/decision/organ/show.phtml deleted file mode 100644 index 6e10e0c52e..0000000000 --- a/module/Decision/view/decision/organ/show.phtml +++ /dev/null @@ -1,80 +0,0 @@ -}> $activeMembers - * @var MemberModel[] $inactiveMembers - * @var MemberModel[] $oldMembers - * @var OrganModel $organ - */ - -$this->headTitle($organ->getName()); -?> -
-
-
-

escapeHtml($organ->getName()) ?> (escapeHtml($organ->getAbbr()) ?>)

-
-

translate('Active members') ?>

- - -

translate('Inactive members') ?>

- - -

translate('Old members') ?>

-
    - -
  • escapeHtml($member->getFullName()) ?>
    • - -
-
- -
-

translate('Organ mutations') ?>

-
    - getOrderedSubdecisions() as $subdecision): ?> -
  • escapeHtml($subdecision->getContent()) ?>
    • - -
-
- -
-
-
diff --git a/module/Decision/view/decision/organ/view.phtml b/module/Decision/view/decision/organ/view.phtml new file mode 100644 index 0000000000..5279aa6d45 --- /dev/null +++ b/module/Decision/view/decision/organ/view.phtml @@ -0,0 +1,113 @@ +}> $activeMembers + * @var MemberModel[] $inactiveMembers + * @var MemberModel[] $oldMembers + * @var OrganModel $organ + */ + +$this->headTitle($organ->getName()); +?> +
+
+
+

escapeHtml($organ->getName()) ?> (escapeHtml($organ->getAbbr()) ?>)

+
+ +

translate('Active members') ?>

+ + + + +

translate('Inactive members') ?>

+ + + + +

translate('Old members') ?>

+
    + +
  • escapeHtml($member->getFullName()) ?>
    • + +
+ +
+ +
+

translate('Organ mutations') ?>

+
    + getOrderedSubdecisions() as $subdecision): ?> + getMeetingType()->value, + $subdecision->getMeetingNumber(), + $subdecision->getDecisionPoint(), + $subdecision->getDecisionNumber(), + ]); + $extendedId = $id . '.' . $subdecision->getNumber(); + ?> + + +
+
+ +
+
+
diff --git a/module/Frontpage/config/module.config.php b/module/Frontpage/config/module.config.php index 9f122343c9..7fbb7313df 100644 --- a/module/Frontpage/config/module.config.php +++ b/module/Frontpage/config/module.config.php @@ -82,6 +82,17 @@ ], 'priority' => 100, ], + 'committee_historical_list' => [ + 'type' => Literal::class, + 'options' => [ + 'route' => 'association/history/committees', + 'defaults' => [ + 'controller' => OrganController::class, + 'action' => 'historicalCommitteeList', + ], + ], + 'priority' => 100, + ], 'fraternity_list' => [ 'type' => Literal::class, 'options' => [ diff --git a/module/Frontpage/src/Controller/OrganController.php b/module/Frontpage/src/Controller/OrganController.php index e41b18c28e..2d044339d4 100644 --- a/module/Frontpage/src/Controller/OrganController.php +++ b/module/Frontpage/src/Controller/OrganController.php @@ -22,24 +22,28 @@ public function __construct( public function committeeListAction(): ViewModel { - $committees = $this->organService->findActiveOrgansByType(OrganTypes::Committee); + return new ViewModel( + [ + 'committees' => $this->organService->findActiveOrgansByType(OrganTypes::Committee), + ], + ); + } + public function historicalCommitteeListAction(): ViewModel + { return new ViewModel( [ - 'committees' => $committees, + 'committees' => $this->organService->findAbrogatedOrgansByType(OrganTypes::Committee), ], ); } public function fraternityListAction(): ViewModel { - $activeFraternities = $this->organService->findActiveOrgansByType(OrganTypes::Fraternity); - $abrogatedFraternities = $this->organService->findAbrogatedOrgansByType(OrganTypes::Fraternity); - return new ViewModel( [ - 'activeFraternities' => $activeFraternities, - 'abrogatedFraternities' => $abrogatedFraternities, + 'activeFraternities' => $this->organService->findActiveOrgansByType(OrganTypes::Fraternity), + 'abrogatedFraternities' => $this->organService->findAbrogatedOrgansByType(OrganTypes::Fraternity), ], ); } @@ -55,7 +59,7 @@ public function organAction(): ViewModel } $organMemberInformation = $this->organService->getOrganMemberInformation($organ); - $activities = $this->activityQueryService->getOrganActivities($organ, 3); + $activities = $this->activityQueryService->getOrganActivities($organ, 5); return new ViewModel( array_merge( diff --git a/module/Frontpage/view/frontpage/organ/committee-list.phtml b/module/Frontpage/view/frontpage/organ/committee-list.phtml index 5a2a4a2c2a..0b2f49c4d8 100644 --- a/module/Frontpage/view/frontpage/organ/committee-list.phtml +++ b/module/Frontpage/view/frontpage/organ/committee-list.phtml @@ -16,25 +16,30 @@ $this->headTitle($this->translate('Committees'));
-
-

translate('Committees') ?>

-

translate('GEWIS has many different committees, learn more about them below!') ?>

-
- acl('decision_service_acl')->isAllowed('organ', 'view')): ?> -
- - translate('Information for committees') ?> - +
+
+
+ + translate('Old committees') ?> + + acl('decision_service_acl')->isAllowed('organ', 'view')): ?> + + translate('Information for committees') ?> + + +
+

translate('Committees') ?>

+

translate('GEWIS has many different committees, learn more about them below!') ?>

- +
diff --git a/module/Frontpage/view/frontpage/organ/historical-committee-list.phtml b/module/Frontpage/view/frontpage/organ/historical-committee-list.phtml new file mode 100644 index 0000000000..1d389afca5 --- /dev/null +++ b/module/Frontpage/view/frontpage/organ/historical-committee-list.phtml @@ -0,0 +1,39 @@ +headTitle($this->translate('Old committees')); +?> +
+
+
+
+
+

translate('Old committees') ?>

+

translate('GEWIS has had many different committees over the years, learn more about this rich history below!') ?>

+
+
+
+
+ plugin('translate')->getTranslator()->getLocale(); + + foreach ($committees as $committee) { + echo $this->partial('partial/organ-card.phtml', [ + 'organ' => $committee, + 'lang' => $lang, + ]); + } + ?> +
+
+