Skip to content
This repository has been archived by the owner on Feb 10, 2022. It is now read-only.

Commit

Permalink
Merge pull request #302 from jprberlin/feature/#227_handle_start_end_…
Browse files Browse the repository at this point in the history
…date_problem

227 fix locales and view for start and end date
  • Loading branch information
MrSerth committed May 5, 2015
2 parents e099802 + 6e50667 commit 6826c13
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 2 deletions.
8 changes: 6 additions & 2 deletions app/views/courses/_sidebar.html.slim
Original file line number Diff line number Diff line change
Expand Up @@ -50,13 +50,17 @@
= @course.course_instructors
.gradient-divider

.hd6.pb5
= t('courses.time')
- if @course.start_date && @course.end_date
.hd6.pb5
= t('courses.time')
= @course.start_date.strftime("%d.%m.%Y") + ' - ' + @course.end_date.strftime("%d.%m.%Y")
- elsif @course.start_date
.hd6.pb5
= t('courses.starting_time')
= @course.start_date.strftime("%d.%m.%Y")
- else
.hd6.pb5
= t('courses.time')
= t('courses.no_dates_available')
.gradient-divider

Expand Down
1 change: 1 addition & 0 deletions config/locales/de.yml
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,7 @@ de:
mooc_provider: Kursanbieter
instructors: Lehrpersonen
time: Zeitraum
starting_time: Startdatum
language: Sprache
requirements: Voraussetzungen
achievement: Abschluss
Expand Down
1 change: 1 addition & 0 deletions config/locales/en.yml
Original file line number Diff line number Diff line change
Expand Up @@ -183,6 +183,7 @@ en:
mooc_provider: MOOC Provider
instructors: Instructors
time: Time
starting_time: Starting Time
language: Language
requirements: Requirements
achievement: Type of Achievement
Expand Down

0 comments on commit 6826c13

Please sign in to comment.