Merge branch 'master' of github.com:GEWIS/gewisweb

GEWIS · Jan 10, 2017 · 379b131 · 379b131
2 parents 4ed1efd + 53251d5
commit 379b131
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/module/Activity/src/Activity/Controller/ActivityController.php b/module/Activity/src/Activity/Controller/ActivityController.php
@@ -43,7 +43,7 @@ public function viewAction()
         $activity = $queryService->getActivity($id);
 
         $translatedActivity = $translatorService->getTranslatedActivity($activity, $langSession->lang);
-        $identity = $this->getServiceLocator()->get('user_service_user')->getIdentity();
+        $identity = $this->getServiceLocator()->get('user_role');
         /** @var Signup $signupService */
         $signupService = $this->getServiceLocator()->get('activity_service_signup');
         $isAllowedToSubscribe = $signupService->isAllowedToSubscribe();
@@ -56,8 +56,8 @@ public function viewAction()
         $subscriptionDeadLinePassed = $activity->getSubscriptionDeadline() < new \DateTime();
         $result = [
             'activity' => $translatedActivity,
-            'signupOpen' => $activity->getCanSignUp() && 
-            !$subscriptionDeadLinePassed && 
+            'signupOpen' => $activity->getCanSignUp() &&
+            !$subscriptionDeadLinePassed &&
             $activity->getStatus() === Activity::STATUS_APPROVED,
             'isAllowedToSubscribe' => $isAllowedToSubscribe,
             'isSignedUp' => $isAllowedToSubscribe && $signupService->isSignedUp($translatedActivity, $identity->getMember()),

diff --git a/module/Application/language/nl.mo b/module/Application/language/nl.mo
diff --git a/module/Application/language/nl.po b/module/Application/language/nl.po
@@ -2365,7 +2365,7 @@ msgstr ""
 
 #: module/Decision/view/decision/member/index.phtml:8
 msgid "Personal"
-msgstr "Persoonlijjk"
+msgstr "Persoonlijk"
 
 #: module/Decision/view/decision/member/index.phtml:13
 msgid "Profile"