changeset 1491:cb53cb6eeaef cannam

Merge from default branch

--- a/Gemfile	Thu Nov 07 17:19:09 2013 +0000
+++ b/Gemfile	Mon Mar 17 08:56:24 2014 +0000
@@ -1,6 +1,6 @@
 source 'http://rubygems.org'
 
-gem "rails", "3.2.13"
+gem "rails", "3.2.17"
 gem "jquery-rails", "~> 2.0.2"
 gem "i18n", "~> 0.6.0"
 gem "coderay", "~> 1.0.6"

--- a/app/views/account/register.html.erb	Thu Nov 07 17:19:09 2013 +0000
+++ b/app/views/account/register.html.erb	Mon Mar 17 08:56:24 2014 +0000
@@ -22,20 +22,20 @@
 <p><%= f.text_field :lastname, :required => true %></p>
 <p><%= f.text_field :mail, :required => true %></p>
 
-<!-- We only support English in this site 
+<!-- We only support English in this site
 <p><%= f.select :language, lang_options_for_select %></p>
 -->
-    
+
 <%= labelled_fields_for :ssamr_user_details, @ssamr_user_details do |fields| %>
 <h3><%=l(:label_ssamr_details)%></h3>
- 
+
 <p>
   <%= fields.text_area :description, :rows => 3, :cols => 40, :required => true, :class => 'wiki-edit' %>
   <em> <%=l(:text_user_ssamr_description_info).html_safe%></em>
 </p>
 
 <p><label for="institution"><%=l("field_ssamr_user_detail.institution")%> <span class="required">*</span></label>
-  <%= fields.radio_button :institution_type, true %>
+  <%= fields.radio_button :institution_type, true, :checked => true %>
   <%= fields.collection_select(:institution_id, Institution.find(:all, :order => "institutions.order"), :id, :name,  {:selected => @selected_institution_id, :prompt => true}).gsub('&amp;', '&').html_safe  %>
 </p>
 
@@ -44,7 +44,7 @@
   <%= fields.text_field(:other_institution) %>
 </p>
 <% end %>
-      
+
 
 <% if Setting.openid? %>
   <p><%= f.text_field :identity_url  %></p>

--- a/config/application.rb	Thu Nov 07 17:19:09 2013 +0000
+++ b/config/application.rb	Mon Mar 17 08:56:24 2014 +0000
@@ -32,6 +32,10 @@
     # Run "rake -D time" for a list of tasks for finding time zone names. Default is UTC.
     # config.time_zone = 'Central Time (US & Canada)'
 
+    # Avoid deprecation warning (may want to change this later if future
+    # Redmine updates are OK with it)
+    config.i18n.enforce_available_locales = false
+
     # The default locale is :en and all translations from config/locales/*.rb,yml are auto loaded.
     # config.i18n.load_path += Dir[Rails.root.join('my', 'locales', '*.{rb,yml}').to_s]
     # config.i18n.default_locale = :de