Merge remote-tracking branch 'upstream/pull/2182'

[rails.git] / app / views / users / account.html.erb

diff --git a/app/views/users/account.html.erb b/app/views/users/account.html.erb
index 7638b7a770ed9162be1c78b0c4e7cf5f7e30faf2..233f2629fa96f1ca84174e4c873d8b17c36e376f 100644 (file)
--- a/app/views/users/account.html.erb
+++ b/app/views/users/account.html.erb
@@ -85,7 +85,7 @@
     </div>
     <div class="form-row">
       <label class="standard-label"><%= t '.preferred editor' %></label>
     </div>
     <div class="form-row">
       <label class="standard-label"><%= t '.preferred editor' %></label>

-      <%= f.select :preferred_editor, [[t("editor.default", :name => t("editor.#{DEFAULT_EDITOR}.name")), 'default']] + Editors::ALL_EDITORS.collect { |e| [t("editor.#{e}.description"), e] } %>
+      <%= f.select :preferred_editor, [[t("editor.default", :name => t("editor.#{Settings.default_editor}.name")), 'default']] + Editors::ALL_EDITORS.collect { |e| [t("editor.#{e}.description"), e] } %>

     </div>
   </fieldset>
 
     </div>
   </fieldset>