[noosfero/noosfero][master] 2 commits: Highlight correct string in form header

[Bráulio Bhavamitra]

Bráulio Bhavamitra pushed to master at Noosfero / noosfero


Commits:
58eb25a9 by dtygel at 2015-03-25T21:14:58Z
Highlight correct string in form header

- - - - -
1ab07b35 by Braulio Bhavamitra at 2015-03-26T11:22:49Z
events: be specific on rescue

- - - - -


2 changed files:

- app/controllers/public/events_controller.rb
- app/helpers/forms_helper.rb


Changes:

=====================================
app/controllers/public/events_controller.rb
=====================================
--- a/app/controllers/public/events_controller.rb
+++ b/app/controllers/public/events_controller.rb
@@ -7,7 +7,7 @@ class EventsController < PublicController
     @events = []
     begin
       @date = build_date params[:year], params[:month], params[:day]
-    rescue
+    rescue ArgumentError # invalid date
       return render_not_found
     end
 

=====================================
app/helpers/forms_helper.rb
=====================================
--- a/app/helpers/forms_helper.rb
+++ b/app/helpers/forms_helper.rb
@@ -99,10 +99,7 @@ module FormsHelper
   end
 
   def required_fields_message
-    content_tag('p', content_tag('span',
-      _("The <label class='pseudoformlabel'>highlighted</label> fields are mandatory."),
-      :class => 'required-field'
-    ))
+    content_tag('p', _("The %{highlighted} fields are mandatory.") % {highlighted: content_tag('span', _("highlighted"), :class=>'required-field')})
   end
 
   def options_for_select_with_title(container, selected = nil)


View it on GitLab: https://gitlab.com/noosfero/noosfero/compare/2b67cc84ec1cf9c5916cc4fefe4486290eb5ae39...1ab07b353c7566246641c9434a43d915b4951b1c
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://listas.softwarelivre.org/pipermail/noosfero-dev/attachments/20150326/4842f640/attachment-0001.html>