setting password_lost renamed to lost_password

git-svn-id: http://redmine.rubyforge.org/svn/trunk@235 e93f8b46-1217-0410-a6f0-8f06a7374b81

diff --git a/app/views/account/login.rhtml b/app/views/account/login.rhtml
index 9f1e3dc6310593591fdeee22b3454e25dd851c06..5a94cb1ed22e4e467c04e05bb855589f9fe7bfcf 100644 (file)
--- a/app/views/account/login.rhtml
+++ b/app/views/account/login.rhtml
@@ -15,7 +15,7 @@
 <br>\r
 <% links = []\r
    links << link_to(l(:label_register), :action => 'register') if Setting.self_registration?\r
-   links << link_to(l(:label_password_lost), :action => 'password_lost') if Setting.password_lost?\r
+   links << link_to(l(:label_password_lost), :action => 'lost_password') if Setting.lost_password?\r
 %>\r
 <%= links.join(" | ") %>\r
 </p>\r

diff --git a/app/views/settings/edit.rhtml b/app/views/settings/edit.rhtml
index c4a8d03d417c49bbe29506f1e0ab344eab92e124..ed42d3478c5aa50b6d5e3cf90c1942f52a3c6b16 100644 (file)
--- a/app/views/settings/edit.rhtml
+++ b/app/views/settings/edit.rhtml
@@ -21,7 +21,7 @@
 <%= check_box_tag 'settings[self_registration]', 1, Setting.self_registration? %><%= hidden_field_tag 'settings[self_registration]', 0 %></p>
 
 <p><label><%= l(:label_password_lost) %></label>
-<%= check_box_tag 'settings[password_lost]', 1, Setting.password_lost? %><%= hidden_field_tag 'settings[password_lost]', 0 %></p>
+<%= check_box_tag 'settings[lost_password]', 1, Setting.lost_password? %><%= hidden_field_tag 'settings[lost_password]', 0 %></p>
 
 <p><label><%= l(:setting_attachment_max_size) %></label>
 <%= text_field_tag 'settings[attachment_max_size]', Setting.attachment_max_size, :size => 6 %> KB</p>

diff --git a/config/settings.yml b/config/settings.yml
index 252600b58e7a11d462d11b8c3f4b9ffb3c2c5dfc..7ddbe529312c994c763b02fc211c227a8c2e7445 100644 (file)
--- a/config/settings.yml
+++ b/config/settings.yml
@@ -29,7 +29,7 @@ login_required:
   default: 0\r
 self_registration:\r
   default: 1\r
-password_lost:\r
+lost_password:\r
   default: 1\r
 attachment_max_size:\r
   format: int\r