From 1d9e1c467cf4d3920f9bcf0157481c7ca8ea6d5d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Philip=20H=C3=A4usler?= Date: Sun, 28 Sep 2014 14:50:08 +0200 Subject: [PATCH] user list rewritten --- includes/controller/angeltypes_controller.php | 2 +- includes/controller/users_controller.php | 41 ++- includes/model/User_model.php | 10 + includes/pages/admin_user.php | 88 +---- includes/sys_template.php | 24 +- includes/view/User_view.php | 47 +++ locale/de_DE.UTF-8/LC_MESSAGES/default.mo | Bin 27394 -> 27829 bytes locale/de_DE.UTF-8/LC_MESSAGES/default.po | 318 ++++++++++-------- 8 files changed, 306 insertions(+), 224 deletions(-) diff --git a/includes/controller/angeltypes_controller.php b/includes/controller/angeltypes_controller.php index 93c0e6bf..79ffcfb4 100644 --- a/includes/controller/angeltypes_controller.php +++ b/includes/controller/angeltypes_controller.php @@ -225,7 +225,7 @@ function angeltypes_list_controller() { $angeltype['restricted'] = $angeltype['restricted'] ? '' . _(' : ''; $angeltype['name'] = '' . $angeltype['name'] . ''; - $angeltype['actions'] = buttons($actions); + $angeltype['actions'] = table_buttons($actions); } return array( diff --git a/includes/controller/users_controller.php b/includes/controller/users_controller.php index 1f3b3677..b1692e21 100644 --- a/includes/controller/users_controller.php +++ b/includes/controller/users_controller.php @@ -55,7 +55,46 @@ function user_controller() { } function users_list_controller() { - redirect(page_link_to('admin_user')); + global $privileges; + + if (! in_array('admin_user', $privileges)) + redirect(page_link_to('')); + + $order_by = 'Nick'; + if (isset($_REQUEST['OrderBy']) && in_array($_REQUEST['OrderBy'], array( + 'Nick', + 'Name', + 'Vorname', + 'Alter', + 'DECT', + 'email', + 'Size', + 'Gekommen', + 'Aktiv', + 'force_active', + 'Tshirt', + 'lastLogIn' + ))) + $order_by = $_REQUEST['OrderBy']; + + $users = Users($order_by); + if ($users === false) + engelsystem_error('Unable to load users.'); + + foreach ($users as &$user) { + $user['freeloads'] = sql_select_single_cell("SELECT COUNT(*) FROM `ShiftEntry` WHERE `freeloaded` = 1 AND `UID` = " . sql_escape($user['UID'])); + } + + $arrived_count = sql_select_single_cell("SELECT COUNT(*) FROM `User` WHERE `Gekommen` = 1"); + $active_count = sql_select_single_cell("SELECT COUNT(*) FROM `User` WHERE `Aktiv` = 1"); + $force_active_count = sql_select_single_cell("SELECT COUNT(*) FROM `User` WHERE `force_active` = 1"); + $freeloads_count = sql_select_single_cell("SELECT COUNT(*) FROM `ShiftEntry` WHERE `freeloaded` = 1"); + $tshirts_count = sql_select_single_cell("SELECT COUNT(*) FROM `User` WHERE `Tshirt` = 1"); + + return array( + _('All users'), + Users_view($users, $order_by, $arrived_count, $active_count, $force_active_count, $freeloads_count, $tshirts_count) + ); } /** diff --git a/includes/model/User_model.php b/includes/model/User_model.php index 7d2809f7..af4c4a97 100644 --- a/includes/model/User_model.php +++ b/includes/model/User_model.php @@ -1,8 +1,18 @@ 0) { $id = $_REQUEST['id']; if (! isset($_REQUEST['action'])) { - $html .= '

' . _('Edit user') . '

'; $html .= "Hallo,
" . "hier kannst du den Eintrag ändern. Unter dem Punkt 'Gekommen' " . "wird der Engel als anwesend markiert, ein Ja bei Aktiv bedeutet, " . "dass der Engel aktiv war und damit ein Anspruch auf ein T-Shirt hat. " . "Wenn T-Shirt ein 'Ja' enthält, bedeutet dies, dass der Engel " . "bereits sein T-Shirt erhalten hat.

\n"; $html .= "
\n"; @@ -265,90 +264,11 @@ function admin_user() { } } } else { - // Userliste, keine UID uebergeben... - $html .= '

' . _('All users') . '

'; - - $html .= "Neuen Engel eintragen »

\n"; - - if (! isset($_GET["OrderBy"])) - $_GET["OrderBy"] = "Nick"; - $SQL = "SELECT * FROM `User` ORDER BY `" . sql_escape($_GET["OrderBy"]) . "` ASC"; - $angels = sql_select($SQL); - - function prepare_angel_table($angel) { - global $privileges; - $groups = sql_select_single_col("SELECT `Name` FROM `UserGroups` JOIN `Groups` ON (`Groups`.`UID` = `UserGroups`.`group_id`) WHERE `UserGroups`.`uid`=" . sql_escape($angel["UID"]) . " ORDER BY `Groups`.`Name`"); - $angeltypes = sql_select_single_col(" - SELECT `AngelTypes`.`name` - FROM `UserAngelTypes` - JOIN `AngelTypes` ON (`UserAngelTypes`.`angeltype_id`=`AngelTypes`.`id`) - WHERE `user_id`=" . sql_escape($angel['UID'])); - $popup = ''; @@ -292,7 +310,11 @@ function button($href, $label, $class = "") { * Rendert eine Toolbar mit Knöpfen */ function buttons($buttons = array ()) { - return '
' . join(' ', $buttons) . '
'; + return '
' . table_buttons($buttons) . '
'; +} + +function table_buttons($buttons = array()) { + return '
' . join(' ', $buttons) . '
'; } // Load and render template diff --git a/includes/view/User_view.php b/includes/view/User_view.php index 4c783644..a866439d 100644 --- a/includes/view/User_view.php +++ b/includes/view/User_view.php @@ -19,6 +19,53 @@ $tshirt_sizes = array( 'XL-G' => "XL Girl" ); +function Users_view($users, $order_by, $arrived_count, $active_count, $force_active_count, $freeloads_count, $tshirts_count) { + foreach ($users as &$user) { + $user['Gekommen'] = glyph_bool($user['Gekommen']); + $user['Aktiv'] = glyph_bool($user['Aktiv']); + $user['force_active'] = glyph_bool($user['force_active']); + $user['Tshirt'] = glyph_bool($user['Tshirt']); + $user['lastLogIn'] = date(_('m/d/Y h:i a'), $user['lastLogIn']); + $user['actions'] = table_buttons(array( + button(page_link_to('admin_user') . '&id=' . $user['UID'], _('edit'), 'btn-xs') + )); + } + $users[] = array( + 'Nick' => '' . _('Sum') . '', + 'Gekommen' => $arrived_count, + 'Aktiv' => $active_count, + 'force_active' => $force_active_count, + 'freeloads' => $freeloads_count, + 'Tshirt' => $tshirts_count, + 'actions' => '' . count($users) . '' + ); + + return page_with_title(_('All users'), array( + msg(), + buttons(array( + button(page_link_to('register'), glyph('plus') . _('New user')) + )), + table(array( + 'Nick' => Users_table_header_link('Nick', _('Nick'), $order_by), + 'Vorname' => Users_table_header_link('Vorname', _('Prename'), $order_by), + 'Name' => Users_table_header_link('Name', _('Name'), $order_by), + 'DECT' => Users_table_header_link('DECT', _('DECT'), $order_by), + 'Gekommen' => Users_table_header_link('Gekommen', _('Arrived'), $order_by), + 'freeloads' => _('Freeloads'), + 'Aktiv' => Users_table_header_link('Aktiv', _('Active'), $order_by), + 'force_active' => Users_table_header_link('force_active', _('Forced'), $order_by), + 'Tshirt' => Users_table_header_link('Tshirt', _('T-Shirt'), $order_by), + 'Size' => Users_table_header_link('Size', _('Size'), $order_by), + 'lastLogIn' => Users_table_header_link('lastLogIn', _('Last login'), $order_by), + 'actions' => '' + ), $users) + )); +} + +function Users_table_header_link($column, $label, $order_by) { + return '' . $label . ($order_by == $column ? ' ' : '') . ''; +} + function User_shift_state_render($user) { $upcoming_shifts = ShiftEntries_upcoming_for_user($user); if ($upcoming_shifts === false) diff --git a/locale/de_DE.UTF-8/LC_MESSAGES/default.mo b/locale/de_DE.UTF-8/LC_MESSAGES/default.mo index b643964aeee00326bfc4411ef74c57053c14c101..582ca04e4cd764d7447a7ef6eb24c4a7930c3673 100644 GIT binary patch delta 8143 zcmZA530ziH8prX20wRhaxPTk40s<a#uTdzyWz(dkZKO?R zIXR4#W|@>VrIWd2o6XW*rsIs0%T!icGmcsF`@i=v(`W9dhwpRFx%b?2&OP_O&aC+$ z;Q5aOd?z9UHyRF4fHA$Ww1Y8c$e-$_T4N^lF{U5pBmbF7{^-2BFc_b(K7(PD_hLId zjBW94R9An*a6E%u@t@e=7@rA?H71CPVWkghz>6$~xg8_%KGe*bu@gRpA^0-t z{KJ@!@1y#OWt6(UKXMzBj#_~|sD2J&Z#BG0qK?jDXZ!|xU|ZH*9rwWmOhcVF7uE3+ z?1&Yp6|6@sbt4YM2W^L#XrLvGt##R^qRy8+~QV7g00*33XjsqGJ|nfD=&X&+w6`!#Ow=i%}gu zjluX5j=)!OKK=`5;7rz0kL1_LJc)HA>NG|=vmZtmrxVAg6%P6pmTmCs@xlOULtBhsZPDm zWRPeiIT(Z!P$y17ZMNCi4vSG2dTe{Gt-lFFslU~h*Q3sR0M*YUsHJX34dh8%Zow{k zF<&InYj+IwdYnYv_)FBlen8DkTUPC1)}E*vC8KVTZtF8pZ_Na2p{=h%owo{g-7VNg z@Bcayjch$?Ae&I1*e6f}IfD8Cy@!=}2G!A=6z35XqONzN23Ui-uF<+4b;E~I--l+@ z+w?N}bi+?b^g4WjdIUe9c5jJQUcfA)*{h6=s!y*OLn=IPc_)JPjJ0v|$kumh9u&zOu?PhDMFfZ;QU{(j`%0kc_(c9SEzn{S4lL&z+sMEt^H9m%s>q!7d7HM)P>VfOE?GhmMlV@ zx6IbNQ3I^P1iS%t{TAE44SCc)vx8&>4F{0_Od>l@n{E+*ST%D$_QWF?i>Gi72Jl(b zOy^-9x^Wfm!g@?*M_!MQA#*fQBYEDKhZ^WM4AJ}lIEiMo8@u8QsAqKy_3S@JjXW^Z zS<+C9rW|X_BT?s1!x$_?-JlM;;EkyBH(+nvj!}3RL%F~Ch=hBXzoACli{DPo>~8Fi zkD#9Y^Qfghgr#^CHQ+&`jJXDLQ7h;}{xi?GE#c{5EsCuu?j*nl^qPp{Wyk|h{D z+L&sr#|r!$lW^7;XFv_;p}Y>&@kP`C6URF3V^QZ%N5*FAkr&16LAo-hk^fA;Z0C`d zWV8O7(alt7iPxYu)mqdN-ivxP8&UOJP)ps6{zrydsTWY^zlPd$Z`tyD){jxwoj^V{ z=DaQU$niNB_Rnz!Fc5X(5Y%fk8r9)s)C~(zkD>^5<8su%>rn$}#86y=x^9E5--Mkh zKa862E=*`+%(Fg{L@GWU=ll!kCyb{YH{QA7B-9ONpawM8)|a3L>Onn%mDmk8pbMKZ z4v(O&KWDvwft0^P4b=B<63r-Rg7bPsVLaubn1Bmx{mtm2{3vSEy<*GnqgLj7)Qqp9 z1`<5cc^i78Zj^y~gt@2>)nsG>KC_rauY(75Vk2s));cGc&8XLCI~L%}7=+<@&Wd!! z3d;RZ-}VjG2eAj`$58$5!x%h@`h=fC|L=d`BRGQsjd(3;Cfjfz z?#DrR4pXq(WM@F*aRBAjsPDkz$S1`dNA=%riqk$8_4-zzPcwUzL?`?fHRE?skKj0J zbA5#xNbpqWN5qBNM1xT?8;Qt5DSaBxUjrzhLQ7VJ z`jsj{by$lXa5d_NYi)T0YGx1F^1B#H`6OzI&!cX188v{bI2|MT6Nbg8`_)Wm{rQNQ zdMcLVUM$2OGo0P;wQj~l>JOk+>MUx2oo6~7^~5;Jaj4y$hZ;Z;Zows}iCjT_5!=mj z9$}`BM4M&>s>24+nGres@xZK-T>5%hoDw$xGiU)9@QAs zdE-%g%{PTaOHpF2Ky_G)TGCah8~+kDz>TPZZAEps)A}riQ+@$;z}p*C3sYE!PkDBOZNZ@2Y%>r1H3_zLR$ zw=o4j#|ZuYcbVgS(GqYS4Wm#qJAxY6Tc{N|jvCnCt>2+GQ_x(eJqq<@?1kDZ>8KkP z*?KQ(rSHUSydOvF{ePDv4Li?sF37>Yloz7@;n0Y@!e$fd19S?b@G9y<)Oo)1Hso7x zLv6ERN|dAa!1dNf z)QYV`J+gaHE4LZ7^gA&YUqn6ok5CgiUoBnd8ZmM$Gto`kxA7i;hqya&HV?cQ4! zI?wtJ)aF``y75-j4R)Xgv=4RuLDYF~U>7`&+RWc9Wc_vG6)H5+fJM%dcS1eeMC^gX zu^Y}rbyQ~S8&Dl?wDmi%E9L#D8@y}FpJ8{(7qJ(1SnTYjBp->Eb|h+~+15N;KOHr| zdA5F$tzV9M6xZSi^xE=H+x{GC;QO!|Kg5wZafzc3wbH&9Nn9kSF&=}K@_casYELvF zt8N}gy&Y|qIbXE(=%bum?ChB*kyFg4sMl~*iJg!&4`ZpHjv9D14ptZSB)Z@U)Y9z2 z-uNbJDbJ!F&5zg*JMei_2dStIGf>yf$2jz24E_rB2=`z<9>8V{Ep;B*GwA>S{|=Lc z)9@L#!7q`;FkhoqV20ayUzcMpDf<34dgZ)iw7|o+g$7X z77RkI*kBCBOw^tmkG}RKQ%O4DJk)zzg1Vp%HGtK&d=F|#e}(F3I|kyj*a7#V26WJt zFQfVos&ovu#-JW;TqVyxm?YCSWTSoqCZh&Yh`M2gZNCw9qcx}j-i?~cgQ$USMLohj z7=T*ly~H}=Mq({7gV52RC^wUw-{Cnr`~MD&@L?jFwyDH)BAfeg zB9YL8{*c&4@Jpz}e}Dh~m@lK$LcB+Gq(kkJi8vio@FVZ6}) z+g>IgY4Zc*V{N{WyoqSNznS^7&VEaEE^(DuMWhqMY5yDQ7(+fBza?%aw5xRRX)+PC zX-cmWS%i*X6XU7Zv61+a*s20YvrZmLc!^I59WM}15GROk#Cl>0(R%3TN=F9qE-`@U z#SJ#$d?J**lxRyn*WQ@)zsEr`y%IWn|8_KmocI^=leSz;c^P>I4kWq}b(HTQvdLSI zH6#~^zSIpN^j*!gjr*+s!0(BVZMh3(a_(g<)+e@7FYQCbY#LS&-O1h zIPTzoiIvXOAKMm9x>99(jG}&_ZBtdU&Bq0>{->!pOY|TX&@c)ANc17{2pvnQ=L6yY zJ^Vf95UE6G>aW8?#9hSgL?LmQ_$M)%7)9u~*1`X`$mU@_-H>>SiYXXCgb+G{tjg2$ zhvQx%=V$d@$seRHnYf1h680tfkjE2mk?Yt+>?ayku*W&{CE3EW*q&I#Mfc$p;&Eag z<=@~mLPv~)8BF~*HlK_i5K+{%9)aXLD7<7V-oZCp8!^<$eg5CY-4t#h{y^MBBye#J zenCtn5^cw;$qR^Q2pvxo?-S{?|A+}hIPoOWhWL(HPL$EU1$A5@@+iOUFX{cWha2OG z88m){y-`P7jKyI%n%F@8OCpQB0h90;dI&eUjw+(S=Fj=){Ga{IL zCw9l*p^Hc*?};3d{(t9y8NZEgoQytl{ICa>XwoL5dlF?ZS}yr+D2Eq-KFkQSF!(k*NU22m-nXY+^&R{ zbE$Iz0;`Lw+)bH-bGny#>b$kZUQbQ6%Twnn_0$!YRJu!3Tj~ct9UhuinpWs4&+@p6 zo8q$fgl49sk8}+gmX$ud>11}F{}o5Hw99$3O`yi!^oMc1LUP^JE4>X2_R_dc?E>d& z*xygS5EM4m?QQV7Yh6?Q13o=-P(a8^ivAPAW@iSblzQAuxS_bb(p5@BiM#sHUazOj z>#lZ9&^%l>)Kt0V+;p8Qq0Uv@k~!~5JCPIfXT{ET`={b@*RHHCV=i7-aY>oGZh3ie crPu9EZAo2_8`-`zwJNpHH7U!}R8!IPA6|o}F#rGn delta 7766 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 UYOmr^1s&bz3bMnCtB+p#e;9s86#xJL diff --git a/locale/de_DE.UTF-8/LC_MESSAGES/default.po b/locale/de_DE.UTF-8/LC_MESSAGES/default.po index ec86d098..231c65a2 100644 --- a/locale/de_DE.UTF-8/LC_MESSAGES/default.po +++ b/locale/de_DE.UTF-8/LC_MESSAGES/default.po @@ -1,8 +1,8 @@ msgid "" msgstr "" "Project-Id-Version: Engelsystem 2.0\n" -"POT-Creation-Date: 2014-08-24 16:47+0100\n" -"PO-Revision-Date: 2014-08-24 16:47+0100\n" +"POT-Creation-Date: 2014-09-28 14:25+0100\n" +"PO-Revision-Date: 2014-09-28 14:26+0100\n" "Last-Translator: msquare \n" "Language-Team: \n" "Language: de_DE\n" @@ -17,20 +17,24 @@ msgstr "" "X-Poedit-SearchPath-0: /Users/msquare/workspace/projects/engelsystem\n" "X-Poedit-SearchPath-1: .\n" -#: /Users/msquare/workspace/projects/engelsystem/includes/sys_template.php:258 +#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:85 +msgid "Admin" +msgstr "Admin" + +#: /Users/msquare/workspace/projects/engelsystem/includes/sys_template.php:280 msgid "No data found." msgstr "Nichts gefunden." #: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:7 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:289 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:112 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:46 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:62 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:126 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:160 msgid "Angeltypes" msgstr "Engeltypen" #: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:46 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:278 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:289 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:161 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:205 msgid "Teams/Job description" @@ -68,15 +72,16 @@ msgid "view" msgstr "ansehen" #: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:209 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:141 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:56 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_groups.php:23 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:17 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:318 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:56 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:504 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:74 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:88 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:135 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:30 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:122 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:169 msgid "edit" msgstr "bearbeiten" @@ -270,54 +275,75 @@ msgstr "Du bist %s beigetreten." msgid "Become a %s" msgstr "Werde ein %s" -#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:71 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:89 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:94 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:34 +msgid "All users" +msgstr "Alle Benutzer" + +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:113 +msgid "Groups" +msgstr "Gruppen" + +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:164 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:44 +msgid "Freeloads" +msgstr "Schwänzereien" + +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:166 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:156 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:46 +msgid "Forced" +msgstr "Gezwungen" + +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:189 msgid "Token is not correct." msgstr "Der Token ist nicht in Ordnung." -#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:81 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:90 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:199 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:91 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:128 msgid "Your passwords don't match." msgstr "Deine Passwörter stimmen nicht überein." -#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:85 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:203 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:126 msgid "Your password is to short (please use at least 6 characters)." msgstr "Dein Passwort ist zu kurz (Bitte mindestens 6 Zeichen nutzen)." -#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:91 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:209 msgid "Password could not be updated." msgstr "Passwort kann nicht neu gesetzt werden." -#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:93 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:211 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:130 msgid "Password saved." msgstr "Passwort gespeichert." -#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:111 -#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:115 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:61 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:229 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:233 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:62 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:55 msgid "E-mail address is not correct." msgstr "Die E-Mail Adresse ist nicht in Ordnung." -#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:119 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:65 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:237 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:66 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:59 msgid "Please enter your e-mail." msgstr "Bitte gib Deine E-Mail-Adresse ein." -#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:126 -#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:143 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:244 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:261 msgid "Password recovery" msgstr "Passwort wiederherstellen" -#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:126 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:244 #, php-format msgid "Please visit %s to recover your password." msgstr "Bitte besuche %s, um Dein Passwort zurückzusetzen" -#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:130 +#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:248 msgid "We sent an email containing your password recovery link." msgstr "" "Wir haben eine eMail mit einem Link zum Passwort-zurücksetzen geschickt." @@ -446,11 +472,13 @@ msgstr "Nick" #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:152 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:162 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:48 msgid "Size" msgstr "Größe" #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:153 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:140 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:3 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:174 msgid "Shifts" msgstr "Schichten" @@ -463,11 +491,6 @@ msgstr "Länge" msgid "Active?" msgstr "Aktiv?" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:156 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:342 -msgid "Forced" -msgstr "Gezwungen" - #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:157 msgid "T-shirt?" msgstr "T-Shirt?" @@ -506,7 +529,7 @@ msgid "reset" msgstr "zurücksetzen" #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:55 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:136 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:170 msgid "arrived" msgstr "angekommen" @@ -528,34 +551,36 @@ msgid "Only confirmed" msgstr "Nur bestätigte" #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:77 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:150 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:260 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:151 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:274 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:173 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:119 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:130 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:142 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:39 msgid "Nick" msgstr "Nick" #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:79 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:171 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:172 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:178 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:120 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:131 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:143 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:42 msgid "DECT" msgstr "DECT" #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:80 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:180 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:181 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:182 msgid "Jabber" msgstr "Jabber" #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:81 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:153 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:154 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:180 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:161 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:195 msgid "E-Mail" msgstr "E-Mail" @@ -574,6 +599,7 @@ msgstr "Gruppenrechte" #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:269 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:50 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:164 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:41 msgid "Name" msgstr "Name" @@ -586,7 +612,7 @@ msgstr "Privilegien" #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:35 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:127 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_shifts.php:228 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:129 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:131 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:62 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:106 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:160 @@ -598,7 +624,7 @@ msgstr "Privilegien" #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:55 #: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:32 #: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:32 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:177 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:211 msgid "Save" msgstr "Speichern" @@ -644,7 +670,7 @@ msgstr "Anzulegende Schichten" #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:80 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:88 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_import.php:96 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:142 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:176 msgid "Day" msgstr "Tag" @@ -778,9 +804,9 @@ msgid "Please enter a name." msgstr "Gib bitte einen Namen an." #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:82 -#, fuzzy, php-format +#, php-format msgid "Please enter needed angels for type %s." -msgstr "Bitte prüfe deine Eingabe für benötigte Engel des Typs %s." +msgstr "Bitte gib die Anzahl der benötigten Engel vom Typ %s an." #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:107 msgid "Room saved." @@ -859,71 +885,67 @@ msgstr "Übernehme benötigte Engel von den Raum-Einstellungen" msgid "The following angels are needed" msgstr "Die folgenden Engel werden benötigt" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:3 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:4 msgid "All Angels" msgstr "Engelliste" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:54 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:15 +msgid "Edit user" +msgstr "User bearbeiten" + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:56 msgid "Force active" msgstr "Aktiv erzwingen" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:290 -msgid "Groups" -msgstr "Gruppen" - -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:340 -msgid "Freeloads" -msgstr "Schwänzereien" - #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_credits.php:3 msgid "Credits" msgstr "Credits" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:3 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:262 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:4 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:276 msgid "Login" msgstr "Login" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:7 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:202 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:8 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:203 msgid "Register" msgstr "Registrieren" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:11 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:12 msgid "Logout" msgstr "Logout" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:50 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:51 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:44 #, php-format msgid "Your nick "%s" already exists." msgstr "Der Nick "%s" existiert schon." -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:54 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:55 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:48 #, php-format msgid "Your nick "%s" is too short (min. 2 characters)." msgstr "Der Nick "%s" ist zu kurz (Mindestens 2 Zeichen)." -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:74 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:75 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:68 msgid "Please check your jabber account information." msgstr "Bitte überprüfe deine Jabber Account Eingabe." -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:83 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:84 msgid "Please select your shirt size." msgstr "Bitte wähle Deine T-Shirt Größe." -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:94 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:95 #, php-format msgid "Your password is too short (please use at least %s characters)." msgstr "Dein Passwort ist zu kurz (Bitte mindestens %s Zeichen nutzen)." -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:135 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:136 msgid "Angel registration successful!" msgstr "Engel-Registrierung erfolgreich!" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:142 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:143 msgid "" "By completing this form you're registering as a Chaos-Angel. This script " "will create you an account in the angel task sheduler." @@ -931,33 +953,33 @@ msgstr "" "Mit diesem Formular registrierst Du Dich als Engel. Du bekommst ein Konto in " "der Engel-Aufgabenverwaltung." -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:156 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:157 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:184 msgid "Shirt size" msgstr "T-Shirt Größe" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:159 -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:261 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:175 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:160 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:275 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:209 msgid "Password" msgstr "Passwort" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:162 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:176 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:163 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:210 msgid "Confirm password" msgstr "Passwort wiederholen" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:165 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:166 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:185 msgid "What do you want to do?" msgstr "Was möchtest Du machen?" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:165 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:166 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:185 msgid "Description of job types" msgstr "Beschreibung der Aufgaben" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:166 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:167 msgid "" "Restricted angel types need will be confirmed later by an archangel. You can " "change your selection in the options section." @@ -965,49 +987,49 @@ msgstr "" "Beschränkte Engeltypen müssen später von einem Erzengel freigeschaltet " "werden. Du kannst Deine Auswahl später in den Einstellungen ändern." -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:174 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:175 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:179 msgid "Mobile" msgstr "Handy" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:177 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:178 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:177 msgid "Phone" msgstr "Telefon" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:183 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:184 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:175 msgid "First name" msgstr "Vorname" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:186 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:187 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:174 msgid "Last name" msgstr "Nachname" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:191 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:192 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:176 msgid "Age" msgstr "Alter" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:194 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:195 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:183 msgid "Hometown" msgstr "Wohnort" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:197 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:198 msgid "Entry required!" msgstr "Pflichtfeld!" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:234 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:235 msgid "Your password is incorrect. Please try it again." msgstr "Dein Passwort stimmt nicht. Bitte probiere es nochmal." -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:238 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:239 msgid "Please enter a password." msgstr "Gib bitte ein Passwort ein." -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:242 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:243 msgid "" "No user was found with that Nickname. Please try again. If you are still " "having problems, ask an Dispatcher." @@ -1015,27 +1037,31 @@ msgstr "" "Es wurde kein Engel mit diesem Namen gefunden. Probiere es bitte noch " "einmal. Wenn das Problem weiterhin besteht, frage einen Dispatcher." -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:246 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:247 msgid "Please enter a nickname." msgstr "Gib bitte einen Nick an." -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:264 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:259 +msgid "Please sign up, if you want to help us!" +msgstr "Bitte registriere Dich, wenn Du helfen möchtest!" + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:266 +msgid "Registration is disabled." +msgstr "Registrierung ist abgeschaltet." + +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:278 msgid "I forgot my password" msgstr "Passwort vergessen" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:266 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:280 msgid "Please note: You have to activate cookies!" msgstr "Hinweis: Cookies müssen aktiviert sein!" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:271 -msgid "Please sign up, if you want to help us!" -msgstr "Bitte registriere Dich, wenn Du helfen möchtest!" - -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:275 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:286 msgid "What can I do?" msgstr "Was kann ich machen?" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:276 +#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:287 msgid "Please read about the jobs you can do to help us." msgstr "" "Bitte informiere Dich über die Tätigkeiten bei denen Du uns helfen kannst." @@ -1268,10 +1294,6 @@ msgstr "Hier kannst Du Deine Sprache auswählen:" msgid "Language:" msgstr "Sprache:" -#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:3 -msgid "All Shifts" -msgstr "Alle Schichten" - #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:25 msgid "Shift entry deleted." msgstr "Schicht-Eintrag gelöscht." @@ -1355,7 +1377,7 @@ msgid "You are subscribed. Thank you!" msgstr "Du bist eingetragen. Danke!" #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:269 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:119 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:153 msgid "Freeloader" msgstr "Schwänzer" @@ -1400,7 +1422,7 @@ msgid "Add more angels" msgstr "Neue Engel hinzufügen" #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:724 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:143 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:177 msgid "Time" msgstr "Zeit" @@ -1589,8 +1611,8 @@ msgid "Your Question:" msgstr "Deine Frage:" #: /Users/msquare/workspace/projects/engelsystem/includes/view/ShiftEntry_view.php:17 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:81 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:83 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:115 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:117 msgid "Freeloaded" msgstr "Geschwänzt" @@ -1631,83 +1653,102 @@ msgid "Please select..." msgstr "Bitte auswählen..." #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:28 +msgid "m/d/Y h:i a" +msgstr "d.m.Y H:i" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:37 +msgid "New user" +msgstr "Neuer User" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:40 +msgid "Prename" +msgstr "Vorname" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:43 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:155 +msgid "Arrived" +msgstr "Angekommen" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:45 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:156 +msgid "Active" +msgstr "Aktiv" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:47 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:157 +msgid "T-Shirt" +msgstr "T-Shirt" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:49 +msgid "Last login" +msgstr "Letzter Login" + +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:62 msgid "Free" msgstr "Frei" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:32 -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:34 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:66 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:68 #, php-format msgid "Next shift %c" msgstr "Nächste Schicht %c" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:39 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:73 #, php-format msgid "Shift starts %c" msgstr "Schicht startet %c" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:41 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:75 #, fuzzy, php-format msgid "Shift ends %c" msgstr "Schicht endet %c" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:90 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:124 msgid "sign off" msgstr "abmelden" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:100 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:134 msgid "Sum:" msgstr "Summe:" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:118 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:152 msgid "User state" msgstr "Engel Zustand" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:121 -msgid "Arrived" -msgstr "Angekommen" - -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:121 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:155 msgid "Not arrived" msgstr "Nicht angekommen" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:122 -msgid "Active" -msgstr "Aktiv" - -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:123 -msgid "T-Shirt" -msgstr "T-Shirt" - -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:130 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:164 msgid "Rights" msgstr "Rechte" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:137 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:171 #, fuzzy msgid "iCal Export" msgstr "iCal Export" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:138 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:172 msgid "JSON Export" msgstr "JSON Export" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:144 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:178 msgid "Location" msgstr "Ort" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:145 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:179 msgid "Name & workmates" msgstr "Name & Kollegen" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:146 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:180 msgid "Comment" msgstr "Kommentar" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:147 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:181 msgid "Action" msgstr "Aktion" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:149 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:183 #, php-format msgid "" "Go to the shifts table to sign yourself up for some " @@ -1716,7 +1757,7 @@ msgstr "" "Gehe zur Schicht-Tabelle, um Dich für Schichten " "einzutragen." -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:159 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:193 msgid "" "We will send you an e-mail with a password recovery link. Please use the " "email address you used for registration." @@ -1725,11 +1766,11 @@ msgstr "" "zurücksetzen kannst. Bitte benutze die Mailadresse, die du bei der Anmeldung " "verwendet hast." -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:162 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:196 msgid "Recover" msgstr "Wiederherstellen" -#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:173 +#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:207 msgid "Please enter a new password." msgstr "Gib bitte ein neues Passwort ein." @@ -1776,7 +1817,7 @@ msgstr "Möchtest Du wirklich %s zu %s hinzufügen?" msgid "save" msgstr "Speichern" -#: /Users/msquare/workspace/projects/engelsystem/public/index.php:97 +#: /Users/msquare/workspace/projects/engelsystem/public/index.php:98 #, php-format msgid "" "You freeloaded at least %s shifts. Shift signup is locked. Please go to " @@ -1785,7 +1826,7 @@ msgstr "" "Du hast mindestens %s Schichten geschwänzt. Schicht-Registrierung ist " "gesperrt. Bitte gehe zum Himmelsschreibtisch um wieder entsperrt zu werden." -#: /Users/msquare/workspace/projects/engelsystem/public/index.php:101 +#: /Users/msquare/workspace/projects/engelsystem/public/index.php:102 msgid "" "You are not marked as arrived. Please go to heaven's desk, get your angel " "badge and/or tell them that you arrived already." @@ -1793,11 +1834,11 @@ msgstr "" "Du bist nicht als angekommen markiert. Bitte gehe zur Himmelsverwaltung, " "hole Dein Badge ab und/oder erkläre ihnen, dass Du bereits angekommen bist." -#: /Users/msquare/workspace/projects/engelsystem/public/index.php:104 +#: /Users/msquare/workspace/projects/engelsystem/public/index.php:105 msgid "You need to specify a tshirt size in your settings!" msgstr "Bitte eine T-Shirt-Größe auswählen" -#: /Users/msquare/workspace/projects/engelsystem/public/index.php:107 +#: /Users/msquare/workspace/projects/engelsystem/public/index.php:108 msgid "" "You need to specify a DECT phone number in your settings! If you don't have " "a DECT phone, just enter \"-\"." @@ -1805,11 +1846,11 @@ msgstr "" "Bitte eine DECT-Telefonnummer in den Einstellungen eingeben. Wenn du noch " "keine Nummer hast, bitte einfach \"-\" angeben." -#: /Users/msquare/workspace/projects/engelsystem/public/index.php:230 +#: /Users/msquare/workspace/projects/engelsystem/public/index.php:231 msgid "No Access" msgstr "Kein Zugriff" -#: /Users/msquare/workspace/projects/engelsystem/public/index.php:231 +#: /Users/msquare/workspace/projects/engelsystem/public/index.php:232 msgid "" "You don't have permission to view this page. You probably have to sign in or " "register in order to gain access!" @@ -1817,6 +1858,9 @@ msgstr "" "Du hast keinen Zugriff auf diese Seite. Registriere Dich und logge Dich " "bitte ein, um Zugriff zu erhalten!" +#~ msgid "All Shifts" +#~ msgstr "Alle Schichten" + #~ msgid "Exports" #~ msgstr "Exporte"