From f37ed785e32b1dd3b39aafa91bc892a5f2a0b000 Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Thu, 6 May 2021 15:19:34 -0300
Subject: [PATCH 1/4] correr rake y rails dentro de hainish

```bash
make rails args="g migration CreateTable"
make rake args="routes"
```
---
 Makefile | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 15603bf2..757be734 100644
--- a/Makefile
+++ b/Makefile
@@ -26,6 +26,13 @@ test: always
 serve: /etc/hosts
 	$(hain) 'cd /Sutty/sutty; bundle exec rails s -b "ssl://0.0.0.0:3000?key=../sutty.local/domain/$(SUTTY).key&cert=../sutty.local/domain/$(SUTTY).crt"'
 
+# make rails args="db:migrate"
+rails:
+	$(hain) 'cd /Sutty/sutty; bundle exec rails $(args)'
+
+rake:
+	$(hain) 'cd /Sutty/sutty; bundle exec rake $(args)'
+
 # Servir JS con el dev server.
 # Esto acelera la compilación del javascript, tiene que correrse por separado
 # de serve.
@@ -94,7 +101,7 @@ fa: app/assets/fonts/forkawesome-webfont.woff2 ## Fork Awesome
 
 ota: assets
 	sudo chgrp -R 82 public/
-	rsync -av public/ athshe:/srv/sutty/srv/http/data/_public/
+	rsync -av --delete-after public/ athshe:/srv/sutty/srv/http/data/_public/
 
 # Hotfixes
 ota-rb:

From bd3be549b495c913eba3079e297b4e88c6349100 Mon Sep 17 00:00:00 2001
From: Maki <makiniqa@riseup.net>
Date: Thu, 6 May 2021 15:43:54 -0300
Subject: [PATCH 2/4] texto mis sitios

---
 config/locales/en.yml | 10 +++-------
 config/locales/es.yml |  4 ++--
 2 files changed, 5 insertions(+), 9 deletions(-)

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 9366f9fc..61d6eb5b 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -335,9 +335,9 @@ en:
     static_file_migration: 'File migration'
     find_and_replace: 'Search and replace'
     index:
-      title: 'Sites'
+      title: 'My Sites'
       pull: 'Upgrade'
-      help: 'This is the list of sites you can edit'
+      help: 'Here are all the sites you can edit'
       visit: 'Visit the site'
       welcome: |
         # Welcome!
@@ -345,12 +345,8 @@ en:
         You have no sites yet.  You can generate all the sites you want
         with the **Create site** button.
 
-        Para ver los cambios, usa el botón **Publicar cambios** en cada
-        sitio y espera unos segundos.  También recibirás un correo de
-        notificación.
-
         To see your changes, use the **Publish changes** button on each
-        site and wait a few seconds.  You'll also receive an e-mail
+        site and wait a few seconds.  You will also receive an e-mail
         notification.
 
         [Create my first site](/sites/new)
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 3a64e7ee..2c3eeb61 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -340,9 +340,9 @@ es:
     static_file_migration: 'Migración de archivos'
     find_and_replace: 'Búsqueda y reemplazo'
     index:
-      title: 'Sitios'
+      title: 'Mis sitios'
       pull: 'Actualizar'
-      help: 'Este es el listado de sitios que puedes editar'
+      help: 'Acá están todos los sitios que puedes editar'
       visit: 'Visitar el sitio'
       welcome: |
         # ¡Bienvenide!

From 18a05133971e61853d6f678d887472366e43fefd Mon Sep 17 00:00:00 2001
From: Maki <makiniqa@riseup.net>
Date: Thu, 6 May 2021 16:03:23 -0300
Subject: [PATCH 3/4] idiomas

---
 config/locales/en.yml | 3 +++
 config/locales/es.yml | 3 +++
 2 files changed, 6 insertions(+)

diff --git a/config/locales/en.yml b/config/locales/en.yml
index 61d6eb5b..210aeb12 100644
--- a/config/locales/en.yml
+++ b/config/locales/en.yml
@@ -1,5 +1,8 @@
 en:
   dir: ltr
+  en: English
+  es: Castellano 
+  es-AR: Castellano rioplatense 
   locales:
     es:
       name: Castillian Spanish
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 2c3eeb61..403389ab 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -1,4 +1,7 @@
 es:
+  es: Castellano
+  en: English
+  es-AR: Castellano Rioplatense
   dir: ltr
   locales:
     es:

From 20d2cf684054536df4c67fcaca1ff10cf6ecea04 Mon Sep 17 00:00:00 2001
From: f <f@sutty.nl>
Date: Thu, 6 May 2021 17:29:29 -0300
Subject: [PATCH 4/4] =?UTF-8?q?no=20fallar=20si=20no=20tiene=20un=20dise?=
 =?UTF-8?q?=C3=B1o=20asignado?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 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 1c62e9bc..3a699233 100644
--- a/app/models/site.rb
+++ b/app/models/site.rb
@@ -390,7 +390,7 @@ class Site < ApplicationRecord
 
   # Detecta si el tema actual es una gema
   def theme_available?
-    available_themes.include? design.gem
+    available_themes.include? design&.gem
   end
 
   # Devuelve el dominio actual