Multiples traductions

app/controllers/contestants_controller.rb

@@ -76,6 +76,8 @@ class ContestantsController < ApplicationController
   def convert_csv
     authorize @contest
 
+    @action_name = t("helpers.buttons.back")
+    @action_path = contest_path(@contest)
     @csv_import = CsvImport.find(params[:id])
     @content = JSON.parse(@csv_import.content)
     @form = Forms::CsvConversionForm.new
@@ -92,15 +94,17 @@ class ContestantsController < ApplicationController
       @content.each_with_index do |row, i|
         if all_params["row_#{i}".to_sym] == "1"
           if @form.email_column == -1
-            Contestant.create(name: row[@form.name_column], contest: @contest, time_seconds: 0)
+            Contestant.create(name: row[@form.name_column], contest: @contest)
           else
             logger.info("Email")
-            Contestant.create(name: row[@form.name_column], email: row[@form.email_column], contest: @contest, time_seconds: 0)
+            Contestant.create(name: row[@form.name_column], email: row[@form.email_column], contest: @contest)
           end
         end
       end
       redirect_to contest_path(@contest)
     else
+      @action_name = t("helpers.buttons.back")
+      @action_path = contest_path(@contest)
       render :convert_csv, status: :unprocessable_entity
     end
   end

app/controllers/contests_controller.rb

@@ -52,6 +52,8 @@ class ContestsController < ApplicationController
     if @contest.update(contest_params)
       redirect_to @contest
     else
+      @action_name = t("helpers.buttons.back")
+      @action_path = contest_path(@contest)
       render :edit, status: :unprocessable_entity
     end
   end

app/models/contestant.rb

@@ -23,14 +23,16 @@ class Contestant < ApplicationRecord
   belongs_to :contest
   has_many :completions, dependent: :destroy
 
-  before_create :initialize_time_seconds
+  before_validation :initialize_time_seconds_if_empty
 
   validates :name, presence: true
   validates :time_seconds, presence: true
 
   private
 
-  def initialize_time_seconds
-    self.time_seconds = 0
+  def initialize_time_seconds_if_empty
+    if !self.time_seconds
+      self.time_seconds = 0
+    end
   end
 end

app/models/puzzle.rb

@@ -24,5 +24,4 @@ class Puzzle < ApplicationRecord
   has_one_attached :image
 
   validates :name, presence: true
-  validates :brand, presence: true
 end

app/views/completions/edit.html.slim

@@ -1 +1 @@
-= render "form", contest: @contest, completion: @completion, submit_text: "Save", method: :patch, url: "/contests/#{@contest.id}/completions/#{@completion.id}"
+= render "form", contest: @contest, completion: @completion, submit_text: t("helpers.buttons.save"), method: :patch, url: "/contests/#{@contest.id}/completions/#{@completion.id}"

app/views/completions/new.html.slim

@@ -1 +1 @@
-= render "form", completion: @completion, submit_text: "Create", method: :post, url: "/contests/#{@contest.id}/completions"
+= render "form", completion: @completion, submit_text: t("helpers.buttons.create"), method: :post, url: "/contests/#{@contest.id}/completions"

app/views/contestants/_form.html.slim

@@ -13,11 +13,12 @@
       .form-floating
         = form.text_field :email, autocomplete: "off", class: "form-control"
         = form.label :email
-    .form-text Optional. Fill this only if you intend to send emails through this app.
+    .form-text
+      = t("activerecord.attributes.contestant.email_description")
   .row.mt-4
     .col
       - if method == :patch
-        = link_to "Delete", contest_contestant_path(contest, contestant), data: { turbo_method: :delete }, class: "btn btn-danger me-2"
+        = link_to t("helpers.buttons.delete"), contest_contestant_path(contest, contestant), data: { turbo_method: :delete }, class: "btn btn-danger me-2"
       = form.submit submit_text, class: "btn btn-primary"
 
 - if method == :patch
@@ -27,27 +28,35 @@
   table.table.table-striped.table-hover
     thead
       tr
+        - if @contest.puzzles.size > 1
+          th scope="col"
+            = t("activerecord.attributes.completion.display_time_from_start")
+          th scope="col"
+            = t("activerecord.attributes.completion.display_relative_time")
+        - else
+          th scope="col"
+            = t("activerecord.attributes.completion.display_time")
         th scope="col"
-          | Time since start
-        th scope="col"
-          | Relative time
-        th scope="col"
-          | Puzzle
+          = t("activerecord.attributes.completion.puzzle")
     tbody
       - @completions.each do |completion|
         tr scope="row"
           td
-            = completion.display_time_from_start 
+            = completion.display_time_from_start
+          - if @contest.puzzles.size > 1
+            td
+              = completion.display_relative_time
           td
-            = completion.display_relative_time
-          td
-            | #{completion.puzzle.name} - #{completion.puzzle.brand}
+            - if !completion.puzzle.brand.blank?
+              | #{completion.puzzle.name} - #{completion.puzzle.brand}
+            - else
+              | #{completion.puzzle.name}
           td
             a.btn.btn-sm.btn-secondary.me-2 href=edit_contest_completion_path(@contest, completion, contestant_id: contestant.id)
-              | Edit
-            = link_to "Delete", contest_completion_path(contest, completion, contestant_id: contestant.id),
+              = t("helpers.buttons.edit")
+            = link_to t("helpers.buttons.delete"), contest_completion_path(contest, completion, contestant_id: contestant.id),
                 data: { turbo_method: :delete }, class: "btn btn-sm btn-secondary"
   .row
     .col
       a.btn.btn-primary href=new_contest_completion_path(@contest, contestant_id: contestant.id)
-        | Add completion
+        = t("helpers.buttons.add")

app/views/contestants/convert_csv.html.slim

@@ -26,7 +26,7 @@
             - @content[0].each_with_index do |_, i|
               th scope="col"
                 = t("helpers.field") + "_#{i}"
-            th scope="col"
+            th scope="col" style="white-space: nowrap"
               = t("contestants.import.import_column")
         tbody
           - @content.each_with_index do |row, i|

app/views/contestants/edit.html.slim

@@ -1 +1 @@
-= render "form", contest: @contest, contestant: @contestant, submit_text: "Save", method: :patch, url: "/contests/#{@contest.id}/contestants/#{@contestant.id}"
+= render "form", contest: @contest, contestant: @contestant, submit_text: t("helpers.buttons.save"), method: :patch, url: "/contests/#{@contest.id}/contestants/#{@contestant.id}"

app/views/contestants/new.html.slim

@@ -1 +1 @@
-= render "form", contest: @contest, contestant: @contestant, submit_text: "Add", method: :post, url: "/contests/#{@contest.id}/contestants"
+= render "form", contest: @contest, contestant: @contestant, submit_text: t("helpers.buttons.add"), method: :post, url: "/contests/#{@contest.id}/contestants"

app/views/contests/show.html.slim

@@ -103,7 +103,7 @@
       thead
         tr
           th scope="col"
-            | Rank
+            = t("helpers.rank")
           th scope="col"
             = t("activerecord.attributes.contestant.name")
           th scope="col"