diff --git a/module/Application/language/en.po b/module/Application/language/en.po index 815933dbe..4e2542969 100644 --- a/module/Application/language/en.po +++ b/module/Application/language/en.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-05-16 22:21+0200\n" +"POT-Creation-Date: 2024-06-19 17:25+0200\n" "PO-Revision-Date: \n" "Last-Translator: Rink Pieters \n" "Language-Team: \n" @@ -11,7 +11,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 2.2.4\n" +"X-Generator: Poedit 3.4.4\n" msgid "# Decisions" msgstr "# Decisions" @@ -242,14 +242,14 @@ msgstr "" "Articles of Association, Internal Regulations, and Privacy Statement of GEWIS" msgid "" -"As a GEWIS member, you will be automatically registered on the \"GEWIS-lijst" -"\" list. This list is for announcements and activities of the study " +"As a GEWIS member, you will be automatically registered on the \"GEWIS-" +"lijst\" list. This list is for announcements and activities of the study " "association. In addition, there are several optional mailing lists. You can " "subscribe to the following mailing lists. These subscriptions can be changed " "at a later date." msgstr "" -"As a GEWIS member, you will be automatically registered on the \"GEWIS-lijst" -"\" list. This list is for announcements and activities of the study " +"As a GEWIS member, you will be automatically registered on the \"GEWIS-" +"lijst\" list. This list is for announcements and activities of the study " "association. In addition, there are several optional mailing lists. You can " "subscribe to the following mailing lists. These subscriptions can be changed " "at a later date." @@ -617,13 +617,15 @@ msgstr "GEWIS Registration - Checkout" #, php-format msgid "" -"GEWIS currently has %d members (+%d expired) and %d prospective members (%d paid, %d unpaid). Click " -"here to create a meeting or perform a query." +"GEWIS currently has %d members (+%d expired) and %d prospective members (%d paid, %d unpaid). Click here to create a meeting or perform a " +"query." msgstr "" -"GEWIS currently has %d members (+%d expired) and %d prospective members (%d paid, %d unpaid). Click " -"here to create a meeting or perform a query." +"GEWIS currently has %d members (+%d expired) and %d prospective members (%d paid, %d unpaid). Click here to create a meeting or perform a " +"query." msgid "GMM (General Members Meeting)" msgstr "GMM (General Members Meeting)" @@ -982,8 +984,12 @@ msgstr "Organ Mutations" msgid "Organ Regulation" msgstr "Organ Regulation" -msgid "Organ regulations can only be created for 'committee' or 'fraternity'." -msgstr "Organ regulations can only be created for 'committee' or 'fraternity'." +msgid "" +"Organ regulations can only be created for 'committee', 'fraternity', or " +"'financial audit committee'." +msgstr "" +"Organ regulations can only be created for 'committee', 'fraternity', or " +"'financial audit committee'." msgid "Other" msgstr "Other" diff --git a/module/Application/language/gewisdb.pot b/module/Application/language/gewisdb.pot index b50014af9..61668f3a0 100644 --- a/module/Application/language/gewisdb.pot +++ b/module/Application/language/gewisdb.pot @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: GEWISdb 4272f39e-dirty\n" +"Project-Id-Version: GEWISdb 2dbfbb7e-dirty\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-05-16 22:21+0200\n" +"POT-Creation-Date: 2024-06-19 17:25+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -924,7 +924,9 @@ msgstr "" msgid "Organ Regulation" msgstr "" -msgid "Organ regulations can only be created for 'committee' or 'fraternity'." +msgid "" +"Organ regulations can only be created for 'committee', 'fraternity', or " +"'financial audit committee'." msgstr "" msgid "Other" diff --git a/module/Application/language/nl.po b/module/Application/language/nl.po index a9bf806c2..ff5f76ad6 100644 --- a/module/Application/language/nl.po +++ b/module/Application/language/nl.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2024-05-16 22:21+0200\n" +"POT-Creation-Date: 2024-06-19 17:25+0200\n" "PO-Revision-Date: \n" "Last-Translator: Rink Pieters \n" "Language-Team: \n" @@ -11,7 +11,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 2.2.4\n" +"X-Generator: Poedit 3.4.4\n" msgid "# Decisions" msgstr "# besluiten" @@ -243,8 +243,8 @@ msgid "" msgstr "Statuten, Huishoudelijk Reglement en Privacystatement van GEWIS" msgid "" -"As a GEWIS member, you will be automatically registered on the \"GEWIS-lijst" -"\" list. This list is for announcements and activities of the study " +"As a GEWIS member, you will be automatically registered on the \"GEWIS-" +"lijst\" list. This list is for announcements and activities of the study " "association. In addition, there are several optional mailing lists. You can " "subscribe to the following mailing lists. These subscriptions can be changed " "at a later date." @@ -620,14 +620,15 @@ msgstr "GEWIS Inschrijven - Afrekenen" #, php-format msgid "" -"GEWIS currently has %d members (+%d expired) and %d prospective members (%d paid, %d unpaid). Click " -"here to create a meeting or perform a query." +"GEWIS currently has %d members (+%d expired) and %d prospective members (%d paid, %d unpaid). Click here to create a meeting or perform a " +"query." msgstr "" -"GEWIS heeft momenteel %d leden (+%d verlopen) en %d toekomstige leden (%d betaald, %d onbetaald). Klik hier om een vergadering te maken of om een query " -"uit te voeren." +"GEWIS heeft momenteel %d leden (+%d verlopen) en %d toekomstige leden (%d betaald, %d onbetaald). Klik hier om een vergadering te maken of om een query uit te voeren." msgid "GMM (General Members Meeting)" msgstr "ALV (algemene ledenvergadering)" @@ -989,10 +990,12 @@ msgstr "Orgaanmutaties" msgid "Organ Regulation" msgstr "Orgaanreglement" -msgid "Organ regulations can only be created for 'committee' or 'fraternity'." +msgid "" +"Organ regulations can only be created for 'committee', 'fraternity', or " +"'financial audit committee'." msgstr "" -"Orgaanreglementen kunnen alleen worden aangemaakt voor 'commissie' of " -"'dispuut'." +"Orgaanreglementen kunnen alleen worden aangemaakt voor 'commissie', " +"'dispuut' of 'kas controle commissie'." msgid "Other" msgstr "Overig" @@ -1492,9 +1495,9 @@ msgid "" "github.com/GEWIS/gewisdb/commit/%1$s\">%1$s. Please include this in all " "your bug reports." msgstr "" -"Je gebruikt een build gebaseerd op commit %1$s. Vermeld dit in al " -"je bugrapporten." +"Je gebruikt een build gebaseerd op commit %1$s. Vermeld dit " +"in al je bugrapporten." #, php-format msgid "You can always read the online Supremum on %s." @@ -1521,8 +1524,8 @@ msgid "" "%2$s\">%2$s." msgstr "" "Je hebt verlenging van je status als afgestudeerde aangevraagd. Binnen 24 " -"uur zal de einddatum %1$s op jouw ledenpagina van " -"%2$s te zien zijn." +"uur zal de einddatum %1$s op jouw ledenpagina van %2$s te zien zijn." msgid "You have successfully requested renewal of your status as graduate." msgstr "" diff --git a/module/Database/src/Form/OrganRegulation.php b/module/Database/src/Form/OrganRegulation.php index 46bcca881..14edf93de 100644 --- a/module/Database/src/Form/OrganRegulation.php +++ b/module/Database/src/Form/OrganRegulation.php @@ -52,7 +52,6 @@ public function __construct( [ 'value' => 'kcc', 'label' => $this->translator->translate('Financial Audit Committee'), - 'disabled' => true, ], [ 'value' => 'rva', @@ -135,7 +134,7 @@ public function getInputFilterSpecification(): array 'options' => [ 'messages' => [ Callback::INVALID_VALUE => $this->translator->translate( - 'Organ regulations can only be created for \'committee\' or \'fraternity\'.', + 'Organ regulations can only be created for \'committee\', \'fraternity\', or \'financial audit committee\'.', ), ], 'callback' => [$this, 'organTypeNotDisabled'], diff --git a/module/Database/src/Hydrator/OrganRegulation.php b/module/Database/src/Hydrator/OrganRegulation.php index 1d1b38ca7..3068251be 100644 --- a/module/Database/src/Hydrator/OrganRegulation.php +++ b/module/Database/src/Hydrator/OrganRegulation.php @@ -37,10 +37,12 @@ public function hydrate( $data['type'] = OrganTypes::from($data['type']); } - // Only allow committees and fraternities. This should already be handled by the form, just a fail-safe. + // Only allow committees, fraternities, and financial audit committees. This should already be handled by the + // form, so this is just a fail-safe. if ( OrganTypes::Committee !== $data['type'] && OrganTypes::Fraternity !== $data['type'] + && OrganTypes::KCC !== $data['type'] ) { throw new UnexpectedValueException('Unexpected organ type for organ regulation.'); } diff --git a/module/Database/src/Model/SubDecision/OrganRegulation.php b/module/Database/src/Model/SubDecision/OrganRegulation.php index 22fe7cdc8..7c668daf2 100644 --- a/module/Database/src/Model/SubDecision/OrganRegulation.php +++ b/module/Database/src/Model/SubDecision/OrganRegulation.php @@ -170,7 +170,10 @@ protected function getAlternativeTemplate(): string */ public function getContent(): string { - if (OrganTypes::Committee === $this->getOrganType()) { + if ( + OrganTypes::Committee === $this->getOrganType() + || OrganTypes::KCC === $this->getOrganType() + ) { $organType = 'commissie'; } elseif (OrganTypes::Fraternity === $this->getOrganType()) { $organType = 'dispuuts'; @@ -193,7 +196,10 @@ public function getContent(): string public function getAlternativeContent(): string { - if (OrganTypes::Committee === $this->getOrganType()) { + if ( + OrganTypes::Committee === $this->getOrganType() + || OrganTypes::KCC === $this->getOrganType() + ) { $organType = 'committee '; } elseif (OrganTypes::Fraternity === $this->getOrganType()) { $organType = 'fraternity ';