Merge remote-tracking branch 'origin/master' into extrafeature

2014-09-13 16:36:31 +02:00
parent f5da3ac3dc bfb4d54244
commit 9869acfc4a
61 changed files with 821 additions and 111 deletions
--- a/app/views/fetprofiles/_interninfo.html.erb
+++ b/app/views/fetprofiles/_interninfo.html.erb
@@ -1,5 +1,5 @@
 <p>
-<b>Geburtstag</b> <%= %>
+<b>Geburtstag</b> <%= I18n.l(interninfo.birthday,format: :short) %>
 </p>
 <p>
  <b>Adresse:</b>