Add date format option for articles from the environment

Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com> Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com> Signed-off-by: Fabio Teixeira <fabio1079@gmail.com> Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>

Add date format option for articles from the environment
Signed-off-by: Arthur Del Esposte <arthurmde@gmail.com> Signed-off-by: David Carlos <ddavidcarlos1392@gmail.com> Signed-off-by: Fabio Teixeira <fabio1079@gmail.com> Signed-off-by: Gabriela Navarro <navarro1703@gmail.com>
Gabriela Navarro · Rodrigo Souto
1 parent 769eb2c5
Showing 10 changed files with 150 additions and 8 deletions Show diff stats
app/helpers/content_viewer_helper.rb
app/helpers/dates_helper.rb
app/models/environment.rb
app/views/admin_panel/_site_info.html.erb
db/migrate/20150529180110_add_date_format_to_environment.rb
test/functional/admin_panel_controller_test.rb
test/test_helper.rb
test/unit/content_viewer_helper_test.rb
test/unit/dates_helper_test.rb
test/unit/environment_test.rb
@@ -2,6 +2,7 @@ module ContentViewerHelper
   include BlogHelper
   include ForumHelper
+  include DatesHelper
   def display_number_of_comments(n)
     base_str = "<span class='comment-count hide'>#{n}</span>"
@@ -24,8 +25,9 @@ module ContentViewerHelper
       unless args[:no_comments] || !article.accept_comments
         comments = (" - %s") % link_to_comments(article)
       end
+      date_format = show_with_right_format_date article
       title << content_tag('span',
-        content_tag('span', show_date(article.published_at), :class => 'date') +
+        date_format +
         content_tag('span', _(", by %s") % (article.author ? link_to(article.author_name, article.author_url) : article.author_name), :class => 'author') +
         content_tag('span', comments, :class => 'comments'),
         :class => 'created-at'
@@ -34,6 +36,24 @@ module ContentViewerHelper
     title
   end
+  def show_with_right_format_date article
+    date_format = article.environment.date_format
+    use_numbers = false
+    year = true
+    left_time = false
+    if date_format ==  'numbers_with_year'
+      use_numbers = true
+    elsif date_format == 'numbers'
+      use_numbers = true
+      year = false
+    elsif date_format == 'month_name'
+      year = false
+    elsif date_format == 'past_time'
+      left_time = true
+    end
+    content_tag('span', show_date(article.published_at, use_numbers , year, left_time), :class => 'date')
+  end
+
   def link_to_comments(article, args = {})
     return '' unless article.accept_comments?
     reference_to_article number_of_comments(article), article, 'comments_list'
@@ -2,6 +2,7 @@ require &#39;noosfero/i18n&#39;
 module DatesHelper
+  include ActionView::Helpers::DateHelper
   def months
     I18n.t('date.month_names')
   end
@@ -15,10 +16,12 @@ module DatesHelper
   end
   # formats a date for displaying.
-  def show_date(date, use_numbers = false, year=true)
+  def show_date(date, use_numbers = false, year = true, left_time = false)
     if date && use_numbers
       date_format = year ? _('%{month}/%{day}/%{year}') : _('%{month}/%{day}')
       date_format % { :day => date.day, :month => date.month, :year => date.year }
+    elsif date && left_time
+      date_format = time_ago_in_words(date)
     elsif date
       date_format = year ? _('%{month_name} %{day}, %{year}') : _('%{month_name} %{day}')
       date_format % { :day => date.day, :month_name => month_name(date.month), :year => date.year }
@@ -3,7 +3,17 @@
 # domains.
 class Environment < ActiveRecord::Base
-  attr_accessible :name, :is_default, :signup_welcome_text_subject, :signup_welcome_text_body, :terms_of_use, :message_for_disabled_enterprise, :news_amount_by_folder, :default_language, :languages, :description, :organization_approval_method, :enabled_plugins, :enabled_features, :redirection_after_login, :redirection_after_signup, :contact_email, :theme, :reports_lower_bound, :noreply_email, :signup_welcome_screen_body, :members_whitelist_enabled, :members_whitelist, :highlighted_news_amount, :portal_news_amount
+  attr_accessible :name, :is_default, :signup_welcome_text_subject,
+                  :signup_welcome_text_body, :terms_of_use,
+                  :message_for_disabled_enterprise, :news_amount_by_folder,
+                  :default_language, :languages, :description,
+                  :organization_approval_method, :enabled_plugins,
+                  :enabled_features, :redirection_after_login,
+                  :redirection_after_signup, :contact_email, :theme,
+                  :reports_lower_bound, :noreply_email,
+                  :signup_welcome_screen_body, :members_whitelist_enabled,
+                  :members_whitelist, :highlighted_news_amount,
+                  :portal_news_amount, :date_format
   has_many :users
@@ -14,6 +24,12 @@ class Environment &lt; ActiveRecord::Base
   IDENTIFY_SCRIPTS = /(php[0-9s]?|[sp]htm[l]?|pl|py|cgi|rb)/
+  validates_inclusion_of :date_format,
+                         :in => [ 'numbers_with_year', 'numbers',
+                                  'month_name_with_year', 'month_name',
+                                  'past_time'],
+                         :if => :date_format
+
   def self.verify_filename(filename)
     filename += '.txt' if File.extname(filename) =~ IDENTIFY_SCRIPTS
     filename
@@ -3,6 +3,21 @@
 <%= labelled_form_field(_('No reply email'), text_field(:environment, :noreply_email)) %>
 <% themes_options = Theme.system_themes.map {|theme| [theme.name, theme.id] }.sort %>
 <%= labelled_form_field(_('Theme'), select(:environment, :theme, options_for_select(themes_options, environment.theme))) %>
+
+<%= labelled_form_field(
+  _("Article's date format"),
+  select(:environment, :date_format,
+    options_for_select([
+      [ _('mm/dd/yyyy'), 'numbers_with_year'],
+      [ _('mm/dd'), 'numbers'],
+      [ _('Month dd, yyyy'), 'month_name_with_year'],
+      [ _('Month dd'), 'month_name'],
+      [ _('X minutes/hours/days/months/years ago'), 'past_time']
+      ], environment.date_format
+    )
+  )
+) %>
+
 <%= required f.text_field(:reports_lower_bound, :size => 3) %>
 <%= labelled_form_field(_('Default language'), select(:environment, :default_language, environment.locales.invert, { :selected => environment.default_locale, :include_blank => true })) %>
 <%= label_tag :languages, _('Available languages') %>
@@ -0,0 +1,9 @@
+class AddDateFormatToEnvironment < ActiveRecord::Migration
+  def up
+    add_column :environments, :date_format, :string, :default => 'month_name_with_year'
+  end
+
+  def down
+    remove_column :environments, :date_format
+  end
+end
@@ -130,6 +130,20 @@ class AdminPanelControllerTest &lt; ActionController::TestCase
     assert_equal "This <strong>is</strong> my new environment", Environment.default.message_for_disabled_enterprise
   end
+  should 'save site article date format option' do
+    post :site_info, :environment => { :date_format => "numbers_with_year" }
+    assert_redirected_to :action => 'index'
+
+    assert_equal "numbers_with_year", Environment.default.date_format
+  end
+
+  should 'dont save site article date format option when a invalid option is passed' do
+    post :site_info, :environment => { :date_format => "invalid_format" }
+
+    assert_match "Date format is not included in the list", @response.body
+    assert_equal "month_name_with_year", Environment.default.date_format
+  end
+
   should 'set portal community' do
     e = Environment.default
     @controller.stubs(:environment).returns(e)
@@ -262,10 +262,6 @@ module NoosferoTestHelper
     arg
   end
-  def show_date(date)
-    date.to_s
-  end
-
   def strip_tags(html)
     html.gsub(/<[^>]+>/, '')
   end
@@ -18,7 +18,7 @@ class ContentViewerHelperTest &lt; ActionView::TestCase
     result = article_title(post)
     assert_tag_in_string result, :tag => 'span', :content => show_date(post.published_at)
   end
-  
+
   should 'display published-at for forum posts' do
     forum = fast_create(Forum, :name => 'Forum test', :profile_id => profile.id)
     post = TextileArticle.create!(:name => 'post test', :profile => profile, :parent => forum)
@@ -112,6 +112,42 @@ class ContentViewerHelperTest &lt; ActionView::TestCase
     assert_match 'bt-bookmark.gif', addthis_image_tag
   end
+  should 'show date with mm/dd/yyyy' do
+    Environment.any_instance.stubs(:date_format).returns('numbers_with_year')
+    article = TextileArticle.new(:name => 'post for test', :body => 'post for test', :profile => profile)
+    article.published_at = Time.zone.local(2007, 2, 1, 15, 30, 45)
+    article.save!
+    result = show_with_right_format_date article
+    assert_match /2\/1\/2007/, result
+  end
+
+  should 'show date with mm/dd' do
+    Environment.any_instance.stubs(:date_format).returns('numbers')
+    article = TextileArticle.new(:name => 'post for test', :body => 'post for test', :profile => profile)
+    article.published_at = Time.zone.local(2007, 2, 1, 15, 30, 45)
+    article.save!
+    result = show_with_right_format_date article
+    assert_match /2\/1/, result
+  end
+
+  should 'show date with month name' do
+    Environment.any_instance.stubs(:date_format).returns('month_name')
+    article = TextileArticle.new(:name => 'post for test', :body => 'post for test', :profile => profile)
+    article.published_at = Time.zone.local(2007, 2, 1, 15, 30, 45)
+    article.save!
+    result = show_with_right_format_date article
+    assert_match /February 1/, result
+  end
+
+  should 'show date with month name and year' do
+    Environment.any_instance.stubs(:date_format).returns('month_name_with_year')
+    article = TextileArticle.new(:name => 'post for test', :body => 'post for test', :profile => profile)
+    article.published_at = Time.zone.local(2007, 2, 1, 15, 30, 45)
+    article.save!
+    result = show_with_right_format_date article
+    assert_match /February 1, 2007/, result
+  end
+
   protected
   include NoosferoTestHelper
   include ActionView::Helpers::TextHelper
@@ -146,4 +146,9 @@ class DatesHelperTest &lt; ActiveSupport::TestCase
     assert_equal Date.new(Date.today.year, Date.today.month, 1), build_date('', '')
   end
+  should 'show how long it has passed since a specific date' do
+    date = Time.zone.now
+    assert_equal show_date(date, false, false, true), time_ago_in_words(date)
+  end
+
 end
@@ -1703,4 +1703,32 @@ class EnvironmentTest &lt; ActiveSupport::TestCase
     assert !e.has_license?
   end
+  should 'validates_inclusion_of date format' do
+    environment = fast_create(Environment)
+
+    environment.date_format = "invalid_format"
+    environment.valid?
+    assert environment.errors[:date_format.to_s].present?
+
+    environment.date_format = "numbers_with_year"
+    environment.valid?
+    assert !environment.errors[:date_format.to_s].present?
+
+    environment.date_format = "numbers"
+    environment.valid?
+    assert !environment.errors[:date_format.to_s].present?
+
+    environment.date_format = "month_name_with_year"
+    environment.valid?
+    assert !environment.errors[:date_format.to_s].present?
+
+    environment.date_format = "month_name"
+    environment.valid?
+    assert !environment.errors[:date_format.to_s].present?
+
+    environment.date_format = "past_time"
+    environment.valid?
+    assert !environment.errors[:date_format.to_s].present?
+  end
+
 end
	@@ -2,6 +2,7 @@ module ContentViewerHelper		@@ -2,6 +2,7 @@ module ContentViewerHelper
2		2
3	include BlogHelper	3	include BlogHelper
4	include ForumHelper	4	include ForumHelper
		5	+ include DatesHelper
5		6
6	def display_number_of_comments(n)	7	def display_number_of_comments(n)
7	base_str = "<span class='comment-count hide'>#{n}</span>"	8	base_str = "<span class='comment-count hide'>#{n}</span>"
	@@ -24,8 +25,9 @@ module ContentViewerHelper		@@ -24,8 +25,9 @@ module ContentViewerHelper
24	unless args[:no_comments] \|\| !article.accept_comments	25	unless args[:no_comments] \|\| !article.accept_comments
25	comments = (" - %s") % link_to_comments(article)	26	comments = (" - %s") % link_to_comments(article)
26	end	27	end
		28	+ date_format = show_with_right_format_date article
27	title << content_tag('span',	29	title << content_tag('span',
28	- content_tag('span', show_date(article.published_at), :class => 'date') +	30	+ date_format +
29	content_tag('span', _(", by %s") % (article.author ? link_to(article.author_name, article.author_url) : article.author_name), :class => 'author') +	31	content_tag('span', _(", by %s") % (article.author ? link_to(article.author_name, article.author_url) : article.author_name), :class => 'author') +
30	content_tag('span', comments, :class => 'comments'),	32	content_tag('span', comments, :class => 'comments'),
31	:class => 'created-at'	33	:class => 'created-at'
	@@ -34,6 +36,24 @@ module ContentViewerHelper		@@ -34,6 +36,24 @@ module ContentViewerHelper
34	title	36	title
35	end	37	end
36		38
		39	+ def show_with_right_format_date article
		40	+ date_format = article.environment.date_format
		41	+ use_numbers = false
		42	+ year = true
		43	+ left_time = false
		44	+ if date_format == 'numbers_with_year'
		45	+ use_numbers = true
		46	+ elsif date_format == 'numbers'
		47	+ use_numbers = true
		48	+ year = false
		49	+ elsif date_format == 'month_name'
		50	+ year = false
		51	+ elsif date_format == 'past_time'
		52	+ left_time = true
		53	+ end
		54	+ content_tag('span', show_date(article.published_at, use_numbers , year, left_time), :class => 'date')
		55	+ end
		56	+
37	def link_to_comments(article, args = {})	57	def link_to_comments(article, args = {})
38	return '' unless article.accept_comments?	58	return '' unless article.accept_comments?
39	reference_to_article number_of_comments(article), article, 'comments_list'	59	reference_to_article number_of_comments(article), article, 'comments_list'
	@@ -3,7 +3,17 @@		@@ -3,7 +3,17 @@
3	# domains.	3	# domains.
4	class Environment < ActiveRecord::Base	4	class Environment < ActiveRecord::Base
5		5
6	- attr_accessible :name, :is_default, :signup_welcome_text_subject, :signup_welcome_text_body, :terms_of_use, :message_for_disabled_enterprise, :news_amount_by_folder, :default_language, :languages, :description, :organization_approval_method, :enabled_plugins, :enabled_features, :redirection_after_login, :redirection_after_signup, :contact_email, :theme, :reports_lower_bound, :noreply_email, :signup_welcome_screen_body, :members_whitelist_enabled, :members_whitelist, :highlighted_news_amount, :portal_news_amount	6	+ attr_accessible :name, :is_default, :signup_welcome_text_subject,
		7	+ :signup_welcome_text_body, :terms_of_use,
		8	+ :message_for_disabled_enterprise, :news_amount_by_folder,
		9	+ :default_language, :languages, :description,
		10	+ :organization_approval_method, :enabled_plugins,
		11	+ :enabled_features, :redirection_after_login,
		12	+ :redirection_after_signup, :contact_email, :theme,
		13	+ :reports_lower_bound, :noreply_email,
		14	+ :signup_welcome_screen_body, :members_whitelist_enabled,
		15	+ :members_whitelist, :highlighted_news_amount,
		16	+ :portal_news_amount, :date_format
7		17
8	has_many :users	18	has_many :users
9		19
	@@ -14,6 +24,12 @@ class Environment < ActiveRecord::Base		@@ -14,6 +24,12 @@ class Environment < ActiveRecord::Base
14		24
15	IDENTIFY_SCRIPTS = /(php[0-9s]?\|[sp]htm[l]?\|pl\|py\|cgi\|rb)/	25	IDENTIFY_SCRIPTS = /(php[0-9s]?\|[sp]htm[l]?\|pl\|py\|cgi\|rb)/
16		26
		27	+ validates_inclusion_of :date_format,
		28	+ :in => [ 'numbers_with_year', 'numbers',
		29	+ 'month_name_with_year', 'month_name',
		30	+ 'past_time'],
		31	+ :if => :date_format
		32	+
17	def self.verify_filename(filename)	33	def self.verify_filename(filename)
18	filename += '.txt' if File.extname(filename) =~ IDENTIFY_SCRIPTS	34	filename += '.txt' if File.extname(filename) =~ IDENTIFY_SCRIPTS
19	filename	35	filename
	@@ -3,6 +3,21 @@		@@ -3,6 +3,21 @@
3	<%= labelled_form_field(_('No reply email'), text_field(:environment, :noreply_email)) %>	3	<%= labelled_form_field(_('No reply email'), text_field(:environment, :noreply_email)) %>
4	<% themes_options = Theme.system_themes.map {\|theme\| [theme.name, theme.id] }.sort %>	4	<% themes_options = Theme.system_themes.map {\|theme\| [theme.name, theme.id] }.sort %>
5	<%= labelled_form_field(_('Theme'), select(:environment, :theme, options_for_select(themes_options, environment.theme))) %>	5	<%= labelled_form_field(_('Theme'), select(:environment, :theme, options_for_select(themes_options, environment.theme))) %>
		6	+
		7	+<%= labelled_form_field(
		8	+ _("Article's date format"),
		9	+ select(:environment, :date_format,
		10	+ options_for_select([
		11	+ [ _('mm/dd/yyyy'), 'numbers_with_year'],
		12	+ [ _('mm/dd'), 'numbers'],
		13	+ [ _('Month dd, yyyy'), 'month_name_with_year'],
		14	+ [ _('Month dd'), 'month_name'],
		15	+ [ _('X minutes/hours/days/months/years ago'), 'past_time']
		16	+ ], environment.date_format
		17	+ )
		18	+ )
		19	+) %>
		20	+
6	<%= required f.text_field(:reports_lower_bound, :size => 3) %>	21	<%= required f.text_field(:reports_lower_bound, :size => 3) %>
7	<%= labelled_form_field(_('Default language'), select(:environment, :default_language, environment.locales.invert, { :selected => environment.default_locale, :include_blank => true })) %>	22	<%= labelled_form_field(_('Default language'), select(:environment, :default_language, environment.locales.invert, { :selected => environment.default_locale, :include_blank => true })) %>
8	<%= label_tag :languages, _('Available languages') %>	23	<%= label_tag :languages, _('Available languages') %>
@@ -0,0 +1,9 @@		@@ -0,0 +1,9 @@
	1	+class AddDateFormatToEnvironment < ActiveRecord::Migration
	2	+ def up
	3	+ add_column :environments, :date_format, :string, :default => 'month_name_with_year'
	4	+ end
	5	+
	6	+ def down
	7	+ remove_column :environments, :date_format
	8	+ end
	9	+end
	@@ -130,6 +130,20 @@ class AdminPanelControllerTest < ActionController::TestCase		@@ -130,6 +130,20 @@ class AdminPanelControllerTest < ActionController::TestCase
130	assert_equal "This <strong>is</strong> my new environment", Environment.default.message_for_disabled_enterprise	130	assert_equal "This <strong>is</strong> my new environment", Environment.default.message_for_disabled_enterprise
131	end	131	end
132		132
		133	+ should 'save site article date format option' do
		134	+ post :site_info, :environment => { :date_format => "numbers_with_year" }
		135	+ assert_redirected_to :action => 'index'
		136	+
		137	+ assert_equal "numbers_with_year", Environment.default.date_format
		138	+ end
		139	+
		140	+ should 'dont save site article date format option when a invalid option is passed' do
		141	+ post :site_info, :environment => { :date_format => "invalid_format" }
		142	+
		143	+ assert_match "Date format is not included in the list", @response.body
		144	+ assert_equal "month_name_with_year", Environment.default.date_format
		145	+ end
		146	+
133	should 'set portal community' do	147	should 'set portal community' do
134	e = Environment.default	148	e = Environment.default
135	@controller.stubs(:environment).returns(e)	149	@controller.stubs(:environment).returns(e)
	@@ -18,7 +18,7 @@ class ContentViewerHelperTest < ActionView::TestCase		@@ -18,7 +18,7 @@ class ContentViewerHelperTest < ActionView::TestCase
18	result = article_title(post)	18	result = article_title(post)
19	assert_tag_in_string result, :tag => 'span', :content => show_date(post.published_at)	19	assert_tag_in_string result, :tag => 'span', :content => show_date(post.published_at)
20	end	20	end
21	-	21	+
22	should 'display published-at for forum posts' do	22	should 'display published-at for forum posts' do
23	forum = fast_create(Forum, :name => 'Forum test', :profile_id => profile.id)	23	forum = fast_create(Forum, :name => 'Forum test', :profile_id => profile.id)
24	post = TextileArticle.create!(:name => 'post test', :profile => profile, :parent => forum)	24	post = TextileArticle.create!(:name => 'post test', :profile => profile, :parent => forum)
	@@ -112,6 +112,42 @@ class ContentViewerHelperTest < ActionView::TestCase		@@ -112,6 +112,42 @@ class ContentViewerHelperTest < ActionView::TestCase
112	assert_match 'bt-bookmark.gif', addthis_image_tag	112	assert_match 'bt-bookmark.gif', addthis_image_tag
113	end	113	end
114		114
		115	+ should 'show date with mm/dd/yyyy' do
		116	+ Environment.any_instance.stubs(:date_format).returns('numbers_with_year')
		117	+ article = TextileArticle.new(:name => 'post for test', :body => 'post for test', :profile => profile)
		118	+ article.published_at = Time.zone.local(2007, 2, 1, 15, 30, 45)
		119	+ article.save!
		120	+ result = show_with_right_format_date article
		121	+ assert_match /2\/1\/2007/, result
		122	+ end
		123	+
		124	+ should 'show date with mm/dd' do
		125	+ Environment.any_instance.stubs(:date_format).returns('numbers')
		126	+ article = TextileArticle.new(:name => 'post for test', :body => 'post for test', :profile => profile)
		127	+ article.published_at = Time.zone.local(2007, 2, 1, 15, 30, 45)
		128	+ article.save!
		129	+ result = show_with_right_format_date article
		130	+ assert_match /2\/1/, result
		131	+ end
		132	+
		133	+ should 'show date with month name' do
		134	+ Environment.any_instance.stubs(:date_format).returns('month_name')
		135	+ article = TextileArticle.new(:name => 'post for test', :body => 'post for test', :profile => profile)
		136	+ article.published_at = Time.zone.local(2007, 2, 1, 15, 30, 45)
		137	+ article.save!
		138	+ result = show_with_right_format_date article
		139	+ assert_match /February 1/, result
		140	+ end
		141	+
		142	+ should 'show date with month name and year' do
		143	+ Environment.any_instance.stubs(:date_format).returns('month_name_with_year')
		144	+ article = TextileArticle.new(:name => 'post for test', :body => 'post for test', :profile => profile)
		145	+ article.published_at = Time.zone.local(2007, 2, 1, 15, 30, 45)
		146	+ article.save!
		147	+ result = show_with_right_format_date article
		148	+ assert_match /February 1, 2007/, result
		149	+ end
		150	+
115	protected	151	protected
116	include NoosferoTestHelper	152	include NoosferoTestHelper
117	include ActionView::Helpers::TextHelper	153	include ActionView::Helpers::TextHelper
	@@ -146,4 +146,9 @@ class DatesHelperTest < ActiveSupport::TestCase		@@ -146,4 +146,9 @@ class DatesHelperTest < ActiveSupport::TestCase
146	assert_equal Date.new(Date.today.year, Date.today.month, 1), build_date('', '')	146	assert_equal Date.new(Date.today.year, Date.today.month, 1), build_date('', '')
147	end	147	end
148		148
		149	+ should 'show how long it has passed since a specific date' do
		150	+ date = Time.zone.now
		151	+ assert_equal show_date(date, false, false, true), time_ago_in_words(date)
		152	+ end
		153	+
149	end	154	end
	@@ -1703,4 +1703,32 @@ class EnvironmentTest < ActiveSupport::TestCase		@@ -1703,4 +1703,32 @@ class EnvironmentTest < ActiveSupport::TestCase
1703	assert !e.has_license?	1703	assert !e.has_license?
1704	end	1704	end
1705		1705
		1706	+ should 'validates_inclusion_of date format' do
		1707	+ environment = fast_create(Environment)
		1708	+
		1709	+ environment.date_format = "invalid_format"
		1710	+ environment.valid?
		1711	+ assert environment.errors[:date_format.to_s].present?
		1712	+
		1713	+ environment.date_format = "numbers_with_year"
		1714	+ environment.valid?
		1715	+ assert !environment.errors[:date_format.to_s].present?
		1716	+
		1717	+ environment.date_format = "numbers"
		1718	+ environment.valid?
		1719	+ assert !environment.errors[:date_format.to_s].present?
		1720	+
		1721	+ environment.date_format = "month_name_with_year"
		1722	+ environment.valid?
		1723	+ assert !environment.errors[:date_format.to_s].present?
		1724	+
		1725	+ environment.date_format = "month_name"
		1726	+ environment.valid?
		1727	+ assert !environment.errors[:date_format.to_s].present?
		1728	+
		1729	+ environment.date_format = "past_time"
		1730	+ environment.valid?
		1731	+ assert !environment.errors[:date_format.to_s].present?
		1732	+ end
		1733	+
1706	end	1734	end