diff options
| author | Jan-Philipp Litza <janphilipp@litza.de> | 2011-09-14 23:11:34 +0200 |
|---|---|---|
| committer | Jan-Philipp Litza <janphilipp@litza.de> | 2011-09-14 23:11:34 +0200 |
| commit | 2ad0124eb05bc87f0f1265ff7ba169c34de484e5 (patch) | |
| tree | f202f6345a85bf273dde0b6722a8be33ec0d45b5 | |
| parent | 01bd4e33de68d3ea85bfa670f9529b1154886187 (diff) | |
| parent | 95e9e7b14776e48983c23e02ef80198c5902d458 (diff) | |
Merge branch 'master' of https://vcs.wybt.net/engelsystem/git
| -rw-r--r-- | includes/pages/admin_news.php | 2 | ||||
| -rw-r--r-- | includes/pages/user_shifts.php | 12 | ||||
| -rw-r--r-- | templates/user_shifts.html | 8 |
3 files changed, 11 insertions, 11 deletions
diff --git a/includes/pages/admin_news.php b/includes/pages/admin_news.php index 2c6e1f45..c7194e7c 100644 --- a/includes/pages/admin_news.php +++ b/includes/pages/admin_news.php @@ -75,7 +75,7 @@ function admin_news() { if (count($news) > 0) { list ($news) = $news; - sql_query("DELETE FROM `news` WHERE `ID`=" . sql_escape($id) . " LIMIT 1"); + sql_query("DELETE FROM `News` WHERE `ID`=" . sql_escape($id) . " LIMIT 1"); header("Location: " . page_link_to("news")); } else return error("No News found."); diff --git a/includes/pages/user_shifts.php b/includes/pages/user_shifts.php index 2e7b95d2..c2648a78 100644 --- a/includes/pages/user_shifts.php +++ b/includes/pages/user_shifts.php @@ -8,7 +8,7 @@ function user_shifts() { header("Location: " . page_link_to('user_shifts')); sql_query("DELETE FROM `ShiftEntry` WHERE `id`=" . sql_escape($entry_id) . " LIMIT 1"); - return success("The shift entry has been deleted."); + return success("Der Schicht-Eintrag wurde gelöscht.."); } // Schicht komplett löschen (nur für admins/user mit user_shifts_admin privileg) elseif (isset ($_REQUEST['delete_shift']) && in_array('user_shifts_admin', $privileges)) { @@ -80,7 +80,7 @@ function user_shifts() { $comment = strip_request_item_nl('comment'); sql_query("INSERT INTO `ShiftEntry` SET `Comment`='" . sql_escape($comment) . "', `UID`=" . sql_escape($user_id) . ", `TID`=" . sql_escape($type_id) . ", `SID`=" . sql_escape($shift_id)); - return success("Now it's your shift. Thank you!") . '<a href="' . page_link_to('user_myshifts') . '">View my shifts »</a>'; + return success("Du bist eingetragen. Danke!") . '<a href="' . page_link_to('user_myshifts') . '">Meine Schichten »</a>'; } if (in_array('user_shifts_admin', $privileges)) { @@ -148,10 +148,10 @@ function user_shifts() { } if ($angeltype['count'] - count($entries) > 0) if (!$my_shift || in_array('user_shifts_admin', $privileges)) { - $entry_list[] = '<a href="' . page_link_to('user_shifts') . '&shift_id=' . $shift['SID'] . '&type_id=' . $angeltype['TID'] . '">' . ($angeltype['count'] - count($entries)) . ' angel' . ($angeltype['count'] - count($entries) != 1 ? 's' : '') . ' missing »</a>'; + $entry_list[] = '<a href="' . page_link_to('user_shifts') . '&shift_id=' . $shift['SID'] . '&type_id=' . $angeltype['TID'] . '">' . ($angeltype['count'] - count($entries)) . ' Helfer' . ($angeltype['count'] - count($entries) != 1 ? '' : '') . ' gebraucht »</a>'; $show_shift = true; } else - $entry_list[] = ($angeltype['count'] - count($entries)) . ' angel missing'; + $entry_list[] = ($angeltype['count'] - count($entries)) . ' Helfer gebraucht'; $shift_row .= '<b>' . $angeltype['Name'] . ':</b> '; $shift_row .= join(", ", $entry_list); @@ -191,9 +191,9 @@ function make_room_select($rooms, $id, $day) { $html[] = '<a href="' . page_link_to('user_shifts') . '&room_id=' . $room['RID'] . '&day=' . $day . '">' . $room['Name'] . '</a>'; } if ($id == 0) - $html[] = '<b>Next 15 free shifts</b>'; + $html[] = '<b>Nächste freie Schichten</b>'; else - $html[] = '<a href="' . page_link_to('user_shifts') . '&room_id=0">Next 15 free shifts</a>'; + $html[] = '<a href="' . page_link_to('user_shifts') . '&room_id=0">Nächste freie Schichten</a>'; return join(' | ', $html); } ?> diff --git a/templates/user_shifts.html b/templates/user_shifts.html index 8d4ed12a..85f38112 100644 --- a/templates/user_shifts.html +++ b/templates/user_shifts.html @@ -1,17 +1,17 @@ <p> - Select room: %room_select% + Raum: %room_select% </p> <p> - Select day: %day_select% + Tag: %day_select% </p> <table> <thead> <tr> <th> - Timeslot + Zeit </th> <th> - Entries + Einträge </th> </tr> </thead> |