mirror of
https://0xacab.org/sutty/sutty
synced 2024-11-16 20:16:22 +00:00
Merge branch 'rails' into search-engine
This commit is contained in:
commit
0d81653cfa
4 changed files with 20 additions and 11 deletions
9
Makefile
9
Makefile
|
@ -26,6 +26,13 @@ test: always
|
||||||
serve: /etc/hosts
|
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"'
|
$(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.
|
# Servir JS con el dev server.
|
||||||
# Esto acelera la compilación del javascript, tiene que correrse por separado
|
# Esto acelera la compilación del javascript, tiene que correrse por separado
|
||||||
# de serve.
|
# de serve.
|
||||||
|
@ -94,7 +101,7 @@ fa: app/assets/fonts/forkawesome-webfont.woff2 ## Fork Awesome
|
||||||
|
|
||||||
ota: assets
|
ota: assets
|
||||||
sudo chgrp -R 82 public/
|
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
|
# Hotfixes
|
||||||
ota-rb:
|
ota-rb:
|
||||||
|
|
|
@ -392,7 +392,7 @@ class Site < ApplicationRecord
|
||||||
|
|
||||||
# Detecta si el tema actual es una gema
|
# Detecta si el tema actual es una gema
|
||||||
def theme_available?
|
def theme_available?
|
||||||
available_themes.include? design.gem
|
available_themes.include? design&.gem
|
||||||
end
|
end
|
||||||
|
|
||||||
# Devuelve el dominio actual
|
# Devuelve el dominio actual
|
||||||
|
|
|
@ -1,5 +1,8 @@
|
||||||
en:
|
en:
|
||||||
dir: ltr
|
dir: ltr
|
||||||
|
en: English
|
||||||
|
es: Castellano
|
||||||
|
es-AR: Castellano rioplatense
|
||||||
locales:
|
locales:
|
||||||
es:
|
es:
|
||||||
name: Castillian Spanish
|
name: Castillian Spanish
|
||||||
|
@ -335,9 +338,9 @@ en:
|
||||||
static_file_migration: 'File migration'
|
static_file_migration: 'File migration'
|
||||||
find_and_replace: 'Search and replace'
|
find_and_replace: 'Search and replace'
|
||||||
index:
|
index:
|
||||||
title: 'Sites'
|
title: 'My Sites'
|
||||||
pull: 'Upgrade'
|
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'
|
visit: 'Visit the site'
|
||||||
welcome: |
|
welcome: |
|
||||||
# Welcome!
|
# Welcome!
|
||||||
|
@ -345,12 +348,8 @@ en:
|
||||||
You have no sites yet. You can generate all the sites you want
|
You have no sites yet. You can generate all the sites you want
|
||||||
with the **Create site** button.
|
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
|
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.
|
notification.
|
||||||
|
|
||||||
[Create my first site](/sites/new)
|
[Create my first site](/sites/new)
|
||||||
|
|
|
@ -1,4 +1,7 @@
|
||||||
es:
|
es:
|
||||||
|
es: Castellano
|
||||||
|
en: English
|
||||||
|
es-AR: Castellano Rioplatense
|
||||||
dir: ltr
|
dir: ltr
|
||||||
locales:
|
locales:
|
||||||
es:
|
es:
|
||||||
|
@ -340,9 +343,9 @@ es:
|
||||||
static_file_migration: 'Migración de archivos'
|
static_file_migration: 'Migración de archivos'
|
||||||
find_and_replace: 'Búsqueda y reemplazo'
|
find_and_replace: 'Búsqueda y reemplazo'
|
||||||
index:
|
index:
|
||||||
title: 'Sitios'
|
title: 'Mis sitios'
|
||||||
pull: 'Actualizar'
|
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'
|
visit: 'Visitar el sitio'
|
||||||
welcome: |
|
welcome: |
|
||||||
# ¡Bienvenide!
|
# ¡Bienvenide!
|
||||||
|
|
Loading…
Reference in a new issue