From f8d0a7c5b00a58c646871e355b5876dcc5890be5 Mon Sep 17 00:00:00 2001 From: Igor Scheller Date: Mon, 25 Dec 2017 23:52:31 +0100 Subject: [PATCH] Updated translation / Formatting / Test --- .../controller/shift_entries_controller.php | 2 +- .../controller/user_angeltypes_controller.php | 3 +-- locale/de_DE.UTF-8/LC_MESSAGES/default.mo | Bin 43369 -> 43368 bytes locale/de_DE.UTF-8/LC_MESSAGES/default.po | 4 ++-- tests/Unit/ServiceProviderTest.php | 2 +- 5 files changed, 5 insertions(+), 6 deletions(-) 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 4fd86d87497b3682a04d2f50ffd67dba6267bb34..be300c322f9df5064c7a68892790145da9a16301 100644 GIT binary patch delta 5129 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\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