From 4f8dd29240a883ebc3bfb10010358ffa7591a975 Mon Sep 17 00:00:00 2001
From: Andreas Stephanides <andreas.stephanides@gmail.com>
Date: Thu, 9 Apr 2015 16:45:54 +0200
Subject: [PATCH] translation meeting

---
 app/models/meeting.rb      | 2 +-
 config/locales/date.de.yml | 1 +
 config/locales/date.en.yml | 7 ++++---
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/app/models/meeting.rb b/app/models/meeting.rb
index 2d82dff..5c6ca36 100644
--- a/app/models/meeting.rb
+++ b/app/models/meeting.rb
@@ -31,7 +31,7 @@ class Meeting < ActiveRecord::Base
     end 
     t= t+ self.name.to_s
  #    t = t + " " + I18n.l(self.calentry.start) unless self.calentry.nil?
-    t = t +" am "+ self.calentry.text unless self.calentry.nil?
+    t = t +" "+ I18n.t("date.on")+" "+ self.calentry.text unless self.calentry.nil?
     t
   end
   def create_announcement(user)
diff --git a/config/locales/date.de.yml b/config/locales/date.de.yml
index 80a9e1a..4b4ff1b 100644
--- a/config/locales/date.de.yml
+++ b/config/locales/date.de.yml
@@ -1,5 +1,6 @@
 de:
   date:
+    on: am
     abbr_day_names:
     - So
     - Mo
diff --git a/config/locales/date.en.yml b/config/locales/date.en.yml
index f83b97f..3979e84 100644
--- a/config/locales/date.en.yml
+++ b/config/locales/date.en.yml
@@ -9,11 +9,12 @@ en:
     - :day
     - :month
     - :year
+    on: on
   time:
     am: am
     formats:
-      default: ! '%d/%m/%Y, %H:%M Uhr'
-      long: ! '%A, %d. %B %Y, %H:%M Uhr'
-      short: ! '%d/%m/%Y, %H:%M Uhr'
+      default: ! '%d/%m/%Y, %H:%M h'
+      long: ! '%A, %d. %B %Y, %H:%M h'
+      short: ! '%d/%m/%Y, %H:%M h'
       timeonly: ! '%H:%M Uhr'
     pm: pm