From 42d2d0c269a35cc39b4a92ffaa10c96ac8fa957e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Saulo=20Mendon=C3=A7a?= <saulomendonca@gmail.com>
Date: Wed, 25 Oct 2017 21:29:28 -0200
Subject: [PATCH] Add translations and refactor i18n structure

---
 app/views/home/index.html.erb                 |  8 ++--
 app/views/institutions/index.html.erb         |  4 +-
 .../_table.html.erb                           | 12 +++---
 app/views/jobs/index.html.erb                 |  2 +-
 config/locales/pt-BR/general.yml              | 21 ++++++++++
 config/locales/pt-BR/models/institution.yml   |  1 +
 config/locales/pt-BR/models/job.yml           | 14 +++++++
 config/locales/pt-BR/models/subscription.yml  | 15 +++++++
 config/locales/pt-BR/models/user.yml          | 10 +++++
 config/locales/pt-BR/pt-BR.yml                | 39 -------------------
 10 files changed, 74 insertions(+), 52 deletions(-)
 create mode 100644 config/locales/pt-BR/models/job.yml
 create mode 100644 config/locales/pt-BR/models/subscription.yml
 create mode 100644 config/locales/pt-BR/models/user.yml

diff --git a/app/views/home/index.html.erb b/app/views/home/index.html.erb
index ac689b2..de5645f 100644
--- a/app/views/home/index.html.erb
+++ b/app/views/home/index.html.erb
@@ -11,13 +11,13 @@
                 <div class="card-content">
                   <h5><%=job.title%></h5>
                   <hr>
-                  <p><strong>description: </strong><%=job.description%></p>
+                  <p><strong><%= Job.human_attribute_name(:description) %>: </strong><%=job.description%></p>
                   <hr>
-                <p><strong>requirements: </strong><%=job.requirements%></p>
+                <p><strong><%= Job.human_attribute_name(:requirements) %>: </strong><%=job.requirements%></p>
                 </div>
                 <div class="card-action">
-                  <a href="#">Add as favorite</a>
-                  <%= link_to 'Apply for this job', new_job_subscription_path(job) %>
+                  <a href="#"><%=t("actions.add_as_favorite")%></a>
+                  <%= link_to t("actions.apply_for_this_job"), new_job_subscription_path(job) %>
                 </div>
               </div>
           </div>
diff --git a/app/views/institutions/index.html.erb b/app/views/institutions/index.html.erb
index e90d6f2..468a877 100644
--- a/app/views/institutions/index.html.erb
+++ b/app/views/institutions/index.html.erb
@@ -35,10 +35,10 @@
               <%= link_to edit_institution_path(institution), class: "btn-floating blue" do %>
                 <i class="material-icons">edit</i>
               <% end %>
-              <%= link_to institution, class: "btn btn-floating red", data: { confirm: "Are you sure?" } do %>
+              <%= link_to institution, class: "btn btn-floating red", data: { confirm:  t("messages.are_you_sure") } do %>
                 <i class="material-icons">highlight_remove</i>
               <% end %>
-              <%= link_to institution_jobs_path(institution), class: "btn-floating gray", title: "Jobs Posted" do %>
+              <%= link_to institution_jobs_path(institution), class: "btn-floating gray", title: Job.model_name.human(count: 2) do %>
                 <i class="material-icons">library_books</i>
               <% end %>
             </td>
diff --git a/app/views/institutions_subscriptions/_table.html.erb b/app/views/institutions_subscriptions/_table.html.erb
index 4a4c09f..ee4640c 100644
--- a/app/views/institutions_subscriptions/_table.html.erb
+++ b/app/views/institutions_subscriptions/_table.html.erb
@@ -2,11 +2,11 @@
     <table class="bordered highlight centered responsive-table">
         <thead>
         <tr>
-            <th><%= t('activerecord.models.job') %></th>
-            <th><%= t('activerecord.models.user') %></th>
-            <th><%= t('activerecord.attributes.subscription.cover_letter') %></th>
-            <th><%= t('activerecord.attributes.subscription.created_at') %></th>
-            <th><%= t('activerecord.attributes.subscription.status') %></th>
+            <th><%= Job.model_name.human(count: 1) %></th>
+            <th><%= User.model_name.human(count: 1) %></th>
+            <th><%= Subscription.human_attribute_name(:cover_letter) %></th>
+            <th><%= Subscription.human_attribute_name(:created_at) %></th>
+            <th><%= Subscription.human_attribute_name(:status) %></th>
         </tr>
         </thead>
         <tbody>
@@ -21,7 +21,7 @@
                 </a>
                 <div id="cover_letter_<%= subscription.id %>" class="modal">
                 <div class="modal-content">
-                    <h4><%= t('activerecord.attributes.subscription.cover_letter') %></h4>
+                    <h4><%= Subscription.human_attribute_name(:cover_letter) %></h4>
                     <p><%= subscription.cover_letter %></p>
                 </div>
                 <div class="modal-footer">
diff --git a/app/views/jobs/index.html.erb b/app/views/jobs/index.html.erb
index 1a2f52c..ba77704 100644
--- a/app/views/jobs/index.html.erb
+++ b/app/views/jobs/index.html.erb
@@ -35,7 +35,7 @@
               <%= link_to edit_institution_job_path(job.institution, job), class: "btn-floating blue" do %>
                 <i class="material-icons">edit</i>
               <% end %>
-              <%= link_to institution_job_path(job.institution, job), method: :delete, class: "btn btn-floating red", data: { confirm: "Are you sure?" } do %>
+              <%= link_to institution_job_path(job.institution, job), method: :delete, class: "btn btn-floating red", data: { confirm: t("messages.are_you_sure") } do %>
                 <i class="material-icons">highlight_remove</i>
               <% end %>
               <%= link_to institution_job_path(job.institution, job), class: "btn btn-floating gray" do %>
diff --git a/config/locales/pt-BR/general.yml b/config/locales/pt-BR/general.yml
index bf4e51f..5ed381e 100644
--- a/config/locales/pt-BR/general.yml
+++ b/config/locales/pt-BR/general.yml
@@ -3,6 +3,27 @@ pt-BR:
     add: Adicionar
     edit: Editar
     back: Voltar
+    close: "Fechar"
+    read: "Ler"
+    filter: "Filtrar"
+    approve: "Aprovar"
+    reject: "Rejeitar"
+    clear: "Limpar"
+    next_month: "Próximo mês"
+    prev_month: "Mês anterior"
+    select_month: "Selecione um mês"
+    select_year: "Selecione um ano"
+    add_as_favorite: "Adicionar aos favoritos"
+    apply_for_this_job: "Adicionar aos favoritos"
+
+  messages:
+    authorization: "Você não tem autorização para efetuar essa operação"
+    updated: "Alteração efetuada com sucesso"
+    error_update: "Não foi possível efetuar a alteração"
+    to: "até"
+    today: "Hoje"
+    are_you_sure: "Você tem certeza?"
+    
 
 
   institutions:
diff --git a/config/locales/pt-BR/models/institution.yml b/config/locales/pt-BR/models/institution.yml
index c833344..c929133 100644
--- a/config/locales/pt-BR/models/institution.yml
+++ b/config/locales/pt-BR/models/institution.yml
@@ -9,4 +9,5 @@ pt-BR:
         name: "Nome"
         description: "Descrição"
         category: "Categoria"
+        created_at: "Data de criação"
  
diff --git a/config/locales/pt-BR/models/job.yml b/config/locales/pt-BR/models/job.yml
new file mode 100644
index 0000000..15f56f2
--- /dev/null
+++ b/config/locales/pt-BR/models/job.yml
@@ -0,0 +1,14 @@
+pt-BR:
+  activerecord:
+    models:
+      job:
+        one: "Trabalho"
+        other: "Trabalhos"
+    attributes:
+      job:
+        title: "Título"
+        description: "Descrição"
+        requirements: "Requerimento"
+        start_date: "Data de início"
+        end_date: "Data de Fim"
+ 
diff --git a/config/locales/pt-BR/models/subscription.yml b/config/locales/pt-BR/models/subscription.yml
new file mode 100644
index 0000000..8f1bc66
--- /dev/null
+++ b/config/locales/pt-BR/models/subscription.yml
@@ -0,0 +1,15 @@
+pt-BR:
+  activerecord:
+    models:
+      subscription:
+        one: "Inscrição"
+        other: "Inscrições"
+    attributes:
+      subscription:
+        status: "Status"
+        created_at: "Data"
+        cover_letter: "Carta de apresentação"
+        statuses:
+          pending: "Pendente"
+          rejected: "Rejeitado"
+          approved: "Aprovado"
\ No newline at end of file
diff --git a/config/locales/pt-BR/models/user.yml b/config/locales/pt-BR/models/user.yml
new file mode 100644
index 0000000..b87d486
--- /dev/null
+++ b/config/locales/pt-BR/models/user.yml
@@ -0,0 +1,10 @@
+pt-BR:
+  activerecord:
+    models:
+      user:
+        one: "Usuário"
+        other: "Usuários"
+    attributes:
+      user:
+        email: "E-mail"
+        name: "Nome"
\ No newline at end of file
diff --git a/config/locales/pt-BR/pt-BR.yml b/config/locales/pt-BR/pt-BR.yml
index d9f519b..139f934 100644
--- a/config/locales/pt-BR/pt-BR.yml
+++ b/config/locales/pt-BR/pt-BR.yml
@@ -6,45 +6,6 @@ pt-BR:
         restrict_dependent_destroy:
           has_one: Não é possível excluir o registro pois existe um %{record} dependente
           has_many: Não é possível excluir o registro pois existem %{record} dependentes
-    models:
-      user: "Usuário"
-      subscription: "Inscrição"
-      job: "Trabalho"
-    attributes:
-      user:
-        email: "E-mail"
-        name: "Nome"
-      subscription:
-        status: "Status"
-        created_at: "Data"
-        cover_letter: "Carta de apresentação"
-        statuses:
-          pending: "Pendente"
-          rejected: "Rejeitado"
-          approved: "Aprovado"
-      job:
-        title: "Título"
-        description: "Descrição"
-        requirements: "Requerimento"
-        start_date: "Data de início"
-        end_date: "Data de Fim"
-  messages:
-    authorization: "Você não tem autorização para efetuar essa operação"
-    updated: "Alteração efetuada com sucesso"
-    error_update: "Não foi possível efetuar a alteração"
-    to: "até"
-    today: "Hoje"
-  actions:
-    close: "Fechar"
-    read: "Ler"
-    filter: "Filtrar"
-    approve: "Aprovar"
-    reject: "Rejeitar"
-    clear: "Limpar"
-    next_month: "Próximo mês"
-    prev_month: "Mês anterior"
-    select_month: "Selecione um mês"
-    select_year: "Selecione um ano"
   date:
     abbr_day_names:
     - Dom