From abb6d8bfd8380032d1e8d1c8d3b03ce02293c730 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philip=20H=C3=A4usler?= <msquare@notrademark.de>
Date: Sun, 24 Aug 2014 16:09:56 +0200
Subject: [PATCH 1/2] move moment js to vendor

---
 public/{js => vendor}/moment-with-locales.min.js | 0
 templates/layout.html                            | 2 +-
 2 files changed, 1 insertion(+), 1 deletion(-)
 rename public/{js => vendor}/moment-with-locales.min.js (100%)

diff --git a/public/js/moment-with-locales.min.js b/public/vendor/moment-with-locales.min.js
similarity index 100%
rename from public/js/moment-with-locales.min.js
rename to public/vendor/moment-with-locales.min.js
diff --git a/templates/layout.html b/templates/layout.html
index 7b1aa541..eaef0925 100644
--- a/templates/layout.html
+++ b/templates/layout.html
@@ -38,7 +38,7 @@
   <script type="text/javascript" src="vendor/jquery-2.1.1.min.js"></script>
   <script type="text/javascript" src="vendor/bootstrap-3.2.0/js/bootstrap.min.js"></script>
   <script type="text/javascript" src="js/forms.js"></script>
-  <script type="text/javascript" src="js/moment-with-locales.min.js"></script>
+  <script type="text/javascript" src="vendor/moment-with-locales.min.js"></script>
   <script type="text/javascript" src="js/moment-countdown.js"></script>
   <script type="text/javascript">
 			$(function() {

From 3da1748e841a24e4e462f5a8212362270d74cf0b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Philip=20H=C3=A4usler?= <msquare@notrademark.de>
Date: Sun, 24 Aug 2014 16:22:43 +0200
Subject: [PATCH 2/2] correct shift state strings

---
 includes/view/User_view.php               |  18 ++--
 locale/de_DE.UTF-8/LC_MESSAGES/default.mo | Bin 27356 -> 27469 bytes
 locale/de_DE.UTF-8/LC_MESSAGES/default.po | 125 ++++++++++++----------
 3 files changed, 77 insertions(+), 66 deletions(-)

diff --git a/includes/view/User_view.php b/includes/view/User_view.php
index 734e266e..8077d0af 100644
--- a/includes/view/User_view.php
+++ b/includes/view/User_view.php
@@ -29,16 +29,16 @@ function User_shift_state_render($user) {
   
   if ($upcoming_shifts[0]['start'] > time())
     if ($upcoming_shifts[0]['start'] - time() > 3600)
-      return '<span class="text-success moment-countdown" data-timestamp="' . $upcoming_shifts[0]['start'] . '">' . _("Next shift in %c") . '</span>';
+      return '<span class="text-success moment-countdown" data-timestamp="' . $upcoming_shifts[0]['start'] . '">' . _("Next shift %c") . '</span>';
     else
-      return '<span class="text-warning moment-countdown" data-timestamp="' . $upcoming_shifts[0]['start'] . '">' . _("Next shift in %c") . '</span>';
+      return '<span class="text-warning moment-countdown" data-timestamp="' . $upcoming_shifts[0]['start'] . '">' . _("Next shift %c") . '</span>';
   
   $halfway = ($upcoming_shifts[0]['start'] + $upcoming_shifts[0]['end']) / 2;
   
   if (time() < $halfway)
-    return '<span class="text-danger moment-countdown" data-timestamp="' . $upcoming_shifts[0]['start'] . '">' . _("Shift startet %c ago") . '</span>';
+    return '<span class="text-danger moment-countdown" data-timestamp="' . $upcoming_shifts[0]['start'] . '">' . _("Shift start %c") . '</span>';
   else
-    return '<span class="text-danger moment-countdown" data-timestamp="' . $upcoming_shifts[0]['end'] . '">' . _("Shift ends in %c") . '</span>';
+    return '<span class="text-danger moment-countdown" data-timestamp="' . $upcoming_shifts[0]['end'] . '">' . _("Shift end %c") . '</span>';
 }
 
 function User_view($user_source, $admin_user_privilege, $freeloader, $user_angeltypes, $user_groups, $shifts, $its_me) {
@@ -131,10 +131,12 @@ function User_view($user_source, $admin_user_privilege, $freeloader, $user_angel
               User_groups_render($user_groups) 
           )) 
       )),
-      $admin_user_privilege ? buttons(array(
-          button(page_link_to('admin_user') . '&id=' . $user_source['UID'], '<span class="glyphicon glyphicon-edit"></span> ' . _("edit")),
-          ! $user_source['Gekommen'] ? button(page_link_to('admin_arrive') . '&arrived=' . $user_source['UID'], _("arrived")) : '' 
-      )) : '',
+      buttons(array(
+          $admin_user_privilege ? button(page_link_to('admin_user') . '&id=' . $user_source['UID'], '<span class="glyphicon glyphicon-edit"></span> ' . _("edit")) : '',
+          ! $user_source['Gekommen'] ? button(page_link_to('admin_arrive') . '&arrived=' . $user_source['UID'], _("arrived")) : '',
+          button(page_link_to_absolute('ical') . '&key=' . $user_source['api_key'], '<span class="glyphicon glyphicon-calendar"></span> ' . _("iCal Export")),
+          button(page_link_to_absolute('shifts_json_export') . '&key=' . $user_source['api_key'], '<span class="glyphicon glyphicon-export"></span> ' . _("JSON Export")) 
+      )),
       ($its_me || $admin_user_privilege) ? '<h2>' . _("Shifts") . '</h2>' : '',
       ($its_me || $admin_user_privilege) ? table(array(
           'date' => _("Day"),
diff --git a/locale/de_DE.UTF-8/LC_MESSAGES/default.mo b/locale/de_DE.UTF-8/LC_MESSAGES/default.mo
index 428121200075f323327d34da0dde1d2fca5a7ea8..efd75c752e751da045bc959ba5ab8a1592037031 100644
GIT binary patch
delta 7340
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
UR!vhQ&V3Vm{J+IZ6Mqi)FGGtf0{{R3

delta 7301
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
X`v1S7`qh;aecjHgmi42m&IbPvFGVK3

diff --git a/locale/de_DE.UTF-8/LC_MESSAGES/default.po b/locale/de_DE.UTF-8/LC_MESSAGES/default.po
index b95ec87d..ec6e2aaa 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-23 19:23+0100\n"
-"PO-Revision-Date: 2014-08-23 19:28+0100\n"
+"POT-Creation-Date: 2014-08-24 16:21+0100\n"
+"PO-Revision-Date: 2014-08-24 16:22+0100\n"
 "Last-Translator: msquare <msquare@notrademark.de>\n"
 "Language-Team: \n"
 "Language: de_DE\n"
@@ -25,7 +25,7 @@ msgstr "Nichts gefunden."
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_user.php:289
 #: /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:115
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:126
 msgid "Angeltypes"
 msgstr "Engeltypen"
 
@@ -67,7 +67,7 @@ msgstr "Team %s"
 msgid "view"
 msgstr "ansehen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:208
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:209
 #: /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
@@ -75,12 +75,12 @@ msgstr "ansehen"
 #: /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:77
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:124
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:88
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:135
 msgid "edit"
 msgstr "bearbeiten"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:209
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:210
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:37
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_questions.php:56
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_rooms.php:18
@@ -96,19 +96,19 @@ msgstr "bearbeiten"
 msgid "delete"
 msgstr "löschen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:214
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:219
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:70
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:192
 msgid "leave"
 msgstr "verlassen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:216
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:221
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:66
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:194
 msgid "join"
 msgstr "mitmachen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:219
+#: /Users/msquare/workspace/projects/engelsystem/includes/controller/angeltypes_controller.php:225
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:51
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/AngelTypes_view.php:165
 msgid "Restricted"
@@ -450,7 +450,7 @@ 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:127
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:140
 msgid "Shifts"
 msgstr "Schichten"
 
@@ -489,9 +489,8 @@ msgid "Reset done. Angel has not arrived."
 msgstr "Zurückgesetzt. Engel ist nicht angekommen."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:27
-#, fuzzy
 msgid "Angel has been marked as arrived."
-msgstr "Engel wurde als aktiv markiert."
+msgstr "Engel wurde als angekommen markiert."
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/admin_arrive.php:54
 #: /Users/msquare/workspace/projects/engelsystem/includes/view/UserAngelTypes_view.php:8
@@ -507,7 +506,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:125
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:136
 msgid "arrived"
 msgstr "angekommen"
 
@@ -556,7 +555,7 @@ 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/user_settings.php:180
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:154
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:167
 msgid "E-Mail"
 msgstr "E-Mail"
 
@@ -599,7 +598,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:170
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:183
 msgid "Save"
 msgstr "Speichern"
 
@@ -645,7 +644,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:129
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:142
 msgid "Day"
 msgstr "Tag"
 
@@ -939,12 +938,12 @@ 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:168
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:181
 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:169
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:182
 msgid "Confirm password"
 msgstr "Passwort wiederholen"
 
@@ -1356,7 +1355,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:108
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:119
 msgid "Freeloader"
 msgstr "Schwänzer"
 
@@ -1401,7 +1400,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:130
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:143
 msgid "Time"
 msgstr "Zeit"
 
@@ -1434,7 +1433,7 @@ msgid "iCal export"
 msgstr "iCal Export"
 
 #: /Users/msquare/workspace/projects/engelsystem/includes/pages/user_shifts.php:747
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:138
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:151
 #, php-format
 msgid ""
 "Export of shown shifts. <a href=\"%s\">iCal format</a> or <a href=\"%s"
@@ -1591,8 +1590,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:70
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:72
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:81
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:83
 msgid "Freeloaded"
 msgstr "Geschwänzt"
 
@@ -1632,70 +1631,86 @@ msgstr "Kommentar (nur für Dich):"
 msgid "Please select..."
 msgstr "Bitte auswählen..."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:24
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:28
 msgid "Free"
 msgstr "Frei"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:26
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:28
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:32
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:34
 #, php-format
-msgid "Next shift in %s min"
-msgstr "Nächste Schicht in %s min"
+msgid "Next shift %c"
+msgstr "Nächste Schicht %c"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:30
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:39
 #, php-format
-msgid "Current ends in %s min"
-msgstr "Ende in %s min"
+msgid "Shift start %c"
+msgstr "Schicht start %c"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:79
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:41
+#, php-format
+msgid "Shift end %c"
+msgstr "Schicht endet %c"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:90
 msgid "sign off"
 msgstr "abmelden"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:89
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:100
 msgid "Sum:"
 msgstr "Summe:"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:107
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:118
 msgid "User state"
 msgstr "Engel Zustand"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:110
+#: /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:110
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:121
 msgid "Not arrived"
 msgstr "Nicht angekommen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:111
+#: /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:112
+#: /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:119
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:130
 msgid "Rights"
 msgstr "Rechte"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:131
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:137
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:153
+#, 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:154
+msgid "JSON Export"
+msgstr "JSON Export"
+
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:144
 msgid "Location"
 msgstr "Ort"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:132
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:145
 msgid "Name &amp; workmates"
 msgstr "Name &amp; Kollegen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:133
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:146
 msgid "Comment"
 msgstr "Kommentar"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:134
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:147
 msgid "Action"
 msgstr "Aktion"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:136
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:149
 #, php-format
 msgid ""
 "Go to the <a href=\"%s\">shifts table</a> to sign yourself up for some "
@@ -1704,20 +1719,11 @@ msgstr ""
 "Gehe zur <a href=\"%s\">Schicht-Tabelle</a>, um Dich für Schichten "
 "einzutragen."
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:137
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:150
 msgid "Exports"
 msgstr "Exporte"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:140
-#, fuzzy
-msgid "iCal Export"
-msgstr "iCal Export"
-
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:141
-msgid "JSON Export"
-msgstr "JSON Export"
-
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:152
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:165
 msgid ""
 "We will send you an e-mail with a password recovery link. Please use the "
 "email address you used for registration."
@@ -1726,11 +1732,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:155
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:168
 msgid "Recover"
 msgstr "Wiederherstellen"
 
-#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:166
+#: /Users/msquare/workspace/projects/engelsystem/includes/view/User_view.php:179
 msgid "Please enter a new password."
 msgstr "Gib bitte ein neues Passwort ein."
 
@@ -1818,6 +1824,9 @@ msgstr ""
 "Du hast keinen Zugriff auf diese Seite. Registriere Dich und logge Dich "
 "bitte ein, um Zugriff zu erhalten!"
 
+#~ msgid "Current ends in %s min"
+#~ msgstr "Ende in %s min"
+
 #~ msgid "Add new angeltype"
 #~ msgstr "Neuer Engeltyp"