diff --git a/app/views/settings/_display.html.erb b/app/views/settings/_display.html.erb index 71c44be03..c375adc1a 100644 --- a/app/views/settings/_display.html.erb +++ b/app/views/settings/_display.html.erb @@ -3,7 +3,7 @@

<%= setting_select :ui_theme, Redmine::Themes.themes.collect {|t| [t.name, t.id]}, :blank => :label_default, :label => :label_theme %>

-

<%= setting_select :default_language, :Chinese简体中文 => :zh, :English => :en %>

+

<%= setting_select :default_language, lang_options_for_select(false) %>

<%= setting_select :start_of_week, [[day_name(1),'1'], [day_name(6),'6'], [day_name(7),'7']], :blank => :label_language_based %>

<% locale = User.current.language.blank? ? ::I18n.locale : User.current.language %> @@ -11,7 +11,7 @@

<%= setting_select :time_format, Setting::TIME_FORMATS.collect {|f| [::I18n.l(Time.now, :locale => locale, :format => f), f]}, :blank => :label_language_based %>

-

<%= setting_select :user_format, @options[:user_format] %>

+

<%#= setting_select :user_format, @options[:user_format] %>

<%= setting_check_box :gravatar_enabled %>