From f821eaf7221ca05e86efb49d25ac7e3a236e63f7 Mon Sep 17 00:00:00 2001
From: Jean-Philippe Lang <jp_lang@yahoo.fr>
Date: Sat, 7 Mar 2015 08:12:08 +0000
Subject: Adds the date format for ambiguous dates (#19243).

git-svn-id: http://svn.redmine.org/redmine/trunk@14048 e93f8b46-1217-0410-a6f0-8f06a7374b81
---
 app/helpers/settings_helper.rb       | 11 +++++++++++
 app/views/settings/_display.html.erb |  2 +-
 2 files changed, 12 insertions(+), 1 deletion(-)

(limited to 'app')

diff --git a/app/helpers/settings_helper.rb b/app/helpers/settings_helper.rb
index 778abc795..fcf8ec2e3 100644
--- a/app/helpers/settings_helper.rb
+++ b/app/helpers/settings_helper.rb
@@ -124,5 +124,16 @@ module SettingsHelper
     ]
 
     options.map {|label, value| [l(label), value.to_s]}
+  end
+
+	# Returns the options for the date_format setting
+  def date_format_setting_options(locale)
+    Setting::DATE_FORMATS.map do |f|
+      today = ::I18n.l(Date.today, :locale => locale, :format => f)
+      format = f.gsub('%', '').gsub(/[dmY]/) do
+        {'d' => 'dd', 'm' => 'mm', 'Y' => 'yyyy'}[$&]
+      end
+      ["#{today} (#{format})", f]
+    end
   end
 end
diff --git a/app/views/settings/_display.html.erb b/app/views/settings/_display.html.erb
index ab1ce9b9b..3497f9076 100644
--- a/app/views/settings/_display.html.erb
+++ b/app/views/settings/_display.html.erb
@@ -11,7 +11,7 @@
 
 <p><%= setting_select :start_of_week, [[day_name(1),'1'], [day_name(6),'6'], [day_name(7),'7']], :blank => :label_language_based %></p>
 <% locale = User.current.language.blank? ? ::I18n.locale : User.current.language %>
-<p><%= setting_select :date_format, Setting::DATE_FORMATS.collect {|f| [::I18n.l(Date.today, :locale => locale, :format => f), f]}, :blank => :label_language_based %></p>
+<p><%= setting_select :date_format, date_format_setting_options(locale), :blank => :label_language_based %></p>
 
 <p><%= setting_select :time_format, Setting::TIME_FORMATS.collect {|f| [::I18n.l(Time.now, :locale => locale, :format => f), f]}, :blank => :label_language_based %></p>
 
-- 
cgit v1.2.3