From 6bb7cb917c0cea88cdb66f23f328fd735ae8c1a0 Mon Sep 17 00:00:00 2001 From: Andreas Stephanides Date: Tue, 14 Apr 2015 18:26:03 +0200 Subject: [PATCH] fix meeting translation --- app/models/meeting.rb | 2 +- config/locales/date.en.yml | 2 +- config/locales/en.yml | 3 +-- 3 files changed, 3 insertions(+), 4 deletions(-) diff --git a/app/models/meeting.rb b/app/models/meeting.rb index 5c6ca36..425ad71 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 +" "+ I18n.t("date.on")+" "+ self.calentry.text unless self.calentry.nil? + t = t +" "+ I18n.t("date.am")+" "+ self.calentry.text unless self.calentry.nil? t end def create_announcement(user) diff --git a/config/locales/date.en.yml b/config/locales/date.en.yml index 2ee5897..867f46c 100644 --- a/config/locales/date.en.yml +++ b/config/locales/date.en.yml @@ -1,6 +1,6 @@ en: date: - am: on + am: 'on' formats: default: ! '%d/%m/%Y' default-picker: ! 'dd/mm/yyyy' diff --git a/config/locales/en.yml b/config/locales/en.yml index 3634e9b..03d0746 100755 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -25,5 +25,4 @@ en: search: "Search" newexamples: "Newest examples in our collection" selectstyle: "Choose a style" - date: - am: on +