Minor changes

Author: juopmu

app/assets/stylesheets/application.css

@@ -219,7 +219,7 @@ input[type=submit].button_link {
   margin-top: 100px;
 }
 
-#infoforcoaches {
+#info-for-coaches {
   background-color: #e7f6fd;
   text-align: center;
   border: thin solid #1e64b4;

app/views/applications/_info.html.erb

@@ -1,4 +1,4 @@
-<h1><%= @event.name %> <%= @event.installation_get_together_date.strftime("%d.%m.") %> & <%= l @event.scheduled_at %> </h1>
+<h1><%= @event.name %> <%= l @event.installation_get_together_date, format: :short %> & <%= l @event.scheduled_at %> </h1>
 
 <article>
   <% if @application.nil? || @application.errors.empty? %>

app/views/coach_applications/new.html.erb

@@ -1,26 +1,26 @@
-<h1><%= @event.name %> <%= @event.installation_get_together_date.strftime("%d.%m.") %> & <%= l @event.scheduled_at %> </h1>
-<section id="infoforcoaches">
-  <h4>Dear code curious (former Rails Girls Berlin) coaches,</h4>
+<h1><%= @event.name %> <%= l @event.installation_get_together_date, format: :short %> & <%= l @event.scheduled_at %> </h1>
+<section id="info-for-coaches">
+  <h3>Dear code curious (former Rails Girls Berlin) coaches,</h3>
   <p>We are looking for helping hands for our next <%= @event.name %>.</p>
-  <p>
-    <b>When:</b><br>
-    Coach the coaches:
-    <%= @event.coach_the_coaches_date.strftime("%A, %d.%m.%Y") %>,
-    <%= @event.coach_the_coaches_start_time.strftime("%H:%M") %> -
-    <%= @event.coach_the_coaches_end_time.strftime("%H:%M") %><br>
-    Installation get-together:
-    <%= @event.installation_get_together_date.strftime("%A, %d.%m.%Y") %>,
-    <%= @event.installation_get_together_start_time.strftime("%H:%M") %> -
-    <%= @event.installation_get_together_end_time.strftime("%H:%M") %><br>
-    Workshop day:
-    <%= @event.scheduled_at.strftime("%A, %d.%m.%Y") %>,
+  <div>
+    <p><b>When:</b></p>
+    <p>Coach the coaches:
+    <%= l @event.coach_the_coaches_date, format: :long %>,
+    <%= l @event.coach_the_coaches_start_time, format: :short %> -
+    <%= l @event.coach_the_coaches_end_time, format: :short %></p>
+    <p>Installation get-together:
+    <%= l @event.installation_get_together_date, format: :long %>,
+    <%= l @event.installation_get_together_start_time, format: :short %> -
+    <%= l @event.installation_get_together_end_time, format: :short %></p>
+    <p>Workshop day:
+    <%= l @event.scheduled_at, format: :long %>,
     <%= @event.start_time %> -
-    <%= @event.end_time %>
-  </p>
-  <p>
-    <b>Where for all events:</b><br>
+    <%= @event.end_time %></p>
+  </div>
+  <div>
+    <p><b>Where for all events:</b></p>
     <%= @event.place %>
-  </p>
+  </div>
 </section>
 
 <%= form_for [@event, @coach_application] do |f| %>

config/locales/en.yml

@@ -34,9 +34,12 @@ en:
   date:
     formats:
       default: "%d.%m.%Y"
+      short: "%d.%m."
+      long: "%A, %d.%m.%Y"
   time:
     formats:
       date: "%d.%m.%Y"
+      short: "%H:%M"
   activerecord:
     attributes:
       application/state:

test/controllers/applications_controller_test.rb

@@ -11,14 +11,14 @@ class ApplicationsControllerTest < ActionDispatch::IntegrationTest
     event = create(:event, name: "Test Me", place: "Testing", installation_get_together_date: 13.days.from_now, scheduled_at: 2.weeks.from_now, application_start: Date.yesterday, application_end: Date.today, confirmation_date: 12.days.from_now)
     get "/events/#{event.id}/applications/new"
     assert_response 200
-    assert_select "h1", "Test Me #{13.days.from_now.strftime("%d.%m.")} & #{2.weeks.from_now.strftime("%d.%m.%Y")}"
+    assert_select "h1", "Test Me #{i10n.l 13.days.from_now, format: :short} & #{i18n.l 2.weeks.from_now}"
   end
 
   test "Get an event on the day the application period starts" do
     event = create(:event, name: "Test Me", place: "Testing", installation_get_together_date: 13.days.from_now, scheduled_at: 2.weeks.from_now, application_start: Date.today, application_end: Date.tomorrow, confirmation_date: 12.days.from_now)
     get "/events/#{event.id}/applications/new"
     assert_response 200
-    assert_select "h1", "Test Me #{13.days.from_now.strftime("%d.%m.")} & #{2.weeks.from_now.strftime("%d.%m.%Y")}"
+    assert_select "h1", "Test Me #{i10n.l 13.days.from_now, format: :short} & #{i18n.l 2.weeks.from_now}"
   end
 
   test "Get an event before application starts" do