diff --git a/module/Application/language/en.po b/module/Application/language/en.po index 9702626a8b..4528eaa215 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: 2023-11-19 16:08+0100\n" -"PO-Revision-Date: 2023-11-19 16:09+0100\n" +"POT-Creation-Date: 2024-01-01 13:40+0100\n" +"PO-Revision-Date: 2024-01-01 13:41+0100\n" "Last-Translator: Tom Udding \n" "Language-Team: English \n" "Language: en\n" @@ -252,8 +252,11 @@ msgstr "Addresses" msgid "Admin" msgstr "Admin" -msgid "Admin - Board and Tom" -msgstr "Admin - Board and Tom" +msgid "Admin - Board" +msgstr "Admin - Board" + +msgid "Admin - Tom" +msgstr "Admin - Tom" msgid "Administrator" msgstr "Administrator" @@ -463,6 +466,9 @@ msgstr "Are you sure you would like to authorize %s" msgid "Article" msgstr "Article" +msgid "Articles of Association" +msgstr "Articles of Association" + msgid "Artist" msgstr "Artist" @@ -562,9 +568,6 @@ msgid "By subscribing to this activity, you agree to the terms outlined in the" msgstr "" "By subscribing to this activity, you agree to the terms outlined in the" -msgid "Bylaws" -msgstr "Bylaws" - msgid "CAPTCHA" msgstr "CAPTCHA" @@ -3773,6 +3776,9 @@ msgstr "You are not allowed to edit pages." msgid "You are not allowed to edit this organ's information" msgstr "You are not allowed to edit this organ's information" +msgid "You are not allowed to export member data" +msgstr "You are not allowed to export member data" + msgid "You are not allowed to list all job categories" msgstr "You are not allowed to list all job categories" diff --git a/module/Application/language/gewisweb.pot b/module/Application/language/gewisweb.pot index 0001bcc673..189aff160e 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-570-g8364f44e3-dirty\n" +"Project-Id-Version: GEWISweb v2.8.6-584-g9df01abcc-dirty\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2023-11-19 16:08+0100\n" +"POT-Creation-Date: 2024-01-01 13:40+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -243,7 +243,10 @@ msgstr "" msgid "Admin" msgstr "" -msgid "Admin - Board and Tom" +msgid "Admin - Board" +msgstr "" + +msgid "Admin - Tom" msgstr "" msgid "Administrator" @@ -436,6 +439,9 @@ msgstr "" msgid "Article" msgstr "" +msgid "Articles of Association" +msgstr "" + msgid "Artist" msgstr "" @@ -527,9 +533,6 @@ msgstr "" msgid "By subscribing to this activity, you agree to the terms outlined in the" msgstr "" -msgid "Bylaws" -msgstr "" - msgid "CAPTCHA" msgstr "" @@ -3544,6 +3547,9 @@ msgstr "" msgid "You are not allowed to edit this organ's information" msgstr "" +msgid "You are not allowed to export member data" +msgstr "" + msgid "You are not allowed to list all job categories" msgstr "" diff --git a/module/Application/language/nl.po b/module/Application/language/nl.po index fea07ca4cf..d0a39c17d4 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: 2023-11-19 16:08+0100\n" -"PO-Revision-Date: 2023-11-19 16:12+0100\n" +"POT-Creation-Date: 2024-01-01 13:40+0100\n" +"PO-Revision-Date: 2024-01-01 13:42+0100\n" "Last-Translator: Tom Udding \n" "Language-Team: English \n" "Language: nl\n" @@ -253,8 +253,11 @@ msgstr "Adressen" msgid "Admin" msgstr "Admin" -msgid "Admin - Board and Tom" -msgstr "Admin - Bestuur en Tom" +msgid "Admin - Board" +msgstr "Admin - Bestuur" + +msgid "Admin - Tom" +msgstr "Admin - Tom" msgid "Administrator" msgstr "Administrator" @@ -464,6 +467,9 @@ msgstr "Weet je zeker dat je %s wilt machtigen" msgid "Article" msgstr "Artikel" +msgid "Articles of Association" +msgstr "Statuten" + msgid "Artist" msgstr "Artiest" @@ -564,9 +570,6 @@ msgstr "" "Door je in te schrijven voor deze activiteit ga je akkoord met de " "voorwaarden in het" -msgid "Bylaws" -msgstr "Statuten" - msgid "CAPTCHA" msgstr "CAPTCHA" @@ -3820,6 +3823,9 @@ msgstr "Je hebt niet de rechten om pagina's te wijzigen." msgid "You are not allowed to edit this organ's information" msgstr "Je hebt niet de rechten om de informatie van dit orgaan te wijzigen" +msgid "You are not allowed to export member data" +msgstr "Je hebt niet de rechten om informatie over leden te exporteren" + msgid "You are not allowed to list all job categories" msgstr "Je hebt niet de rechten om alle vacaturecategorieën te bekijken" diff --git a/module/Decision/src/Model/Enums/MembershipTypes.php b/module/Decision/src/Model/Enums/MembershipTypes.php index ddbf2f0e3f..a5f39d58c1 100644 --- a/module/Decision/src/Model/Enums/MembershipTypes.php +++ b/module/Decision/src/Model/Enums/MembershipTypes.php @@ -7,7 +7,7 @@ use Laminas\Mvc\I18n\Translator; /** - * Enum for the different membership types as defined in the bylaws of the association. + * Enum for the different membership types as defined in the articles of association. */ enum MembershipTypes: string { diff --git a/module/Decision/src/Model/Member.php b/module/Decision/src/Model/Member.php index c68f6b6f84..fd47a3f160 100644 --- a/module/Decision/src/Model/Member.php +++ b/module/Decision/src/Model/Member.php @@ -131,7 +131,7 @@ enumType: MembershipTypes::class, /** * Date when the real membership ("ordinary" or "external") of the member will have ended, in other words, from this * date onwards they are "graduate". If `null`, the expiration is rolling and will be silently renewed if the member - * still meets the requirements as set forth in the bylaws and internal regulations. + * still meets the requirements as set forth in the articles of association and internal regulations. */ #[Column( type: 'date', @@ -147,7 +147,8 @@ enumType: MembershipTypes::class, /** * The date on which the membership of the member is set to expire and will therefore have to be renewed, which - * happens either automatically or has to be done manually, as set forth in the bylaws and internal regulations. + * happens either automatically or has to be done manually, as set forth in the articles of association and internal + * regulations. */ #[Column(type: 'date')] protected DateTime $expiration; diff --git a/module/Decision/view/decision/member/index.phtml b/module/Decision/view/decision/member/index.phtml index ccb48f6a58..949735bb3f 100644 --- a/module/Decision/view/decision/member/index.phtml +++ b/module/Decision/view/decision/member/index.phtml @@ -239,10 +239,10 @@ $this->headTitle($this->translate('Members')); 'sub_category' => 'reglementen', 'sub_categoryEn' => 'regulations', 'name' => 'statuten', - 'nameEn' => 'bylaws', + 'nameEn' => 'articles-of-association', ], ) ?>"> - translate('Bylaws') ?> + translate('Articles of Association') ?>