diff options
| author | Eric Davis <edavis@littlestreamsoftware.com> | 2010-10-31 23:57:18 +0000 |
|---|---|---|
| committer | Eric Davis <edavis@littlestreamsoftware.com> | 2010-10-31 23:57:18 +0000 |
| commit | 86ee82384a73ba4602d60727a275de150412c49a (patch) | |
| tree | 1ec1ef69ed7c29172574fd54e6ffcdd0ce0814d9 | |
| parent | 0ceea884539bb27593a336a96992ee75d8cd7e5a (diff) | |
| download | redmine-86ee82384a73ba4602d60727a275de150412c49a.tar.gz redmine-86ee82384a73ba4602d60727a275de150412c49a.zip | |
Merged r4306 from trunk.
git-svn-id: svn+ssh://rubyforge.org/var/svn/redmine/branches/1.0-stable@4340 e93f8b46-1217-0410-a6f0-8f06a7374b81
| -rw-r--r-- | app/views/settings/_authentication.rhtml | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/app/views/settings/_authentication.rhtml b/app/views/settings/_authentication.rhtml index da29bb704..11220534f 100644 --- a/app/views/settings/_authentication.rhtml +++ b/app/views/settings/_authentication.rhtml @@ -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"], |