Merge pull request #1775 from tomudding/fix/bylaws-vs-articles-of-ass…

…ociation Fix 'Bylaws' vs 'Articles of Association'
GEWIS · Jan 1, 2024 · 440a30f · 440a30f
2 parents 9df01ab + dd2b5d9
commit 440a30f
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 25 deletions.
diff --git a/module/Application/language/en.po b/module/Application/language/en.po
diff --git a/module/Application/language/gewisweb.pot b/module/Application/language/gewisweb.pot
diff --git a/module/Application/language/nl.po b/module/Application/language/nl.po
diff --git 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
@@ -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
@@ -239,10 +239,10 @@ $this->headTitle($this->translate('Members'));
                                     'sub_category' => 'reglementen',
                                     'sub_categoryEn' => 'regulations',
                                     'name' => 'statuten',
-                                    'nameEn' => 'bylaws',
+                                    'nameEn' => 'articles-of-association',
                                 ],
                             ) ?>">
-                                <?= $this->translate('Bylaws') ?>
+                                <?= $this->translate('Articles of Association') ?>
                             </a>
                         </li>
                         <li>