clean up translations

app/controllers/application_controller.rb

@@ -43,8 +43,6 @@ def render_error(title_key, body_key, status = :bad_request)
   end
 
   def default_url_options
-    # active_locale = I18n.locale == I18n.default_locale ? nil : I18n.locale
-    # { locale: active_locale }
     { locale: I18n.locale }
   end
 end

app/views/people/export_cv/_export_form.html.haml

@@ -1,6 +1,6 @@
 = form_with(url: person_path(format: 'odt'), method: 'get', data: {controller: "skills-filter"}) do |f|
   .mb-2.w-100
-    = f.label t(".location"), class: "form-label w-100"
+    = f.label :location, class: "form-label w-100"
     = f.collection_select :location, BranchAdress.all, :id, :short_name, {selected: (BranchAdress.find_by(default_branch_adress: true) || BranchAdress.first).id}, class: "form-select w-100"
   .mb-2.w-100.form-check.form-switch
     = f.check_box :includeCS, class: "form-check-input"
@@ -10,11 +10,11 @@
     = f.label t(".skills_by_level"), class: "form-check-label w-100"
 
     %div{"data-skills-filter-target": "container"}
-      = f.label t(".trainee"), "data-skills-filter-target": "label", class: "w-100"
+      = f.label t("global.people_skills.levels.trainee"), "data-skills-filter-target": "label", class: "w-100"
       = f.range_field :levelValue, min: 1, max: 5, value: 1, class: "form-range w-25", "data-action": "change->skills-filter#toggleLevel", "data-skills-filter-target": "switch"
   .mb-2.w-100.form-check.form-switch
     = f.check_box :anon, class: "form-check-input"
     = f.label t(".anonymised_cv"), class: "form-check-label w-100"
   .mb-1.mt-4
-    = f.submit t(".download"), class:"btn btn-primary"
+    = f.submit ti("link.download")
     = f.cancel person_path, "data-bs-dismiss":"modal"

app/views/people/index.html.haml

@@ -6,9 +6,9 @@
       = msg
 %div.mt-3
   %h1.d-inline-block.me-3.banner-text 
-    = t (".welcome")
+    = ti("welcome")
   =image_tag('logo.svg', width: '340', class: 'align-baseline test')
   %h4.banner-sub-text.mt-3 
-    = t(".choose_create_person") 
+    = ti("choose_create_person") 
 
 

app/views/people/new.html.haml

@@ -2,6 +2,6 @@
   =render partial:"people/search", :locals => { person: nil }
 %div.mt-2
   %div.profile-header.mw-100.border-bottom.mb-3
-    = t(".personals")
+    = ti("personals")
   %div{id: "#{dom_id Person.new}"}
     = render partial: "form", locals: {person: @person}

app/views/people/people_skills/_edit_form.html.haml

@@ -26,6 +26,6 @@
         = ff.hidden_field :skill_id
     %div.col-2
       - if ff.object.id.nil?
-        = ff.submit t(".rate"), { class: "btn btn-link" }
+        = ff.submit ti("rate"), { class: "btn btn-link" }
       - unless ff.object.unrated
-        = ff.submit t(".unrate"), { class: "btn btn-link", "data-action": "people-skills#unrateSkill"}
+        = ff.submit ti("unrate"), { class: "btn btn-link", "data-action": "people-skills#unrateSkill"}

app/views/people/people_skills/index.html.haml

@@ -7,7 +7,7 @@
         %div#default-skill-errors
         %div.d-flex.align-items-center.profile-header.justify-content-between.mb-2
           %div
-            = t(".new_skills_to_rate")
+            = ti("new_skills_to_rate")
             = "(#{not_rated_default_skills(@person).count})"
 
           = close_action_link person_people_skills_path(@person, no_default_skill_prompt: "")

app/views/people_skills/_search_form.html.haml

@@ -1,6 +1,6 @@
 %div.w-100.d-flex.flex-row.justify-content-start{data: {controller: "skills-level"}}
   %div.w-50.mt-3{"data-controller": "dropdown"}
-    = form.collection_select "skill_id[]", Skill.all.order(:title), :id, :title, {include_blank: t("helpers.select.prompt"), selected: filter_params.skill_of_row(row_number)}, data:{"dropdown-target": "dropdown"},  onchange: "this.form.submit()"
+    = form.collection_select "skill_id[]", Skill.all.order(:title), :id, :title, {prompt: true, selected: filter_params.skill_of_row(row_number)}, data:{"dropdown-target": "dropdown"},  onchange: "this.form.submit()"
   %div.w-25.d-flex.flex-column.align-items-center
     %label.form-label.text-gray.fs-6{"data-skills-level-target": "label"}= ti "people_skills.levels.#{ExpertiseTopicSkillValue.skill_levels.key(filter_params.level_of_row(row_number)-1)}"
     = form.range_field "level[]", min: 1, max: 5, value: filter_params.level_of_row(row_number), class: "form-range w-75",

config/locales/de.yml

@@ -132,6 +132,7 @@ de:
       export: Exportieren
       remove: Entfernen
       save_new: Speichern & Neu
+      download: Herunterladen
     navbar:
       cv_search: CV Suche
       profile: Profil
@@ -174,7 +175,6 @@ de:
       export_form:
         anonymised_cv: Anonymisierter CV
         competences_skills: Kernkompetenzen - Skills
-        download: Herunterladen
         location: 'Niederlassung (für Footer):'
         skills_by_level: Skills nach Level
         trainee: Trainee
@@ -204,14 +204,14 @@ de:
       new_profile: Neues Profil
       updated_at: Zuletzt bearbeitet
   people/people_skills:
-      edit_form:
-        rate: Bewerten
-        unrate: Nicht bewerten
-      index:
-        new_skills_to_rate: Neue Skills zur Bewertung
-      scroll_to_menu:
-        link:
-          add: Skill hinzufügen
+    edit_form:
+      rate: Bewerten
+      unrate: Nicht bewerten
+    index:
+      new_skills_to_rate: Neue Skills zur Bewertung
+    scroll_to_menu:
+      link:
+        add: Skill hinzufügen
   people_skills:
     global:
       link: