Changed no timezone set messages to get assumed time zone as parameter

and use the system time zone as parameter
pull/6827/head
Sebastian Schuster 12 years ago
parent 6cce00ae33
commit 0ea48de7f8
  1. 4
      app/controllers/meetings_controller.rb
  2. 2
      config/locales/de.yml
  3. 2
      config/locales/en.yml

@ -48,8 +48,8 @@ class MeetingsController < ApplicationController
end
if @meeting.save
text = l(:notice_successful_create)
link = l(:notice_timezone_missing)
if User.current.pref.time_zone == ""
if User.current.time_zone.nil?
link = l(:notice_timezone_missing, :zone => Time.now.zone)
text += " #{view_context.link_to(link, {:controller => :my, :action => :account},:class => "link_to_profile")}"
end
flash[:notice] = text.html_safe

@ -40,4 +40,4 @@ de:
location: "Ort/Raum"
duration: "Dauer"
notice_timezone_missing: Keine Zeitzone eingestellt und daher UTC angenommen. Um Ihre Zeitzone einzustellen, clicken Sie bitte hier.
notice_timezone_missing: Keine Zeitzone eingestellt und daher %{zone} angenommen. Um Ihre Zeitzone einzustellen, clicken Sie bitte hier.

@ -40,4 +40,4 @@ en:
location: "Location"
duration: "Duration"
notice_timezone_missing: No time zone is set and UTC is assumed. To choose your time zone, please click here.
notice_timezone_missing: No time zone is set and %{zone} is assumed. To choose your time zone, please click here.

Loading…
Cancel
Save