iger
/
engelsystem
9
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

add planned date of departure

This commit is contained in:
Philip Häusler 2015-08-15 14:54:25 +02:00
parent bc84710e9d
commit cac86ef509
6 changed files with 151 additions and 81 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
db/update.sql
View File

@ -1,3 +1,6 @@
/* Introduce planned departure date */
ALTER TABLE `User` ADD `planned_departure_date` INT NULL, ADD INDEX ( `planned_departure_date` );
/* Allow longer angeltype names */ /* Allow longer angeltype names */
ALTER TABLE `AngelTypes` CHANGE `name` `name` VARCHAR( 50 ) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT ''; ALTER TABLE `AngelTypes` CHANGE `name` `name` VARCHAR( 50 ) CHARACTER SET utf8 COLLATE utf8_general_ci NOT NULL DEFAULT '';

51
includes/pages/admin_arrive.php
View File

@ -31,11 +31,12 @@ function admin_arrive() {
} }
$users = sql_select("SELECT * FROM `User` ORDER BY `Nick`"); $users = sql_select("SELECT * FROM `User` ORDER BY `Nick`");
$arrival_count_at_day = array(); $arrival_count_at_day = [];
$departure_count_at_day = [];
$table = ""; $table = "";
$users_matched = array(); $users_matched = [];
if ($search == "") if ($search == "")
$tokens = array(); $tokens = [];
else else
$tokens = explode(" ", $search); $tokens = explode(" ", $search);
foreach ($users as $usr) { foreach ($users as $usr) {
@ -52,6 +53,10 @@ function admin_arrive() {
} }
$usr['nick'] = User_Nick_render($usr); $usr['nick'] = User_Nick_render($usr);
if ($usr['planned_departure_date'] != null)
$usr['rendered_planned_departure_date'] = date('Y-m-d', $usr['planned_departure_date']);
else
$usr['rendered_planned_departure_date'] = '-';
$usr['rendered_planned_arrival_date'] = date('Y-m-d', $usr['planned_arrival_date']); $usr['rendered_planned_arrival_date'] = date('Y-m-d', $usr['planned_arrival_date']);
$usr['rendered_arrival_date'] = $usr['arrival_date'] > 0 ? date('Y-m-d', $usr['arrival_date']) : "-"; $usr['rendered_arrival_date'] = $usr['arrival_date'] > 0 ? date('Y-m-d', $usr['arrival_date']) : "-";
$usr['arrived'] = $usr['Gekommen'] == 1 ? _("yes") : ""; $usr['arrived'] = $usr['Gekommen'] == 1 ? _("yes") : "";
@ -60,24 +65,37 @@ function admin_arrive() {
$day = $usr['arrival_date'] > 0 ? date('Y-m-d', $usr['arrival_date']) : date('Y-m-d', $usr['planned_arrival_date']); $day = $usr['arrival_date'] > 0 ? date('Y-m-d', $usr['arrival_date']) : date('Y-m-d', $usr['planned_arrival_date']);
if (! isset($arrival_count_at_day[$day])) if (! isset($arrival_count_at_day[$day]))
$arrival_count_at_day[$day] = 0; $arrival_count_at_day[$day] = 0;
if (! isset($departure_count_at_day[$day]))
$departure_count_at_day[$day] = 0;
$arrival_count_at_day[$day] ++; $arrival_count_at_day[$day] ++;
if ($usr['planned_departure_date'] != null) {
$day = date('Y-m-d', $usr['planned_departure_date']);
if (! isset($arrival_count_at_day[$day]))
$arrival_count_at_day[$day] = 0;
if (! isset($departure_count_at_day[$day]))
$departure_count_at_day[$day] = 0;
$departure_count_at_day[$day] ++;
}
$users_matched[] = $usr; $users_matched[] = $usr;
} }
ksort($arrival_count_at_day); ksort($arrival_count_at_day);
ksort($departure_count_at_day);
$arrival_count = array(); $arrival_count = [];
$arrival_sums = array(); $arrival_sums = [];
$arrival_sum = 0; $arrival_sum = 0;
foreach ($arrival_count_at_day as $day => $count) { foreach ($arrival_count_at_day as $day => $count) {
$arrival_sum += $count; $arrival_sum += $count - $departure_count_at_day[$day];
$arrival_sums[$day] = $arrival_sum; $arrival_sums[$day] = $arrival_sum;
$arrival_count[] = array( $arrival_count[] = [
'day' => $day, 'day' => $day,
'count' => $count, 'count' => $count,
'sum' => $arrival_sum 'sum' => $arrival_sum,
); 'departure' => isset($departure_count_at_day[$day]) ? $departure_count_at_day[$day] : 0
];
} }
return page_with_title(admin_arrive_title(), array( return page_with_title(admin_arrive_title(), array(
@ -88,9 +106,10 @@ function admin_arrive() {
)), )),
table(array( table(array(
'nick' => _("Nickname"), 'nick' => _("Nickname"),
'rendered_planned_arrival_date' => _("Planned date"), 'rendered_planned_arrival_date' => _("Planned arrival"),
'arrived' => _("Arrived?"), 'arrived' => _("Arrived?"),
'rendered_arrival_date' => _("Arrival date"), 'rendered_arrival_date' => _("Arrival date"),
'rendered_planned_departure_date' => _("Planned departure"),
'actions' => "" 'actions' => ""
), $users_matched), ), $users_matched),
heading(_("Arrival statistics"), 2), heading(_("Arrival statistics"), 2),
@ -103,13 +122,18 @@ function admin_arrive() {
'datasets' => array( 'datasets' => array(
array( array(
'label' => _("arrived"), 'label' => _("arrived"),
'fillColor' => "#444", 'fillColor' => "#090",
'data' => array_values($arrival_count_at_day) 'data' => array_values($arrival_count_at_day)
), ),
array( array(
'label' => _("arrived sum"), 'label' => _("arrived sum"),
'fillColor' => "#888", 'fillColor' => "#888",
'data' => array_values($arrival_sums) 'data' => array_values($arrival_sums)
),
array(
'label' => _("planned departure"),
'fillColor' => "#900",
'data' => array_values($departure_count_at_day)
) )
) )
)) . '); )) . ');
@ -118,7 +142,8 @@ function admin_arrive() {
table(array( table(array(
'day' => _("Date"), 'day' => _("Date"),
'count' => _("arrived"), 'count' => _("arrived"),
'sum' => _("arrived sum") 'sum' => _("arrived sum"),
'departure' => _("planned departure")
), $arrival_count) ), $arrival_count)
)); ));
} }

17
includes/pages/user_settings.php
View File

@ -25,6 +25,7 @@ function user_settings() {
$selected_theme = $user['color']; $selected_theme = $user['color'];
$selected_language = $user['Sprache']; $selected_language = $user['Sprache'];
$planned_arrival_date = $user['planned_arrival_date']; $planned_arrival_date = $user['planned_arrival_date'];
$planned_departure_date = $user['planned_departure_date'];
if (isset($_REQUEST['submit'])) { if (isset($_REQUEST['submit'])) {
$ok = true; $ok = true;
@ -63,7 +64,17 @@ function user_settings() {
$msg .= error(_("Please enter your planned date of arrival."), true); $msg .= error(_("Please enter your planned date of arrival."), true);
} }
// Trivia if (isset($_REQUEST['planned_departure_date']) && $_REQUEST['planned_departure_date'] != '') {
if (DateTime::createFromFormat("Y-m-d", trim($_REQUEST['planned_departure_date']))) {
$planned_departure_date = DateTime::createFromFormat("Y-m-d", trim($_REQUEST['planned_departure_date']))->getTimestamp();
} else {
$ok = false;
$msg .= error(_("Please enter your planned date of departure."), true);
}
} else
$planned_departure_date = null;
// Trivia
if (isset($_REQUEST['lastname'])) if (isset($_REQUEST['lastname']))
$lastname = strip_request_item('lastname'); $lastname = strip_request_item('lastname');
if (isset($_REQUEST['prename'])) if (isset($_REQUEST['prename']))
@ -94,7 +105,8 @@ function user_settings() {
`jabber`='" . sql_escape($jabber) . "', `jabber`='" . sql_escape($jabber) . "',
`Size`='" . sql_escape($tshirt_size) . "', `Size`='" . sql_escape($tshirt_size) . "',
`Hometown`='" . sql_escape($hometown) . "', `Hometown`='" . sql_escape($hometown) . "',
`planned_arrival_date`='" . sql_escape($planned_arrival_date) . "' `planned_arrival_date`='" . sql_escape($planned_arrival_date) . "',
`planned_departure_date`=" . sql_null($planned_departure_date) . "
WHERE `UID`='" . sql_escape($user['UID']) . "'"); WHERE `UID`='" . sql_escape($user['UID']) . "'");
success(_("Settings saved.")); success(_("Settings saved."));
@ -157,6 +169,7 @@ function user_settings() {
form_text('lastname', _("Last name"), $lastname), form_text('lastname', _("Last name"), $lastname),
form_text('prename', _("First name"), $prename), form_text('prename', _("First name"), $prename),
form_date('planned_arrival_date', _("Planned date of arrival") . ' ' . entry_required(), $planned_arrival_date, time()), form_date('planned_arrival_date', _("Planned date of arrival") . ' ' . entry_required(), $planned_arrival_date, time()),
form_date('planned_departure_date', _("Planned date of departure"), $planned_departure_date, time()),
form_text('age', _("Age"), $age), form_text('age', _("Age"), $age),
form_text('tel', _("Phone"), $tel), form_text('tel', _("Phone"), $tel),
form_text('dect', _("DECT"), $dect), form_text('dect', _("DECT"), $dect),

3
includes/sys_menu.php
View File

@ -45,6 +45,9 @@ function header_toolbar() {
if ($unconfirmed_hint != '') if ($unconfirmed_hint != '')
$hints[] = $unconfirmed_hint; $hints[] = $unconfirmed_hint;
if (! isset($user['planned_departure_date']) || $user['planned_departure_date'] == null)
$hints[] = info(_("Please enter your planned date of departure on your settings page to give us a feeling for teardown capacities."), true);
if (User_is_freeloader($user)) { if (User_is_freeloader($user)) {
$hints[] = error(sprintf(_("You freeloaded at least %s shifts. Shift signup is locked. Please go to heavens desk to be unlocked again."), $max_freeloadable_shifts), true); $hints[] = error(sprintf(_("You freeloaded at least %s shifts. Shift signup is locked. Please go to heavens desk to be unlocked again."), $max_freeloadable_shifts), true);
$hint_class = 'danger'; $hint_class = 'danger';

BIN
locale/de_DE.UTF-8/LC_MESSAGES/default.mo
View File

Binary file not shown.

158
locale/de_DE.UTF-8/LC_MESSAGES/default.po
View File

@ -1,8 +1,8 @@
msgid "" msgid ""
msgstr "" msgstr ""
"Project-Id-Version: Engelsystem 2.0\n" "Project-Id-Version: Engelsystem 2.0\n"
"POT-Creation-Date: 2015-08-14 14:16+0100\n" "POT-Creation-Date: 2015-08-15 14:53+0100\n"
"PO-Revision-Date: 2015-08-14 14:16+0100\n" "PO-Revision-Date: 2015-08-15 14:54+0100\n"
"Last-Translator: msquare <msquare@notrademark.de>\n" "Last-Translator: msquare <msquare@notrademark.de>\n"
"Language-Team: \n" "Language-Team: \n"
"Language: de_DE\n" "Language: de_DE\n"
@ -18,6 +18,14 @@ msgstr ""
"X-Poedit-SearchPath-1: .\n" "X-Poedit-SearchPath-1: .\n"
#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:49 #: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:49
msgid ""
"Please enter your planned date of departure on your settings page to give us "
"a feeling for teardown capacities."
msgstr ""
"Bitte gib Dein geplantes Abreisedatum an, damit wir ein Gefühl für die Abbau-"
"Planung bekommen."
#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:52
#, php-format #, php-format
msgid "" msgid ""
"You freeloaded at least %s shifts. Shift signup is locked. Please go to " "You freeloaded at least %s shifts. Shift signup is locked. Please go to "
@ -26,7 +34,7 @@ msgstr ""
"Du hast mindestens %s Schichten geschwänzt. Schicht-Registrierung ist " "Du hast mindestens %s Schichten geschwänzt. Schicht-Registrierung ist "
"gesperrt. Bitte gehe zum Himmelsschreibtisch um wieder entsperrt zu werden." "gesperrt. Bitte gehe zum Himmelsschreibtisch um wieder entsperrt zu werden."
#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:56 #: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:59
msgid "" msgid ""
"You are not marked as arrived. Please go to heaven's desk, get your angel " "You are not marked as arrived. Please go to heaven's desk, get your angel "
"badge and/or tell them that you arrived already." "badge and/or tell them that you arrived already."
@ -34,11 +42,11 @@ msgstr ""
"Du bist nicht als angekommen markiert. Bitte gehe zur Himmelsverwaltung, " "Du bist nicht als angekommen markiert. Bitte gehe zur Himmelsverwaltung, "
"hole Dein Badge ab und/oder erkläre ihnen, dass Du bereits angekommen bist." "hole Dein Badge ab und/oder erkläre ihnen, dass Du bereits angekommen bist."
#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:62 #: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:65
msgid "You need to specify a tshirt size in your settings!" msgid "You need to specify a tshirt size in your settings!"
msgstr "Bitte eine T-Shirt-Größe auswählen" msgstr "Bitte eine T-Shirt-Größe auswählen"
#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:68 #: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:71
msgid "" msgid ""
"You need to specify a DECT phone number in your settings! If you don't have " "You need to specify a DECT phone number in your settings! If you don't have "
"a DECT phone, just enter \"-\"." "a DECT phone, just enter \"-\"."
@ -46,7 +54,7 @@ msgstr ""
"Bitte eine DECT-Telefonnummer in den Einstellungen eingeben. Wenn du noch " "Bitte eine DECT-Telefonnummer in den Einstellungen eingeben. Wenn du noch "
"keine Nummer hast, bitte einfach \"-\" angeben." "keine Nummer hast, bitte einfach \"-\" angeben."
#: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:129 #: /Users/msquare/workspace/projects/engelsystem/includes/sys_menu.php:132
msgid "Admin" msgid "Admin"
msgstr "Admin" msgstr "Admin"
@ -55,6 +63,7 @@ msgid "No data found."
msgstr "Nichts gefunden." msgstr "Nichts gefunden."
#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:7 #: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:7
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:821
#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:56 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:56
#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:72 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:72
#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:196 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:196
@ -357,12 +366,12 @@ msgstr "Der Token ist nicht in Ordnung."
#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:156 #: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:156
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:93 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:93
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:111 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:123
msgid "Your passwords don't match." msgid "Your passwords don't match."
msgstr "Deine Passwörter stimmen nicht überein." msgstr "Deine Passwörter stimmen nicht überein."
#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:160 #: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:160
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:109 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:121
msgid "Your password is to short (please use at least 6 characters)." msgid "Your password is to short (please use at least 6 characters)."
msgstr "Dein Passwort ist zu kurz (Bitte mindestens 6 Zeichen nutzen)." msgstr "Dein Passwort ist zu kurz (Bitte mindestens 6 Zeichen nutzen)."
@ -371,20 +380,20 @@ msgid "Password could not be updated."
msgstr "Passwort kann nicht neu gesetzt werden." msgstr "Passwort kann nicht neu gesetzt werden."
#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:168 #: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:168
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:113 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:125
msgid "Password saved." msgid "Password saved."
msgstr "Passwort gespeichert." msgstr "Passwort gespeichert."
#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:186 #: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:186
#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:190 #: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:190
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:63 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:63
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:36 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:37
msgid "E-mail address is not correct." msgid "E-mail address is not correct."
msgstr "Die E-Mail Adresse ist nicht in Ordnung." msgstr "Die E-Mail Adresse ist nicht in Ordnung."
#: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:194 #: /Users/msquare/workspace/projects/engelsystem/includes/controller/users_controller.php:194
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:67 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:67
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:40 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:41
msgid "Please enter your e-mail." msgid "Please enter your e-mail."
msgstr "Bitte gib Deine E-Mail-Adresse ein." msgstr "Bitte gib Deine E-Mail-Adresse ein."
@ -572,8 +581,8 @@ msgid "Show all shifts"
msgstr "Alle Schichten anzeigen" msgstr "Alle Schichten anzeigen"
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:169 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:169
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:86 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:104
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:87 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:105
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:71 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:71
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:80 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:80
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_log.php:25 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_log.php:25
@ -592,7 +601,7 @@ msgid "Preview"
msgstr "Vorschau" msgstr "Vorschau"
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:177 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_active.php:177
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:90 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:108
msgid "Nickname" msgid "Nickname"
msgstr "Nick" msgstr "Nick"
@ -650,7 +659,7 @@ msgstr "Zurückgesetzt. Engel ist nicht angekommen."
msgid "Angel has been marked as arrived." msgid "Angel has been marked as arrived."
msgstr "Engel wurde als angekommen markiert." msgstr "Engel wurde als angekommen markiert."
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:57 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:62
#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:8 #: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:8
#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:19 #: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:19
#: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:30 #: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:30
@ -659,39 +668,49 @@ msgstr "Engel wurde als angekommen markiert."
msgid "yes" msgid "yes"
msgstr "Ja" msgstr "Ja"
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:58 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:63
msgid "reset" msgid "reset"
msgstr "zurücksetzen" msgstr "zurücksetzen"
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:58 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:63
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:105 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:124
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:120 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:144
#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:208 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:208
msgid "arrived" msgid "arrived"
msgstr "angekommen" msgstr "angekommen"
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:91 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:109
msgid "Planned date" #, fuzzy
msgstr "Geplant am" msgid "Planned arrival"
msgstr "Geplanter Ankunftstag"
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:92 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:110
msgid "Arrived?" msgid "Arrived?"
msgstr "Angekommen?" msgstr "Angekommen?"
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:93 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:111
msgid "Arrival date" msgid "Arrival date"
msgstr "Ankunftsdatum" msgstr "Ankunftsdatum"
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:96 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:112
msgid "Planned departure"
msgstr "Geplante Abreise"
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:115
msgid "Arrival statistics" msgid "Arrival statistics"
msgstr "Ankunfts-Statistik" msgstr "Ankunfts-Statistik"
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:110 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:129
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:121 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:145
msgid "arrived sum" msgid "arrived sum"
msgstr "Summe angekommen" msgstr "Summe angekommen"
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:119 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:134
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:146
msgid "planned departure"
msgstr "Geplante Abreise"
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:143
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:27 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_news.php:27
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:71 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:71
msgid "Date" msgid "Date"
@ -714,7 +733,7 @@ msgstr "Nur bestätigte"
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:85 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:85
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:180 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:180
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:311 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:311
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:156 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:168
#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:131 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:131
#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:157 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:157
#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:169 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:169
@ -724,7 +743,7 @@ msgstr "Nick"
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:87 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:87
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:209 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:209
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:162 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:175
#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:132 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:132
#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:158 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:158
#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:170 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:170
@ -734,13 +753,13 @@ msgstr "DECT"
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:88 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:88
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:218 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:218
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:166 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:179
msgid "Jabber" msgid "Jabber"
msgstr "Jabber" msgstr "Jabber"
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:89 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_free.php:89
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:183 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:183
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:164 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:177
#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:239 #: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:239
msgid "E-Mail" msgid "E-Mail"
msgstr "E-Mail" msgstr "E-Mail"
@ -774,10 +793,10 @@ msgstr "Privilegien"
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_messages.php:62 #: /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:106
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:160 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_news.php:160
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:170 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:183
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:179 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:192
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:184 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:197
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:189 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:202
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:191 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:191
#: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:65 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:65
#: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:32 #: /Users/msquare/workspace/projects/engelsystem/includes/view/Questions_view.php:32
@ -1160,7 +1179,7 @@ msgstr "Benutzer existiert nicht."
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:45 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:45
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:184 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:184
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:165 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:178
msgid "Please send me an email if my shifts change" msgid "Please send me an email if my shifts change"
msgstr "Informiere mich per E-Mail über Änderungen an meinen Schichten" msgstr "Informiere mich per E-Mail über Änderungen an meinen Schichten"
@ -1208,7 +1227,7 @@ msgid "Your nick &quot;%s&quot; is too short (min. 2 characters)."
msgstr "Der Nick &quot;%s&quot; ist zu kurz (Mindestens 2 Zeichen)." msgstr "Der Nick &quot;%s&quot; ist zu kurz (Mindestens 2 Zeichen)."
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:77 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:77
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:49 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:50
msgid "Please check your jabber account information." msgid "Please check your jabber account information."
msgstr "Bitte überprüfe deine Jabber Account Eingabe." msgstr "Bitte überprüfe deine Jabber Account Eingabe."
@ -1222,7 +1241,7 @@ msgid "Your password is too short (please use at least %s characters)."
msgstr "Dein Passwort ist zu kurz (Bitte mindestens %s Zeichen nutzen)." msgstr "Dein Passwort ist zu kurz (Bitte mindestens %s Zeichen nutzen)."
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:104 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:104
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:63 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:64
msgid "Please enter your planned date of arrival." msgid "Please enter your planned date of arrival."
msgstr "Bitte gib Dein geplantes Ankunftsdatum an." msgstr "Bitte gib Dein geplantes Ankunftsdatum an."
@ -1239,12 +1258,12 @@ msgstr ""
"der Engel-Aufgabenverwaltung." "der Engel-Aufgabenverwaltung."
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:189 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:189
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:159 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:171
msgid "Planned date of arrival" msgid "Planned date of arrival"
msgstr "Geplanter Ankunftstag" msgstr "Geplanter Ankunftstag"
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:192 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:192
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:168 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:181
msgid "Shirt size" msgid "Shirt size"
msgstr "T-Shirt Größe" msgstr "T-Shirt Größe"
@ -1276,37 +1295,37 @@ msgstr ""
"werden. Du kannst Deine Auswahl später in den Einstellungen ändern." "werden. Du kannst Deine Auswahl später in den Einstellungen ändern."
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:212 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:212
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:163 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:176
msgid "Mobile" msgid "Mobile"
msgstr "Handy" msgstr "Handy"
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:215 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:215
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:161 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:174
msgid "Phone" msgid "Phone"
msgstr "Telefon" msgstr "Telefon"
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:221 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:221
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:158 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:170
msgid "First name" msgid "First name"
msgstr "Vorname" msgstr "Vorname"
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:224 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:224
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:157 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:169
msgid "Last name" msgid "Last name"
msgstr "Nachname" msgstr "Nachname"
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:229 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:229
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:160 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:173
msgid "Age" msgid "Age"
msgstr "Alter" msgstr "Alter"
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:232 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:232
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:167 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:180
msgid "Hometown" msgid "Hometown"
msgstr "Wohnort" msgstr "Wohnort"
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:235 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/guest_login.php:235
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:155 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:167
msgid "Entry required!" msgid "Entry required!"
msgstr "Pflichtfeld!" msgstr "Pflichtfeld!"
@ -1520,59 +1539,67 @@ msgstr "Keine Frage gefunden."
msgid "Settings" msgid "Settings"
msgstr "Einstellungen" msgstr "Einstellungen"
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:100 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:72
msgid "Please enter your planned date of departure."
msgstr "Bitte gib Dein geplantes Abreisedatum an."
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:112
msgid "Settings saved." msgid "Settings saved."
msgstr "Einstellungen gespeichert." msgstr "Einstellungen gespeichert."
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:107 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:119
msgid "-> not OK. Please try again." msgid "-> not OK. Please try again."
msgstr "-> Nicht OK. Bitte erneut versuchen." msgstr "-> Nicht OK. Bitte erneut versuchen."
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:115 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:127
msgid "Failed setting password." msgid "Failed setting password."
msgstr "Konnte Passwort nicht speichern." msgstr "Konnte Passwort nicht speichern."
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:128 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:140
msgid "Theme changed." msgid "Theme changed."
msgstr "Aussehen geändert." msgstr "Aussehen geändert."
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:154 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:166
msgid "Here you can change your user details." msgid "Here you can change your user details."
msgstr "Hier kannst Du Deine Details ändern." msgstr "Hier kannst Du Deine Details ändern."
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:169 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:172
msgid "Planned date of departure"
msgstr "Geplanter Abreisetag"
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:182
msgid "Please visit the angeltypes page to manage your angeltypes." msgid "Please visit the angeltypes page to manage your angeltypes."
msgstr "Bitte benutze die Engeltypen-Seite um deine Engeltypen zu verwalten." msgstr "Bitte benutze die Engeltypen-Seite um deine Engeltypen zu verwalten."
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:175 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:188
msgid "Here you can change your password." msgid "Here you can change your password."
msgstr "Hier kannst Du Dein Passwort ändern." msgstr "Hier kannst Du Dein Passwort ändern."
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:176 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:189
msgid "Old password:" msgid "Old password:"
msgstr "Altes Passwort:" msgstr "Altes Passwort:"
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:177 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:190
msgid "New password:" msgid "New password:"
msgstr "Neues Passwort:" msgstr "Neues Passwort:"
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:178 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:191
msgid "Password confirmation:" msgid "Password confirmation:"
msgstr "Passwort wiederholen:" msgstr "Passwort wiederholen:"
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:182 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:195
msgid "Here you can choose your color settings:" msgid "Here you can choose your color settings:"
msgstr "Hier kannst Du das Aussehen auswählen:" msgstr "Hier kannst Du das Aussehen auswählen:"
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:183 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:196
msgid "Color settings:" msgid "Color settings:"
msgstr "Aussehen:" msgstr "Aussehen:"
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:187 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:200
msgid "Here you can choose your language:" msgid "Here you can choose your language:"
msgstr "Hier kannst Du Deine Sprache auswählen:" msgstr "Hier kannst Du Deine Sprache auswählen:"
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:188 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_settings.php:201
msgid "Language:" msgid "Language:"
msgstr "Sprache:" msgstr "Sprache:"
@ -1717,10 +1744,6 @@ msgstr "Zeit"
msgid "Entries" msgid "Entries"
msgstr "Einträge" msgstr "Einträge"
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:821
msgid "Tasks"
msgstr "Aufgaben"
#: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:822 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:822
msgid "Occupancy" msgid "Occupancy"
msgstr "Belegung" msgstr "Belegung"
@ -2201,6 +2224,9 @@ msgstr ""
"Du hast keinen Zugriff auf diese Seite. Registriere Dich und logge Dich " "Du hast keinen Zugriff auf diese Seite. Registriere Dich und logge Dich "
"bitte ein, um Zugriff zu erhalten!" "bitte ein, um Zugriff zu erhalten!"
#~ msgid "Tasks"
#~ msgstr "Aufgaben"
#~ msgid "Count" #~ msgid "Count"
#~ msgstr "Anzahl" #~ msgstr "Anzahl"