Download as
Browse Code »

Commit 66a2358f88f0af470f7577bda45a2c02ce211950

Authored by Antonio Terceiro
2 parents 661fc11c 36442057
Exists in master and in 29 other branches add_member_task_reject_details, admin_visible_profile, article-list-template, community_notifications, contact_admin_translation, event_fixes, fix_comments_pagination, fix_rails4_organization_ratings, fix_sign_up_form, follow_step_fix, forum_topic_creation, mirror_block_improvements, multi_env_on_remote_user, new_security, noosfero_spb_ci, organization_ratings_improvements, organization_ratings_link_to_profile_stable-spb-1.3, organization_ratings_translations_fix, profile_api_improvements, ratings_minor_fixes, remote_user_fix, send_email_to_admins, stable-spb-1.3, stable-spb-1.3-fixes, stable-spb-1.4, stable-spb-1.5, suggest_rejected_value, web_steps_improvements, xss_terminate_custom_options

Merge branch 'timezone' into 'master' 

Set default timezone as needed by rails 3.2

See commit.

See merge request !352
Showing 1 changed file with 3 additions and 0 deletions   Show diff stats
config/application.rb
  Diff comments   View file @66a2358
@@ -115,6 +115,9 @@ module Noosfero @@ -115,6 +115,9 @@ module Noosfero
115 :key => '_noosfero_session', 115 :key => '_noosfero_session',
116 } 116 }
117 117
  118 + config.time_zone = File.read('/etc/timezone').split("\n").first
  119 + config.active_record.default_timezone = :local
  120 +
118 config.i18n.load_path += Dir.glob "#{Rails.root}/{baseplugins,config/plugins/*}/locales/*.{rb,yml}" 121 config.i18n.load_path += Dir.glob "#{Rails.root}/{baseplugins,config/plugins/*}/locales/*.{rb,yml}"
119 122
120 Noosfero::Plugin.setup(config) 123 Noosfero::Plugin.setup(config)