From f4ec30eac7c41d7ef189768cd929ac3928a7d184 Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Thu, 28 Apr 2022 12:06:27 -0300
Subject: [PATCH 1/3] jekyll no soporta urls con barra al final
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

y genera un montón de problemas!
---
 app/models/site.rb | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/app/models/site.rb b/app/models/site.rb
index 5b78d625..af10b004 100644
--- a/app/models/site.rb
+++ b/app/models/site.rb
@@ -470,7 +470,7 @@ class Site < ApplicationRecord
     config.theme = design.gem unless design.no_theme?
     config.description = description
     config.title = title
-    config.url = url
+    config.url = url(slash: false)
     config.hostname = hostname
   end
 

From 24c0161aac6451afc65f7f222bc4acbe00b11d2e Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Wed, 29 Jun 2022 18:17:23 -0300
Subject: [PATCH 2/3] =?UTF-8?q?no=20fallar=20si=20los=20layouts=20no=20tie?=
 =?UTF-8?q?nen=20traducci=C3=B3n=20#6841?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 app/models/site.rb | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/app/models/site.rb b/app/models/site.rb
index 7d4875e5..58947263 100644
--- a/app/models/site.rb
+++ b/app/models/site.rb
@@ -166,8 +166,10 @@ class Site < ApplicationRecord
   end
 
   # Similar a site.i18n en jekyll-locales
+  #
+  # @return [Hash]
   def i18n
-    data[I18n.locale.to_s]
+    data[I18n.locale.to_s] || {}
   end
 
   # Devuelve el idioma por defecto del sitio, el primero de la lista.

From 69712a306e131e48f6c7416002e2e8f1f1cee515 Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Mon, 25 Jul 2022 16:01:08 -0300
Subject: [PATCH 3/3] equiparar file con image  #7076

---
 app/views/posts/attributes/_file.haml  | 16 +++++++++-------
 app/views/posts/attributes/_image.haml |  3 +--
 2 files changed, 10 insertions(+), 9 deletions(-)

diff --git a/app/views/posts/attributes/_file.haml b/app/views/posts/attributes/_file.haml
index 19175b9c..54f9f81a 100644
--- a/app/views/posts/attributes/_file.haml
+++ b/app/views/posts/attributes/_file.haml
@@ -1,7 +1,5 @@
 .form-group
   - if metadata.static_file
-    = hidden_field_tag "#{base}[#{attribute}][path]", metadata.value['path']
-
     - case metadata.static_file.blob.content_type
       - when %r{\Avideo/}
         = video_tag url_for(metadata.static_file),
@@ -14,13 +12,17 @@
       - else
         = link_to t('posts.attribute_ro.file.download'),
           url_for(metadata.static_file)
-    .custom-control.custom-switch
-      = check_box_tag "#{base}[#{attribute}][path]", '', false, id: "#{base}_#{attribute}_destroy", class: 'custom-control-input'
-      = label_tag "#{base}_#{attribute}_destroy", t('posts.attributes.file.destroy'), class: 'custom-control-label'
+    -# Mantener el valor si no enviamos ninguna imagen
+    = hidden_field_tag "#{base}[#{attribute}][path]", metadata.value['path']
+    -# Los archivos requeridos solo se pueden reemplazar
+    - unless metadata.required
+      .custom-control.custom-switch
+        = check_box_tag "#{base}[#{attribute}][path]", '', false, id: "#{base}_#{attribute}_destroy", class: 'custom-control-input'
+        = label_tag "#{base}_#{attribute}_destroy", t('posts.attributes.file.destroy'), class: 'custom-control-label'
 
   .custom-file
     = file_field(*field_name_for(base, attribute, :path),
-      **field_options(attribute, metadata),
+      **field_options(attribute, metadata, required: (metadata.required && !metadata.path?)),
       class: "custom-file-input #{invalid(post, attribute)}",
       data: { preview: "#{attribute}-preview" })
     = label_tag "#{base}_#{attribute}_path",
@@ -30,7 +32,7 @@
 
 .form-group
   = label_tag "#{base}_#{attribute}_description",
-    post_label_t(attribute, :description, post: post)
+    post_label_t(attribute, :description, post: post, required: false)
   = text_field(*field_name_for(base, attribute, :description),
     value: metadata.value['description'],
     dir: dir, lang: locale,
diff --git a/app/views/posts/attributes/_image.haml b/app/views/posts/attributes/_image.haml
index c11f4196..f4d9bb3d 100644
--- a/app/views/posts/attributes/_image.haml
+++ b/app/views/posts/attributes/_image.haml
@@ -1,5 +1,5 @@
 .form-group
-  - if metadata.uploaded?
+  - if metadata.static_file
     = image_tag url_for(metadata.static_file),
       alt: metadata.value['description'],
       class: 'img-fluid',
@@ -37,4 +37,3 @@
     **field_options(attribute, metadata, required: false))
   = render 'posts/attribute_feedback',
     post: post, attribute: [attribute, :description], metadata: metadata
-