From c7c52eaabe23265ae8ef7c56a3add8f4ae56f24b Mon Sep 17 00:00:00 2001
From: franpb14 <franperejonbarrios@gmail.com>
Date: Fri, 24 Mar 2023 17:44:13 +0100
Subject: [PATCH 01/13] max 20 hours validation removed

---
 app/views/multi_transfers/steps/_set_params.html.erb | 4 +---
 app/views/transfers/new.html.erb                     | 4 +---
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/app/views/multi_transfers/steps/_set_params.html.erb b/app/views/multi_transfers/steps/_set_params.html.erb
index 9b79dc876..bad1aa3df 100644
--- a/app/views/multi_transfers/steps/_set_params.html.erb
+++ b/app/views/multi_transfers/steps/_set_params.html.erb
@@ -10,9 +10,7 @@
       input_html: {
         value: @transfer_hours,
         min: 0,
-        max: 20,
-        "data-rule-either-hours-minutes-informed" => "true",
-        "data-rule-range" => "[0,20]"
+        "data-rule-either-hours-minutes-informed" => "true"
       } %>
     <%= f.input :minutes,
       required: false,
diff --git a/app/views/transfers/new.html.erb b/app/views/transfers/new.html.erb
index b5f7163a3..b00a3379d 100644
--- a/app/views/transfers/new.html.erb
+++ b/app/views/transfers/new.html.erb
@@ -11,9 +11,7 @@
                 as: :integer,
                 input_html: {
                   min: 0,
-                  max: 20,
-                  "data-rule-either-hours-minutes-informed" => "true",
-                  "data-rule-range" => "[0,20]"
+                  "data-rule-either-hours-minutes-informed" => "true"
                 } %>
     <%= f.input :minutes,
                 as: :integer,

From 09e733811ec89f5714847a06e2dd7a17aca4c8fe Mon Sep 17 00:00:00 2001
From: franpb14 <franperejonbarrios@gmail.com>
Date: Fri, 24 Mar 2023 18:25:05 +0100
Subject: [PATCH 02/13] inquiries keys replaced with request

---
 config/locales/en.yml | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/config/locales/en.yml b/config/locales/en.yml
index fcec14fd7..0f0ec74d3 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -19,7 +19,7 @@ en:
         created_at: Created
         updated_at: Updated
       inquiry:
-        is_group: Group inquiry
+        is_group: Group request
       offer:
         is_group: Group offer
       organization:
@@ -95,8 +95,8 @@ en:
         one: Comment
         other: Comments
       inquiry:
-        one: Inquiry
-        other: Inquiries
+        one: Request
+        other: Requests
       offer:
         one: Offer
         other: Offers
@@ -137,7 +137,7 @@ en:
       demographics: Demographics data
       global_activity: Global activity
       inactive_users: Inactive users
-      inquiry_public_link: Inquiries public link
+      inquiry_public_link: Requests public link
       last_login: Last login
       offer_public_link: Offers public link
       organizations: Organizations
@@ -305,11 +305,11 @@ en:
     to: To
   inquiries:
     edit:
-      submit: Change inquiry
+      submit: Change request
     index:
-      new_inquiry: New inquiry
+      new_inquiry: New request
     new:
-      submit: Create inquiry
+      submit: Create request
   layouts:
     application:
       about: About TimeOverflow
@@ -440,7 +440,7 @@ en:
       delete_reason: Are you sure to delete this comment?
       movements: Movements
     post_form:
-      group_inquiry: Is it a group inquiry?
+      group_inquiry: Is it a group request?
       group_offer: Is it a group offer?
       you_can_use: You can use
   simple_form:

From 796675af642ad76d645e2f064236b22c16bfa59d Mon Sep 17 00:00:00 2001
From: franpb14 <franperejonbarrios@gmail.com>
Date: Fri, 24 Mar 2023 19:28:45 +0100
Subject: [PATCH 03/13] terms as keys, using Document but saving the key

---
 app/views/terms/show.html.erb | 4 ++--
 config/locales/en.yml         | 8 ++++++++
 2 files changed, 10 insertions(+), 2 deletions(-)

diff --git a/app/views/terms/show.html.erb b/app/views/terms/show.html.erb
index eed77c824..ab3243a23 100644
--- a/app/views/terms/show.html.erb
+++ b/app/views/terms/show.html.erb
@@ -1,10 +1,10 @@
 <header class="page-header">
   <h1>
-    <%= @document.title %>
+    <%= t(@document.title) %>
   </h1>
 </header>
 
-<%= m @document.content %>
+<%= m t(@document.content) %>
 
 <%= form_tag accept_terms_path, method: :post do %>
   <button class="btn" type="submit">
diff --git a/config/locales/en.yml b/config/locales/en.yml
index 0f0ec74d3..b46c922a5 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -113,6 +113,14 @@ en:
         one: User
         other: Users
   application:
+    term_conditions:
+      title: TimeOverflow Terms of Service
+      content: "TimeOverflow is a free software developed by volunteers with the aim of facilitating the functional processes of a Time Bank through information technologies. TimeOverflow allows Time Bank management by administrative users and facilitates contact among all users of a Time Bank.
+        \n\nThe Association for the Development of Time Banks, hereinafter ADBdT, is a non-profit association that works to develop Time Banks. The ADBdT offers an online installation of TimeOverflow and does so for free for any Time Bank that requests it. The use of this online application implies the prior acceptance, by the administrators who will manage the Time Bank and all its users, of these terms of service as well as their future modifications.
+        \n\nWe offer this online application hoping it will be very useful for Time Banks. However, we cannot offer ANY WARRANTY regarding its correct operation. The ADBdT maintains this online installation thanks to the contributions of its members and will continue to offer this service as long as it is possible. In this regard, the ADBdT is exempt from any type of responsibility regarding the operation, as well as access or availability of the download of said program.
+        \n\nThe ADBdT regularly backs up the TimeOverflow database to prevent possible accidental data loss and is committed to addressing any incident. Therefore, with the use of this application and inherent acceptance of these terms of service, Time Banks acknowledge having obtained the express consent of any of their members and/or users for the purposes of transfer and/or access to their data by third parties in order to provide the services derived from the use of TimeOverflow. Without prejudice to the foregoing, the ADBdT will only access the data punctually for statistical or technical purposes, always maintaining the anonymity of users.
+        \n\nThe ADBdT is not responsible for the privacy and protection of the data of users of a Time Bank. The responsible parties for personal data in a Time Bank are its administrators, who must have the express consent of their users and comply with Organic Law 15/1999 of December 13, on the protection of personal data. Any divergence that may arise with the ADBdT will be subject to Spanish regulations and will be dealt with before the Courts and Tribunals of Barcelona, with express waiver of any other jurisdiction or rule that may be applicable.
+        \n\nThis service is offered by the ADBdT with VAT number: G65875031 which can be contacted at its postal address Carrer de la Providència, 42 (Hotel Entitats) 08024 Barcelona or by email at adbdt.info@gmail.com."
     landing:
       button: Enter
       slogan: Let's value our time

From 1fc4a9378fb3c033ee27b56882704f996b7a20c7 Mon Sep 17 00:00:00 2001
From: franpb14 <franperejonbarrios@gmail.com>
Date: Fri, 24 Mar 2023 19:48:04 +0100
Subject: [PATCH 04/13] reset_password_instructions needed the .en

---
 ...tructions.html.erb => reset_password_instructions.en.html.erb} | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename app/views/devise/mailer/{reset_password_instructions.html.erb => reset_password_instructions.en.html.erb} (100%)

diff --git a/app/views/devise/mailer/reset_password_instructions.html.erb b/app/views/devise/mailer/reset_password_instructions.en.html.erb
similarity index 100%
rename from app/views/devise/mailer/reset_password_instructions.html.erb
rename to app/views/devise/mailer/reset_password_instructions.en.html.erb

From 433c53eb4ebe4f9969e5f326ed1e2ca69f966b12 Mon Sep 17 00:00:00 2001
From: franpb14 <franperejonbarrios@gmail.com>
Date: Sat, 1 Apr 2023 13:29:02 +0200
Subject: [PATCH 05/13] using i18n + bump devise

---
 Gemfile                                                  | 3 ++-
 Gemfile.lock                                             | 9 ++++++---
 .../devise/mailer/confirmation_instructions.ca.html.erb  | 5 -----
 .../devise/mailer/confirmation_instructions.es.html.erb  | 5 -----
 .../devise/mailer/confirmation_instructions.html.erb     | 5 -----
 .../mailer/reset_password_instructions.ca.html.erb       | 8 --------
 .../mailer/reset_password_instructions.en.html.erb       | 8 --------
 .../mailer/reset_password_instructions.es.html.erb       | 8 --------
 app/views/devise/mailer/unlock_instructions.ca.html.erb  | 7 -------
 app/views/devise/mailer/unlock_instructions.es.html.erb  | 7 -------
 app/views/devise/mailer/unlock_instructions.html.erb     | 7 -------
 11 files changed, 8 insertions(+), 64 deletions(-)
 delete mode 100644 app/views/devise/mailer/confirmation_instructions.ca.html.erb
 delete mode 100644 app/views/devise/mailer/confirmation_instructions.es.html.erb
 delete mode 100644 app/views/devise/mailer/confirmation_instructions.html.erb
 delete mode 100644 app/views/devise/mailer/reset_password_instructions.ca.html.erb
 delete mode 100644 app/views/devise/mailer/reset_password_instructions.en.html.erb
 delete mode 100644 app/views/devise/mailer/reset_password_instructions.es.html.erb
 delete mode 100644 app/views/devise/mailer/unlock_instructions.ca.html.erb
 delete mode 100644 app/views/devise/mailer/unlock_instructions.es.html.erb
 delete mode 100644 app/views/devise/mailer/unlock_instructions.html.erb

diff --git a/Gemfile b/Gemfile
index 92c41c382..c747e619b 100644
--- a/Gemfile
+++ b/Gemfile
@@ -12,7 +12,8 @@ gem 'has_scope', '~> 0.7.2'
 gem 'pundit', '~> 2.1.0'
 gem 'pg', '~> 1.4'
 gem 'json_translate', '~> 4.0.0'
-gem 'devise', '~> 4.7.1'
+gem 'devise', '~> 4.9.1'
+gem 'devise-i18n', '~> 1.11.0'
 gem 'http_accept_language', '~> 2.1.1'
 gem 'unicorn', '~> 5.5.1'
 gem 'kaminari', '~> 1.2.1'
diff --git a/Gemfile.lock b/Gemfile.lock
index 2e0919b25..9f8e0a3c4 100644
--- a/Gemfile.lock
+++ b/Gemfile.lock
@@ -95,7 +95,7 @@ GEM
       aws-sigv4 (~> 1.1)
     aws-sigv4 (1.2.3)
       aws-eventstream (~> 1, >= 1.0.2)
-    bcrypt (3.1.16)
+    bcrypt (3.1.18)
     bindex (0.8.1)
     bootsnap (1.12.0)
       msgpack (~> 1.2)
@@ -131,12 +131,14 @@ GEM
     crass (1.0.6)
     database_cleaner (1.8.5)
     date (3.3.3)
-    devise (4.7.3)
+    devise (4.9.1)
       bcrypt (~> 3.0)
       orm_adapter (~> 0.1)
       railties (>= 4.1.0)
       responders
       warden (~> 1.2.3)
+    devise-i18n (1.11.0)
+      devise (>= 4.9.0)
     diff-lcs (1.4.4)
     docile (1.3.5)
     domain_name (0.5.20190701)
@@ -451,7 +453,8 @@ DEPENDENCIES
   capistrano-rbenv (~> 2.1)
   capybara (~> 3.29)
   database_cleaner (~> 1.8.5)
-  devise (~> 4.7.1)
+  devise (~> 4.9.1)
+  devise-i18n (~> 1.11.0)
   dotenv-rails (~> 2.7.1)
   fabrication (~> 2.20)
   faker (~> 2.15)
diff --git a/app/views/devise/mailer/confirmation_instructions.ca.html.erb b/app/views/devise/mailer/confirmation_instructions.ca.html.erb
deleted file mode 100644
index 3921f3157..000000000
--- a/app/views/devise/mailer/confirmation_instructions.ca.html.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<p>Benvingut <%= @email %>!</p>
-
-<p>Confirma el teu compte fent clic en el següent enllaç:</p>
-
-<p><%= link_to 'Confirmar compte', confirmation_url(@resource, :confirmation_token => @token) %></p>
diff --git a/app/views/devise/mailer/confirmation_instructions.es.html.erb b/app/views/devise/mailer/confirmation_instructions.es.html.erb
deleted file mode 100644
index 2343f5619..000000000
--- a/app/views/devise/mailer/confirmation_instructions.es.html.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<p>¡Bienvenido <%= @email %>!</p>
-
-<p>Confirma tu cuenta haciendo click en el siguiente link:</p>
-
-<p><%= link_to 'Confirmar cuenta', confirmation_url(@resource, :confirmation_token => @token) %></p>
diff --git a/app/views/devise/mailer/confirmation_instructions.html.erb b/app/views/devise/mailer/confirmation_instructions.html.erb
deleted file mode 100644
index 36670f913..000000000
--- a/app/views/devise/mailer/confirmation_instructions.html.erb
+++ /dev/null
@@ -1,5 +0,0 @@
-<p>Welcome <%= @email %>!</p>
-
-<p>You can confirm your account email through the link below:</p>
-
-<p><%= link_to 'Confirm my account', confirmation_url(@resource, :confirmation_token => @token) %></p>
diff --git a/app/views/devise/mailer/reset_password_instructions.ca.html.erb b/app/views/devise/mailer/reset_password_instructions.ca.html.erb
deleted file mode 100644
index bd2808b2a..000000000
--- a/app/views/devise/mailer/reset_password_instructions.ca.html.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<p>Hola <%= @resource.email %>!</p>
-
-<p>S'ha sol·licitat el canvi de la teva contrasenya. Pots canviar-la a travès del següent enllaç.</p>
-
-<p><%= link_to 'Canviar contrasenya', edit_password_url(@resource, :reset_password_token => @token) %></p>
-
-<p>Si tu no has sol·licitat el canvi de contrasenya, no facis cas d'aquest correu.</p>
-<p>La teva contrasenya no canviarà fins que no facis clic a l'enllaç.</p>
diff --git a/app/views/devise/mailer/reset_password_instructions.en.html.erb b/app/views/devise/mailer/reset_password_instructions.en.html.erb
deleted file mode 100644
index 93de6d05d..000000000
--- a/app/views/devise/mailer/reset_password_instructions.en.html.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<p>Hello <%= @resource.email %>!</p>
-
-<p>Someone has requested a link to change your password. You can do this through the link below.</p>
-
-<p><%= link_to 'Change my password', edit_password_url(@resource, :reset_password_token => @token) %></p>
-
-<p>If you didn't request this, please ignore this email.</p>
-<p>Your password won't change until you access the link above and create a new one.</p>
diff --git a/app/views/devise/mailer/reset_password_instructions.es.html.erb b/app/views/devise/mailer/reset_password_instructions.es.html.erb
deleted file mode 100644
index 1f5716d49..000000000
--- a/app/views/devise/mailer/reset_password_instructions.es.html.erb
+++ /dev/null
@@ -1,8 +0,0 @@
-<p>Hola <%= @resource.email %>!</p>
-
-<p>Se ha solicitado el cambio de tu contraseña. Puedes cambiarlo a través del siguiente enlace.</p>
-
-<p><%= link_to 'Cambiar mi contraseña', edit_password_url(@resource, :reset_password_token => @token) %></p>
-
-<p>Si tu no has solicitado un cambio de contraseña ignora este mail.</p>
-<p>Tu password no cambiará hasta que no accedas al link.</p>
diff --git a/app/views/devise/mailer/unlock_instructions.ca.html.erb b/app/views/devise/mailer/unlock_instructions.ca.html.erb
deleted file mode 100644
index c1a3ce628..000000000
--- a/app/views/devise/mailer/unlock_instructions.ca.html.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<p>Hola <%= @resource.email %>!</p>
-
-<p>El teu compte ha estat bloquejat després de diversos intents d'entrada.</p>
-
-<p>Per desbloquejar el teu compte accedeix al següent enllaç:</p>
-
-<p><%= link_to 'Desbloquejar compte', unlock_url(@resource, :unlock_token => @token) %></p>
diff --git a/app/views/devise/mailer/unlock_instructions.es.html.erb b/app/views/devise/mailer/unlock_instructions.es.html.erb
deleted file mode 100644
index 607993de4..000000000
--- a/app/views/devise/mailer/unlock_instructions.es.html.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<p>¡Hola <%= @resource.email %>!</p>
-
-<p>Tu cuenta ha sido bloqueada después de varios intentos fallidos de acceso.</p>
-
-<p>Accede al siguiente link para desbloquear tu cuenta:</p>
-
-<p><%= link_to 'Desbloquear mi cuenta', unlock_url(@resource, :unlock_token => @token) %></p>
diff --git a/app/views/devise/mailer/unlock_instructions.html.erb b/app/views/devise/mailer/unlock_instructions.html.erb
deleted file mode 100644
index f59615fed..000000000
--- a/app/views/devise/mailer/unlock_instructions.html.erb
+++ /dev/null
@@ -1,7 +0,0 @@
-<p>Hello <%= @resource.email %>!</p>
-
-<p>Your account has been locked due to an excessive number of unsuccessful sign in attempts.</p>
-
-<p>Click the link below to unlock your account:</p>
-
-<p><%= link_to 'Unlock my account', unlock_url(@resource, :unlock_token => @token) %></p>

From 88d89002f44de9dd0cb9ec9466532deb3d143379 Mon Sep 17 00:00:00 2001
From: franpb14 <franperejonbarrios@gmail.com>
Date: Sat, 1 Apr 2023 15:38:22 +0200
Subject: [PATCH 06/13] terms & conditions translatable using json_translate

---
 app/admin/document.rb                         | 20 +++++++++++++------
 app/models/document.rb                        |  2 ++
 app/views/terms/show.html.erb                 |  4 ++--
 .../20230401114456_make_terms_translatable.rb | 15 ++++++++++++++
 db/structure.sql                              |  7 ++++---
 5 files changed, 37 insertions(+), 11 deletions(-)
 create mode 100644 db/migrate/20230401114456_make_terms_translatable.rb

diff --git a/app/admin/document.rb b/app/admin/document.rb
index 804b8a8fe..4d599b6a5 100644
--- a/app/admin/document.rb
+++ b/app/admin/document.rb
@@ -1,5 +1,5 @@
 ActiveAdmin.register Document do
-  permit_params *Document.attribute_names
+  permit_params *Document.attribute_names, :title, :content
 
   index do
     id_column
@@ -16,9 +16,17 @@
         t.documentable
       end
       row :label
-      row :title
-      row :content do
-        raw RDiscount.new(t.content).to_html
+      row :title_translations do
+        t.title_translations.map do |locale, translation|
+          tag.strong("#{I18n.t("locales.#{locale}", locale: locale)}: ") +
+          tag.span(translation)
+        end.join(" | ").html_safe
+      end
+      row :content_translations do
+        t.content_translations.map do |locale, translation|
+          tag.strong("#{I18n.t("locales.#{locale}", locale: locale)}: ") +
+          tag.span(raw RDiscount.new(translation).to_html)
+        end.join("\n").html_safe
       end
     end
   end
@@ -26,8 +34,8 @@
   form do |f|
     f.inputs do
       f.input :label
-      f.input :title, as: :string
-      f.input :content
+      f.input :title, as: :text
+      f.input :content, as: :text
     end
     f.actions
   end
diff --git a/app/models/document.rb b/app/models/document.rb
index 6cbb0a814..ff42de6c9 100644
--- a/app/models/document.rb
+++ b/app/models/document.rb
@@ -1,6 +1,8 @@
 class Document < ApplicationRecord
   belongs_to :documentable, polymorphic: true, optional: true
 
+  translates :title, :content
+
   def self.terms_and_conditions
     where(label: "t&c", documentable_id: nil).first
   end
diff --git a/app/views/terms/show.html.erb b/app/views/terms/show.html.erb
index ab3243a23..eed77c824 100644
--- a/app/views/terms/show.html.erb
+++ b/app/views/terms/show.html.erb
@@ -1,10 +1,10 @@
 <header class="page-header">
   <h1>
-    <%= t(@document.title) %>
+    <%= @document.title %>
   </h1>
 </header>
 
-<%= m t(@document.content) %>
+<%= m @document.content %>
 
 <%= form_tag accept_terms_path, method: :post do %>
   <button class="btn" type="submit">
diff --git a/db/migrate/20230401114456_make_terms_translatable.rb b/db/migrate/20230401114456_make_terms_translatable.rb
new file mode 100644
index 000000000..502b9a7d6
--- /dev/null
+++ b/db/migrate/20230401114456_make_terms_translatable.rb
@@ -0,0 +1,15 @@
+class MakeTermsTranslatable < ActiveRecord::Migration[6.1]
+  def up
+    rename_column :documents, :title, :title_translations
+    rename_column :documents, :content, :content_translations
+    change_column :documents, :title_translations, :jsonb, default: {}, null: false, using: 'title_translations::jsonb'
+    change_column :documents, :content_translations, :jsonb, default: {}, null: false, using: 'content_translations::jsonb'
+  end
+
+  def down
+    rename_column :documents, :title_translations, :title
+    rename_column :documents, :content_translations, :content
+    change_column :documents, :title, :text, default: nil, null: true, using: 'title::text'
+    change_column :documents, :content, :text, default: nil, null: true, using: 'content::text'
+  end
+end
diff --git a/db/structure.sql b/db/structure.sql
index 427b1b366..5387ee604 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -340,8 +340,8 @@ CREATE TABLE public.documents (
     id integer NOT NULL,
     documentable_id integer,
     documentable_type character varying,
-    title text,
-    content text,
+    title_translations jsonb DEFAULT '{}'::jsonb NOT NULL,
+    content_translations jsonb DEFAULT '{}'::jsonb NOT NULL,
     label character varying,
     created_at timestamp without time zone,
     updated_at timestamp without time zone
@@ -1367,6 +1367,7 @@ INSERT INTO "schema_migrations" (version) VALUES
 ('20210503201944'),
 ('20221016192111'),
 ('20230312231058'),
-('20230314233504');
+('20230314233504'),
+('20230401114456');
 
 

From efaf165089b681f83979e6c12d4438b7b318a018 Mon Sep 17 00:00:00 2001
From: franpb14 <franperejonbarrios@gmail.com>
Date: Sat, 1 Apr 2023 15:48:36 +0200
Subject: [PATCH 07/13] changes with localeapp pull

---
 config/locales/en.yml | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/config/locales/en.yml b/config/locales/en.yml
index b46c922a5..0f0ec74d3 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -113,14 +113,6 @@ en:
         one: User
         other: Users
   application:
-    term_conditions:
-      title: TimeOverflow Terms of Service
-      content: "TimeOverflow is a free software developed by volunteers with the aim of facilitating the functional processes of a Time Bank through information technologies. TimeOverflow allows Time Bank management by administrative users and facilitates contact among all users of a Time Bank.
-        \n\nThe Association for the Development of Time Banks, hereinafter ADBdT, is a non-profit association that works to develop Time Banks. The ADBdT offers an online installation of TimeOverflow and does so for free for any Time Bank that requests it. The use of this online application implies the prior acceptance, by the administrators who will manage the Time Bank and all its users, of these terms of service as well as their future modifications.
-        \n\nWe offer this online application hoping it will be very useful for Time Banks. However, we cannot offer ANY WARRANTY regarding its correct operation. The ADBdT maintains this online installation thanks to the contributions of its members and will continue to offer this service as long as it is possible. In this regard, the ADBdT is exempt from any type of responsibility regarding the operation, as well as access or availability of the download of said program.
-        \n\nThe ADBdT regularly backs up the TimeOverflow database to prevent possible accidental data loss and is committed to addressing any incident. Therefore, with the use of this application and inherent acceptance of these terms of service, Time Banks acknowledge having obtained the express consent of any of their members and/or users for the purposes of transfer and/or access to their data by third parties in order to provide the services derived from the use of TimeOverflow. Without prejudice to the foregoing, the ADBdT will only access the data punctually for statistical or technical purposes, always maintaining the anonymity of users.
-        \n\nThe ADBdT is not responsible for the privacy and protection of the data of users of a Time Bank. The responsible parties for personal data in a Time Bank are its administrators, who must have the express consent of their users and comply with Organic Law 15/1999 of December 13, on the protection of personal data. Any divergence that may arise with the ADBdT will be subject to Spanish regulations and will be dealt with before the Courts and Tribunals of Barcelona, with express waiver of any other jurisdiction or rule that may be applicable.
-        \n\nThis service is offered by the ADBdT with VAT number: G65875031 which can be contacted at its postal address Carrer de la Providència, 42 (Hotel Entitats) 08024 Barcelona or by email at adbdt.info@gmail.com."
     landing:
       button: Enter
       slogan: Let's value our time

From fe85595271d3f41c5736e20966e7d6dbe115abb0 Mon Sep 17 00:00:00 2001
From: franpb14 <franperejonbarrios@gmail.com>
Date: Sat, 1 Apr 2023 17:14:30 +0200
Subject: [PATCH 08/13] add column > migrate data > remove column

---
 .../20230401114456_make_terms_translatable.rb | 22 ++++++++++++-------
 db/structure.sql                              |  6 ++---
 2 files changed, 17 insertions(+), 11 deletions(-)

diff --git a/db/migrate/20230401114456_make_terms_translatable.rb b/db/migrate/20230401114456_make_terms_translatable.rb
index 502b9a7d6..2c6bb0243 100644
--- a/db/migrate/20230401114456_make_terms_translatable.rb
+++ b/db/migrate/20230401114456_make_terms_translatable.rb
@@ -1,15 +1,21 @@
 class MakeTermsTranslatable < ActiveRecord::Migration[6.1]
   def up
-    rename_column :documents, :title, :title_translations
-    rename_column :documents, :content, :content_translations
-    change_column :documents, :title_translations, :jsonb, default: {}, null: false, using: 'title_translations::jsonb'
-    change_column :documents, :content_translations, :jsonb, default: {}, null: false, using: 'content_translations::jsonb'
+    add_column :documents, :title_translations, :jsonb, default: {}, null: false
+    add_column :documents, :content_translations, :jsonb, default: {}, null: false
+    Document.find_each do |doc|
+      doc.update_columns(title_translations: { es: doc[:title] }.to_json, content_translations: { es: doc[:content] }.to_json)
+    end
+    remove_column :documents, :title
+    remove_column :documents, :content
   end
 
   def down
-    rename_column :documents, :title_translations, :title
-    rename_column :documents, :content_translations, :content
-    change_column :documents, :title, :text, default: nil, null: true, using: 'title::text'
-    change_column :documents, :content, :text, default: nil, null: true, using: 'content::text'
+    add_column :documents, :title, :text
+    add_column :documents, :content, :text
+    Document.find_each do |doc|
+      doc.update_columns(title: doc.title_translations["es"], content: doc.content_translations["es"])
+    end
+    remove_column :documents, :title_translations
+    remove_column :documents, :content_translations
   end
 end
diff --git a/db/structure.sql b/db/structure.sql
index 5387ee604..7239a85a3 100644
--- a/db/structure.sql
+++ b/db/structure.sql
@@ -340,11 +340,11 @@ CREATE TABLE public.documents (
     id integer NOT NULL,
     documentable_id integer,
     documentable_type character varying,
-    title_translations jsonb DEFAULT '{}'::jsonb NOT NULL,
-    content_translations jsonb DEFAULT '{}'::jsonb NOT NULL,
     label character varying,
     created_at timestamp without time zone,
-    updated_at timestamp without time zone
+    updated_at timestamp without time zone,
+    title_translations jsonb DEFAULT '{}'::jsonb NOT NULL,
+    content_translations jsonb DEFAULT '{}'::jsonb NOT NULL
 );
 
 

From b0c8154820f080dfbabd71d0d9252f82f954a3ce Mon Sep 17 00:00:00 2001
From: Marc Anguera Insa <srmarc.ai@gmail.com>
Date: Sat, 1 Apr 2023 17:41:55 +0200
Subject: [PATCH 09/13] [admin] refactor render attributes with translations

---
 app/admin/category.rb              |  5 +----
 app/admin/document.rb              | 10 ++--------
 app/helpers/active_admin_helper.rb |  8 ++++++++
 app/views/shared/_post.html.erb    |  2 +-
 4 files changed, 12 insertions(+), 13 deletions(-)
 create mode 100644 app/helpers/active_admin_helper.rb

diff --git a/app/admin/category.rb b/app/admin/category.rb
index ed3b8ca15..5f9695404 100644
--- a/app/admin/category.rb
+++ b/app/admin/category.rb
@@ -21,10 +21,7 @@
       row :updated_at
       row :icon_name
       row :name_translations do
-        cat.name_translations.map do |locale, translation|
-          tag.strong("#{I18n.t("locales.#{locale}", locale: locale)}: ") +
-          tag.span(translation)
-        end.join(" | ").html_safe
+        render_translations(cat.name_translations, " | ")
       end
     end
   end
diff --git a/app/admin/document.rb b/app/admin/document.rb
index 9c5809c06..79d7d8a08 100644
--- a/app/admin/document.rb
+++ b/app/admin/document.rb
@@ -17,16 +17,10 @@
       end
       row :label
       row :title_translations do
-        t.title_translations.map do |locale, translation|
-          tag.strong("#{I18n.t("locales.#{locale}", locale: locale)}: ") +
-          tag.span(translation)
-        end.join(" | ").html_safe
+        render_translations(t.title_translations, " | ")
       end
       row :content_translations do
-        t.content_translations.map do |locale, translation|
-          tag.strong("#{I18n.t("locales.#{locale}", locale: locale)}: ") +
-          tag.span(translation)
-        end.join("<br>").html_safe
+        render_translations(t.content_translations, "<br>")
       end
     end
   end
diff --git a/app/helpers/active_admin_helper.rb b/app/helpers/active_admin_helper.rb
new file mode 100644
index 000000000..04e3a1132
--- /dev/null
+++ b/app/helpers/active_admin_helper.rb
@@ -0,0 +1,8 @@
+module ActiveAdminHelper
+  def render_translations(attribute, joiner = " ")
+     attribute.map do |locale, translation|
+      tag.strong("#{I18n.t("locales.#{locale}", locale: locale)}: ") +
+      tag.span(translation)
+    end.join(joiner).html_safe
+  end
+end
diff --git a/app/views/shared/_post.html.erb b/app/views/shared/_post.html.erb
index bd56189f6..20fe064a2 100644
--- a/app/views/shared/_post.html.erb
+++ b/app/views/shared/_post.html.erb
@@ -64,7 +64,7 @@
   <div class="col-md-9 lead">
     <div class="panel panel-info break-word">
       <div class="panel-body post-description">
-        <%= m post.rendered_description.to_html.html_safe %>
+        <%= m post.rendered_description.to_html %>
       </div>
     </div>
   </div>

From 971638039159fc9090acdcd497895049969c6861 Mon Sep 17 00:00:00 2001
From: Marc Anguera Insa <srmarc.ai@gmail.com>
Date: Sat, 1 Apr 2023 17:53:31 +0200
Subject: [PATCH 10/13] [admin] explicit list of permit_params

---
 app/admin/document.rb     | 2 +-
 app/admin/organization.rb | 3 ++-
 app/admin/post.rb         | 3 ++-
 app/admin/user.rb         | 4 ++--
 4 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/app/admin/document.rb b/app/admin/document.rb
index 79d7d8a08..7acfc62ca 100644
--- a/app/admin/document.rb
+++ b/app/admin/document.rb
@@ -1,5 +1,5 @@
 ActiveAdmin.register Document do
-  permit_params *Document.attribute_names, :title, :content
+  permit_params :label, :title, :content
 
   index do
     id_column
diff --git a/app/admin/organization.rb b/app/admin/organization.rb
index a8d75a707..825cb1937 100644
--- a/app/admin/organization.rb
+++ b/app/admin/organization.rb
@@ -46,5 +46,6 @@ def destroy
   filter :city, as: :select, collection: -> { Organization.pluck(:city).uniq }
   filter :neighborhood
 
-  permit_params *Organization.attribute_names
+  permit_params :name, :email, :web, :phone, :city, :neighborhood,
+    :address, :description, :public_opening_times
 end
diff --git a/app/admin/post.rb b/app/admin/post.rb
index 5aef7fe3c..43c32daf2 100644
--- a/app/admin/post.rb
+++ b/app/admin/post.rb
@@ -30,7 +30,8 @@
     f.actions
   end
 
-  permit_params :type, :tag_list, *Post.attribute_names
+  permit_params :type, :tag_list, :title, :category_id, :user_id,
+    :description, :organization_id, :active, :is_group
 
   filter :type, as: :select, collection: -> { Post.subclasses }
   filter :id
diff --git a/app/admin/user.rb b/app/admin/user.rb
index ff4690e2b..ada5346ee 100644
--- a/app/admin/user.rb
+++ b/app/admin/user.rb
@@ -77,6 +77,6 @@
     end
   end
 
-  permit_params *User.attribute_names,
-                members_attributes: Member.attribute_names
+  permit_params :username, :email, :phone, :postcode, :gender,
+    members_attributes: [:organization_id, :active, :manager]
 end

From 11931769e35b44917827c69662fe01ecd0d41cc1 Mon Sep 17 00:00:00 2001
From: Marc Anguera Insa <srmarc.ai@gmail.com>
Date: Sat, 1 Apr 2023 18:03:32 +0200
Subject: [PATCH 11/13] improve coverage

---
 spec/helpers/active_admin_helper_spec.rb | 8 ++++++++
 1 file changed, 8 insertions(+)
 create mode 100644 spec/helpers/active_admin_helper_spec.rb

diff --git a/spec/helpers/active_admin_helper_spec.rb b/spec/helpers/active_admin_helper_spec.rb
new file mode 100644
index 000000000..03d5e3e26
--- /dev/null
+++ b/spec/helpers/active_admin_helper_spec.rb
@@ -0,0 +1,8 @@
+RSpec.describe ActiveAdminHelper do
+  describe '#render_translations' do
+    it 'renders all available translations for the given attribute' do
+      attr_with_translations = { en: 'hi', es: 'hola' }
+      expect(helper.render_translations(attr_with_translations)).to eq("<strong>English: </strong><span>hi</span> <strong>Español: </strong><span>hola</span>")
+    end
+  end
+end

From af02e244d6498670430237ffa4286561872c81de Mon Sep 17 00:00:00 2001
From: Marc Anguera Insa <srmarc.ai@gmail.com>
Date: Sat, 1 Apr 2023 18:26:13 +0200
Subject: [PATCH 12/13] fix migration

---
 db/migrate/20230401114456_make_terms_translatable.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/db/migrate/20230401114456_make_terms_translatable.rb b/db/migrate/20230401114456_make_terms_translatable.rb
index 2c6bb0243..c03e9ed2c 100644
--- a/db/migrate/20230401114456_make_terms_translatable.rb
+++ b/db/migrate/20230401114456_make_terms_translatable.rb
@@ -3,7 +3,7 @@ def up
     add_column :documents, :title_translations, :jsonb, default: {}, null: false
     add_column :documents, :content_translations, :jsonb, default: {}, null: false
     Document.find_each do |doc|
-      doc.update_columns(title_translations: { es: doc[:title] }.to_json, content_translations: { es: doc[:content] }.to_json)
+      doc.update_columns(title_translations: { es: doc[:title] }, content_translations: { es: doc[:content] })
     end
     remove_column :documents, :title
     remove_column :documents, :content

From a95d9827a69b5c1cf73e9a89c194931c6f79c46b Mon Sep 17 00:00:00 2001
From: Marc Anguera Insa <srmarc.ai@gmail.com>
Date: Sat, 1 Apr 2023 19:07:26 +0200
Subject: [PATCH 13/13] change default value

---
 app/admin/category.rb                    | 2 +-
 app/admin/document.rb                    | 2 +-
 app/helpers/active_admin_helper.rb       | 2 +-
 spec/helpers/active_admin_helper_spec.rb | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/app/admin/category.rb b/app/admin/category.rb
index 5f9695404..9a80ac39d 100644
--- a/app/admin/category.rb
+++ b/app/admin/category.rb
@@ -21,7 +21,7 @@
       row :updated_at
       row :icon_name
       row :name_translations do
-        render_translations(cat.name_translations, " | ")
+        render_translations(cat.name_translations)
       end
     end
   end
diff --git a/app/admin/document.rb b/app/admin/document.rb
index 7acfc62ca..55c9d0fa8 100644
--- a/app/admin/document.rb
+++ b/app/admin/document.rb
@@ -17,7 +17,7 @@
       end
       row :label
       row :title_translations do
-        render_translations(t.title_translations, " | ")
+        render_translations(t.title_translations)
       end
       row :content_translations do
         render_translations(t.content_translations, "<br>")
diff --git a/app/helpers/active_admin_helper.rb b/app/helpers/active_admin_helper.rb
index 04e3a1132..8e43496a7 100644
--- a/app/helpers/active_admin_helper.rb
+++ b/app/helpers/active_admin_helper.rb
@@ -1,5 +1,5 @@
 module ActiveAdminHelper
-  def render_translations(attribute, joiner = " ")
+  def render_translations(attribute, joiner = " | ")
      attribute.map do |locale, translation|
       tag.strong("#{I18n.t("locales.#{locale}", locale: locale)}: ") +
       tag.span(translation)
diff --git a/spec/helpers/active_admin_helper_spec.rb b/spec/helpers/active_admin_helper_spec.rb
index 03d5e3e26..f7d0971d4 100644
--- a/spec/helpers/active_admin_helper_spec.rb
+++ b/spec/helpers/active_admin_helper_spec.rb
@@ -1,8 +1,8 @@
 RSpec.describe ActiveAdminHelper do
   describe '#render_translations' do
-    it 'renders all available translations for the given attribute' do
+    it 'renders hash to HTML' do
       attr_with_translations = { en: 'hi', es: 'hola' }
-      expect(helper.render_translations(attr_with_translations)).to eq("<strong>English: </strong><span>hi</span> <strong>Español: </strong><span>hola</span>")
+      expect(helper.render_translations(attr_with_translations)).to eq("<strong>English: </strong><span>hi</span> | <strong>Español: </strong><span>hola</span>")
     end
   end
 end