Merge pull request #387 from ka7/feature/spelling

spelling fixes

6 files changed, 7 insertions, 7 deletions

diff --git a/includes/controller/public_dashboard_controller.php b/includes/controller/public_dashboard_controller.php
index 45a54423..7d652a64 100644
--- a/includes/controller/public_dashboard_controller.php
+++ b/includes/controller/public_dashboard_controller.php
@@ -28,7 +28,7 @@ function public_dashboard_controller()
 }
 
 /**
- * Gathers informations for free shifts to display.
+ * Gathers information for free shifts to display.
  *
  * @param array $shift            
  */
@@ -62,7 +62,7 @@ function public_dashboard_controller_free_shift($shift)
 }
 
 /**
- * Gathers informations for needed angels on dashboard
+ * Gathers information for needed angels on dashboard
  *
  * @param array $needed_angels            
  */
diff --git a/includes/controller/shift_entries_controller.php b/includes/controller/shift_entries_controller.php
index 9ea25a79..8dbf03ef 100644
--- a/includes/controller/shift_entries_controller.php
+++ b/includes/controller/shift_entries_controller.php
@@ -307,7 +307,7 @@ function shift_entry_delete_controller()
     $angeltype = AngelType($shiftEntry['TID']);
     $signout_user = User($shiftEntry['UID']);
     if (! Shift_signout_allowed($shift, $angeltype, $signout_user)) {
-        error(_('You are not allowed to remove this shift entry. If neccessary, ask your supporter or heaven to do so.'));
+        error(_('You are not allowed to remove this shift entry. If necessary, ask your supporter or heaven to do so.'));
         redirect(user_link($signout_user));
     }
     
diff --git a/includes/model/Message_model.php b/includes/model/Message_model.php
index 9bb037af..5185785a 100644
--- a/includes/model/Message_model.php
+++ b/includes/model/Message_model.php
@@ -28,7 +28,7 @@ function Message($message_id)
  * TODO: global $user con not be used in model!
  * send message
  *
- * @param int    $receiver_user_id User ID of Reciever
+ * @param int    $receiver_user_id User ID of Receiver
  * @param string $text             Text of Message
  * @return bool
  */
diff --git a/includes/model/Shifts_model.php b/includes/model/Shifts_model.php
index caca2a33..fd229be6 100644
--- a/includes/model/Shifts_model.php
+++ b/includes/model/Shifts_model.php
@@ -328,7 +328,7 @@ function Shift_signup_allowed_angel(
     }
 
     if ($signed_up) {
-        // you cannot join if you already singed up for this shift
+        // you cannot join if you already signed up for this shift
         return new ShiftSignupState(ShiftSignupState::SIGNED_UP, $free_entries);
     }
 
diff --git a/includes/pages/user_ical.php b/includes/pages/user_ical.php
index 8d22c4eb..4ebbb9a2 100644
--- a/includes/pages/user_ical.php
+++ b/includes/pages/user_ical.php
@@ -28,7 +28,7 @@ function user_ical()
 }
 
 /**
- * Renders an ical calender from given shifts array.
+ * Renders an ical calendar from given shifts array.
  *
  * @param array <Shift> $shifts
  */
diff --git a/includes/view/ShiftCalendarShiftRenderer.php b/includes/view/ShiftCalendarShiftRenderer.php
index 97a40ed9..2940306d 100644
--- a/includes/view/ShiftCalendarShiftRenderer.php
+++ b/includes/view/ShiftCalendarShiftRenderer.php
@@ -149,7 +149,7 @@ class ShiftCalendarShiftRenderer
      *
      * @param array   $shift     The shift which is rendered
      * @param array[] $shift_entries
-     * @param array[] $angeltype The angeltype, containing informations about needed angeltypes
+     * @param array[] $angeltype The angeltype, containing information about needed angeltypes
      *                           and already signed up angels
      * @param array   $user      The user who is viewing the shift calendar
      * @return array