mirror of
https://github.com/meineerde/redmine.git
synced 2025-10-17 17:01:01 +00:00
Merged r4306 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4340 e93f8b46-1217-0410-a6f0-8f06a7374b81
This commit is contained in:
parent
0ceea88453
commit
86ee82384a
@ -3,7 +3,7 @@
|
||||
<div class="box tabular settings">
|
||||
<p><%= setting_check_box :login_required %></p>
|
||||
|
||||
<p><%= setting_select :autologin, [1, 7, 30, 365].collect{|days| [l('datetime.distance_in_words.x_days', :count => days), days.to_s]}, :blank => :label_disabled %></p>
|
||||
<p><%= setting_select :autologin, [[l(:label_disabled), 0]] + [1, 7, 30, 365].collect{|days| [l('datetime.distance_in_words.x_days', :count => days), days.to_s]} %></p>
|
||||
|
||||
<p><%= setting_select :self_registration, [[l(:label_disabled), "0"],
|
||||
[l(:label_registration_activation_by_email), "1"],
|
||||
|
||||
Loading…
x
Reference in New Issue
Block a user