diff --git a/includes/controller/shift_entries_controller.php b/includes/controller/shift_entries_controller.php index f53b1300..fcd911de 100644 --- a/includes/controller/shift_entries_controller.php +++ b/includes/controller/shift_entries_controller.php @@ -339,7 +339,7 @@ function shift_entry_delete_controller() $shift = Shift($shiftEntry['SID']); $angeltype = AngelType($shiftEntry['TID']); $signout_user = User($shiftEntry['UID']); - if (! Shift_signout_allowed($shift, $angeltype, $signout_user)) { + if (!Shift_signout_allowed($shift, $angeltype, $signout_user)) { 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/controller/user_angeltypes_controller.php b/includes/controller/user_angeltypes_controller.php index fb63cda8..340de2a4 100644 --- a/includes/controller/user_angeltypes_controller.php +++ b/includes/controller/user_angeltypes_controller.php @@ -275,8 +275,7 @@ function user_angeltype_update_controller() $success_message = sprintf( $supporter ? _('Added supporter rights for %s to %s.') - : _('Removed supporter rights for %s from %s.') - , + : _('Removed supporter rights for %s from %s.'), AngelType_name_render($angeltype), User_Nick_render($user_source) ); diff --git a/locale/de_DE.UTF-8/LC_MESSAGES/default.mo b/locale/de_DE.UTF-8/LC_MESSAGES/default.mo index 4fd86d87..be300c32 100644 Binary files a/locale/de_DE.UTF-8/LC_MESSAGES/default.mo and b/locale/de_DE.UTF-8/LC_MESSAGES/default.mo differ diff --git a/locale/de_DE.UTF-8/LC_MESSAGES/default.po b/locale/de_DE.UTF-8/LC_MESSAGES/default.po index f3404930..4c324348 100644 --- a/locale/de_DE.UTF-8/LC_MESSAGES/default.po +++ b/locale/de_DE.UTF-8/LC_MESSAGES/default.po @@ -2,7 +2,7 @@ msgid "" msgstr "" "Project-Id-Version: Engelsystem 2.0\n" "POT-Creation-Date: 2017-12-23 11:35+0100\n" -"PO-Revision-Date: 2017-12-23 22:31+0100\n" +"PO-Revision-Date: 2017-12-25 23:55+0100\n" "Last-Translator: msquare \n" "Language-Team: \n" "Language: de_DE\n" @@ -211,7 +211,7 @@ msgstr "Schichteintrag nicht gefunden." #: /Users/msquare/workspace/projects/engelsystem/includes/controller/shift_entries_controller.php:310 msgid "" -"You are not allowed to remove this shift entry. If neccessary, ask your " +"You are not allowed to remove this shift entry. If necessary, ask your " "supporter or heaven to do so." msgstr "" "Du darfst diesen Schichteintrag nicht entfernen. Falls notwendig, frage " diff --git a/tests/Unit/ServiceProviderTest.php b/tests/Unit/ServiceProviderTest.php index dc58a65e..149e28f8 100644 --- a/tests/Unit/ServiceProviderTest.php +++ b/tests/Unit/ServiceProviderTest.php @@ -3,8 +3,8 @@ namespace Engelsystem\Test\Unit; use Engelsystem\Application; +use PHPUnit\Framework\MockObject\Matcher\InvokedRecorder; use PHPUnit\Framework\TestCase; -use PHPUnit_Framework_MockObject_Matcher_InvokedRecorder as InvokedRecorder; use PHPUnit_Framework_MockObject_MockObject as MockObject; abstract class ServiceProviderTest extends TestCase