Translation improvements

app/views/application/_header.html.haml

@@ -3,9 +3,9 @@
 	- style = nil
 	- cover = nil
 	- figure = nil
-	- if capable_of(:css_mixblendmode) || ENV['RAILS_ENV'] == 'test'
+	- if capable_of(:css_mixblendmode)
 		- cover = "<div class=\"cover\" style=\"background-image: url(#{image})\"></div>"
-	- elsif capable_of(:svg)
+	- elsif capable_of(:svg) && Rails.env != 'test'
 		- banner_image = 'application/banner_image.svg'
 	- else
 		- style = "background-image: url(#{image})"

app/views/application/_login_confirmation_sent.html.haml

@@ -2,4 +2,4 @@
 	= columns(medium: 12) do
 		%h2=_'articles.permission_denied.headings.confirmation_sent','Confirmation Sent'
 	= columns(medium: 6) do
-		=paragraph _('articles.permission_denied.paragraphs.confirmation_sent', :p)
+		=m('articles.permission_denied.paragraphs.confirmation_sent', :p)

app/views/conferences/_email_confirm.html.haml

@@ -3,4 +3,4 @@
 		= columns(medium: 12) do
 			%h2=_'articles.conference_registration.headings.email_confirm','Please confirm your email address'
 		= columns(medium: 12) do
-			=paragraph _('articles.conference_registration.paragraphs.email_confirm', :p)
+			=m('articles.conference_registration.paragraphs.email_confirm', :p)

app/views/conferences/broadcast.html.haml

@@ -5,12 +5,12 @@
 			- if @email_sent == :yes
 				%p=_('articles.conference_registration.paragraphs.participants_emailed',"All participants of #{@this_conference.title} have been emailed.", :vars => {:conference_title => @this_conference.title})
 			- if @email_sent != :yes
-				=paragraph(_'articles.conference_registration.paragraphs.Email_Participants','This page is used to contact all participants. Text can be entered as [Markdown](http://daringfireball.net/projects/markdown/basics). Pressing \'test\' will send the email only to you, make sure you do this and use caution in general before pressing \'send\'')
+				=m('articles.conference_registration.paragraphs.Email_Participants','This page is used to contact all participants. Text can be entered as [Markdown](http://daringfireball.net/projects/markdown/basics). Pressing \'test\' will send the email only to you, make sure you do this and use caution in general before pressing \'send\'')
 			- if @email_sent == :yes || @email_sent == :preview
 				%h2=_'articles.conference_registration.headings.Preview'
 				.email-preview
 					%h3=@subject
-					=paragraph @content
+					=markdown @content
 			- if @email_sent != :yes
 				= form_tag broadcast_path(@this_conference.slug), class: 'composition' do
 					- if @email_sent == :preview

app/views/shared/_navbar.html.haml

@@ -1,19 +1,21 @@
-%nav#main-nav
-	= link_to '/', :class => 'logo' do
-		= svg_sprite('icons', "bb-icon-logo", "Logo")
-		= svg_sprite('icons', "bb-icon-logo-text", "Logo Text")
-	.nav
-		= nav_link home_path, (@conference ? @conference.title : 'Bike!Bike!')
-		= nav_link about_path, (_'page_titles.About_BikeBike')
-		= nav_link policy_path, (_'page_titles.Safe_Space_Policy')
-	.actions
-		- if @conference.registration_open
-			- if params[:action] != 'register' && !@registration
-				= link_to register_path(@conference.slug), class: [:button, :register] do
-					=_'conference.actions.Register'
-		- else
-			= render 'shared/donate_button', :email_address => (@conference.paypal_email_address || @conference.email_address)
-		- if current_user
-			= form_tag :logout, class: :logout do
-				=hidden_field_tag :url, request.fullpath
-				=button_tag :Log_out
+%nav
+	#main-nav
+		.inner-nav
+			= link_to '/', :class => 'logo' do
+				= svg_sprite('icons', "bb-icon-logo", "Logo")
+				= svg_sprite('icons', "bb-icon-logo-text", "Logo Text")
+			.nav
+				= nav_link home_path, (@conference ? @conference.title : 'Bike!Bike!')
+				= nav_link about_path, (_'page_titles.About_BikeBike')
+				= nav_link policy_path, (_'page_titles.Safe_Space_Policy')
+			.actions
+				- if @conference.registration_open
+					- if params[:action] != 'register' && !@registration
+						= link_to register_path(@conference.slug), class: [:button, :register] do
+							=_'conference.actions.Register'
+				- else
+					= render 'shared/donate_button', :email_address => (@conference.paypal_email_address || @conference.email_address)
+				- if current_user
+					= form_tag :logout, class: :logout do
+						=hidden_field_tag :url, request.fullpath
+						=button_tag :Log_out

app/views/user_mailer/broadcast.html.haml

@@ -1 +1 @@
-=paragraph @content
+=markdown @content

app/views/workshops/index.html.haml

@@ -13,7 +13,7 @@
 						%li
 							=link_to view_workshop_path(@this_conference.slug, w.id) do
 								%h4=_!(w.title)
-								=paragraph _!(w.info)
+								=markdown _!(w.info)
 			= link_to (_'actions.workshops.create','New Workshop'), create_workshop_path(@this_conference.slug), class: :button
 	= row do
 		%ul.workshop-previews
@@ -23,4 +23,4 @@
 						= columns(medium: 6) do
 							=link_to view_workshop_path(@this_conference.slug, w.id) do
 								%h4=_!(w.title)
-								=paragraph _!(w.info)
+								=markdown _!(w.info)

app/views/workshops/new.html.haml

@@ -4,7 +4,7 @@
 		= form_tag save_workshop_path(@this_conference.slug), class: 'composition' do
 			= (hidden_field_tag :workshop_id, @workshop.id) if @workshop
 			= columns(medium: 12) do
-				=paragraph(_'articles.workshops.paragraphs.new_workshop','Please accurately describe your workshop in detail. This will help hosts decide if they wish to add it to the schedule and when it should best be scheduled. Enter normal text but if you want to get fancy you can use [Markdown](http://daringfireball.net/projects/markdown/basics).').html_safe
+				=m('articles.workshops.paragraphs.new_workshop','Please accurately describe your workshop in detail. This will help hosts decide if they wish to add it to the schedule and when it should best be scheduled. Enter normal text but if you want to get fancy you can use [Markdown](http://daringfireball.net/projects/markdown/basics).')
 				.text-field.input-field.big
 					= label_tag :title
 					= text_field_tag :title, @title, :required => true

app/views/workshops/show.html.haml

@@ -3,7 +3,7 @@
 	= row do
 		= columns(medium: 12) do
 			%h2=_!@workshop.title
-			=paragraph _!(@workshop.info) || ''
+			=markdown _!(@workshop.info) || ''
 		= columns(medium: 6) do
 			%h3=_'articles.workshops.headings.facilitators'
 			.facilitators
@@ -28,7 +28,7 @@
 			- if @workshop.notes
 				= columns(medium: 12) do
 					%h3=_'articles.workshops.headings.notes','Notes'
-					=paragraph _!(@workshop.notes)
+					=markdown _!(@workshop.notes)
 		= columns(medium: 12) do
 			.actions
 				= (link_to (_'actions.workshops.Edit'), edit_workshop_path(@this_conference.slug, @workshop.id), :class => 'button modify') if @workshop.can_edit?(current_user)