Merge remote-tracking branch 'origin/dev' into feature/timelines_custom_fields_display_3884

pull/863/head
Nils Kenneweg 11 years ago
commit a7aebc09cb
  1. 14
      app/helpers/calendars_helper.rb
  2. 1
      doc/CHANGELOG.md

@ -36,9 +36,9 @@ module CalendarsHelper
end end
name = if target_month == 12 name = if target_month == 12
"#{month_name(target_month)} #{target_year}" "#{localized_month_name target_month} #{target_year}"
else else
"#{month_name(target_month)}" "#{localized_month_name target_month}"
end end
link_to_month(name, target_year, target_month, options.merge(:class => 'navigate-left')) link_to_month(name, target_year, target_month, options.merge(:class => 'navigate-left'))
@ -52,9 +52,9 @@ module CalendarsHelper
end end
name = if target_month == 1 name = if target_month == 1
"#{month_name(target_month)} #{target_year}" "#{localized_month_name target_month} #{target_year}"
else else
"#{month_name(target_month)}" "#{localized_month_name target_month}"
end end
link_to_month(name, target_year, target_month, options.merge(:class => 'navigate-right')) link_to_month(name, target_year, target_month, options.merge(:class => 'navigate-right'))
@ -63,4 +63,10 @@ module CalendarsHelper
def link_to_month(link_name, year, month, options={}) def link_to_month(link_name, year, month, options={})
link_to_content_update(link_name, params.merge(:year => year, :month => month), options) link_to_content_update(link_name, params.merge(:year => year, :month => month), options)
end end
private
def localized_month_name(month_index)
::I18n.t('date.month_names')[month_index]
end
end end

@ -38,6 +38,7 @@ See doc/COPYRIGHT.rdoc for more details.
* `#4023` [Accessibility] Fixes tabbing inside modals * `#4023` [Accessibility] Fixes tabbing inside modals
* `#4090` 'Session Expires' setting breaks API * `#4090` 'Session Expires' setting breaks API
* `#4101` Headings: Fix typos in german translation * `#4101` Headings: Fix typos in german translation
* `#4108` Fixes German translation of months
* `#4163` Extend authorization-API to return current user id * `#4163` Extend authorization-API to return current user id
* News subject contained in URL * News subject contained in URL
* Removes mocha mocking framework. * Removes mocha mocking framework.

Loading…
Cancel
Save