From 71b9c84b7f98976c0db2c3a63f8cba879141c097 Mon Sep 17 00:00:00 2001 From: Alejandro Date: Thu, 20 Aug 2015 21:12:31 +0200 Subject: [PATCH 1/4] Added ghostscript to Readme. Required for captcha --- .gitignore | 1 + README.md | 2 +- README_EN.md | 2 +- 3 files changed, 3 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 339f1eb5e..5dbf23b01 100644 --- a/.gitignore +++ b/.gitignore @@ -25,3 +25,4 @@ # Mac finder artifacts .DS_Store +.ruby-gemset diff --git a/README.md b/README.md index 9fe47f6ad..ef9b015bd 100644 --- a/README.md +++ b/README.md @@ -20,7 +20,7 @@ Las herramientas utilizadas para el frontend no están cerradas aún. Los estilo ## Configuración para desarrollo y tests -Prerequisitos: tener instalado git, ImageMagick, Ruby 2.2.2, la gema `bundler`, y PostgreSQL (9.4 o superior). +Prerequisitos: tener instalado git, ImageMagick, Ruby 2.2.2, la gema `bundler`, ghostscript y PostgreSQL (9.4 o superior). ``` cd participacion diff --git a/README_EN.md b/README_EN.md index 40a39ae01..ee63eede4 100644 --- a/README_EN.md +++ b/README_EN.md @@ -21,7 +21,7 @@ Frontend tools used include [SCSS](http://sass-lang.com/) over [Foundation](http ## Configuration for development and test environments -Prerequisites: install git, ImageMagick, Ruby 2.2.2, bundler gem and PostgreSQL (>=9.4). +Prerequisites: install git, ImageMagick, Ruby 2.2.2, bundler gem, ghostscript and PostgreSQL (>=9.4). ``` cd participacion From 2415a0fae2a7870d4578966ed0ac270b84c46d79 Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Thu, 20 Aug 2015 21:28:10 +0200 Subject: [PATCH 2/4] Adds styles for language select --- app/assets/images/language_select.png | Bin 0 -> 1036 bytes app/assets/stylesheets/participacion.scss | 18 ++++++++++++++++++ app/views/shared/_locale_switcher.html.erb | 14 ++++++-------- config/locales/en.yml | 2 +- config/locales/es.yml | 4 ++-- 5 files changed, 27 insertions(+), 11 deletions(-) create mode 100644 app/assets/images/language_select.png diff --git a/app/assets/images/language_select.png b/app/assets/images/language_select.png new file mode 100644 index 0000000000000000000000000000000000000000..e0c4e641118594121642bbec5e5a756330c75fd5 GIT binary patch literal 1036 zcmaJ=O=}ZD7~ZDTmNvzrw5SLUTdEbze&nOcE?wI++nAtRVj3}ekZyLT&C>49c6Zur zbFoN43+fLL55-|f^YT8=`}NFvZt6mB z_la(bqI$C#IZyUu{^~kJ{<{_F7uk;E$s(Rcv$&!YWU3CF zu1*!S>bxfC^w@bY>WPHFgjfZhxnQ}XC($)tk(_-qOM{vVo|owTq>4%oq>uwaj2Q`O z+(;b61%{8s;Ln(@wwOp)P8qCTPO?Vi?&_$k;6X`@E5=jd& zo}Y{*`Q$_*F33EWlKEtUYhY!hEt$~54Xl2Ejkd)4f-r3oS%!|W4E3~wOi(LaG+O7v zx8$p1_13wBTVh#~4C{~guW>g_L__|uDPD4E${$)p^9~WW{2};|JdA2qP8PgRrQdsd zW9^}~qwV)zJ?_{X2rl*nS3Rk(XZP|TbwwNB>S!C^K6QI2kP|w$Z&3aHp8fh}SK{!S zK;~;8_vGjJ!s`3r#K6qcwersTGwSn^N4;m>2K0+}Moz9>%VZXNHhy#rpYG=Ff9%{G exO@F2)i* - - <%= t("layouts.header.language") %> -
- -
- + <%= t("layouts.header.language") %> +
+ +
diff --git a/config/locales/en.yml b/config/locales/en.yml index 79181cd13..830910cf9 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -13,7 +13,7 @@ en: open_city_slogan: So the citizens can decide what kind of city they want. see_all_debates: See all debates my_account_link: My account - language: Site language + language: "Site language:" administration: Administration moderation: Moderation welcome: Welcome diff --git a/config/locales/es.yml b/config/locales/es.yml index 856560e46..a8493dfd0 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -1,5 +1,5 @@ es: - locale: 'Español' + locale: "Español" layouts: header: external_link_transparency: Transparencia @@ -13,7 +13,7 @@ es: open_city_slogan: Para que todos los madrileños decidamos que ciudad queremos tener. see_all_debates: Ver todos los debates my_account_link: Mi cuenta - language: Idioma de la página + language: "Idioma de la página:" administration: Administrar moderation: Moderar welcome: Portada From efd7b688cb7432aab8596af534f12e0a72f62143 Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Fri, 21 Aug 2015 08:50:09 +0200 Subject: [PATCH 3/4] Renames language to locale --- app/assets/stylesheets/participacion.scss | 2 +- app/views/shared/_locale_switcher.html.erb | 4 ++-- config/locales/en.yml | 2 +- config/locales/es.yml | 2 +- 4 files changed, 5 insertions(+), 5 deletions(-) diff --git a/app/assets/stylesheets/participacion.scss b/app/assets/stylesheets/participacion.scss index 448938dd0..18303cf2e 100644 --- a/app/assets/stylesheets/participacion.scss +++ b/app/assets/stylesheets/participacion.scss @@ -436,7 +436,7 @@ footer { // 08. Forms // - - - - - - - - - - - - - - - - - - - - - - - - - -form.language { +form.locale-form { display: inline-block; position: relative; diff --git a/app/views/shared/_locale_switcher.html.erb b/app/views/shared/_locale_switcher.html.erb index 3f992e1b2..b60290296 100644 --- a/app/views/shared/_locale_switcher.html.erb +++ b/app/views/shared/_locale_switcher.html.erb @@ -1,6 +1,6 @@
- <%= t("layouts.header.language") %> -
+ <%= t("layouts.header.locale") %> + diff --git a/config/locales/en.yml b/config/locales/en.yml index 830910cf9..df24d783d 100644 --- a/config/locales/en.yml +++ b/config/locales/en.yml @@ -13,7 +13,7 @@ en: open_city_slogan: So the citizens can decide what kind of city they want. see_all_debates: See all debates my_account_link: My account - language: "Site language:" + locale: "Site language:" administration: Administration moderation: Moderation welcome: Welcome diff --git a/config/locales/es.yml b/config/locales/es.yml index a8493dfd0..4c7e36ce6 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -13,7 +13,7 @@ es: open_city_slogan: Para que todos los madrileños decidamos que ciudad queremos tener. see_all_debates: Ver todos los debates my_account_link: Mi cuenta - language: "Idioma de la página:" + locale: "Idioma de la página:" administration: Administrar moderation: Moderar welcome: Portada From bf727699f3f8c565ee3dfbd38d4b2e2b6f033f68 Mon Sep 17 00:00:00 2001 From: Alberto Garcia Cabeza Date: Fri, 21 Aug 2015 09:02:43 +0200 Subject: [PATCH 4/4] Updates some texts --- config/locales/admin.en.yml | 2 +- config/locales/admin.es.yml | 4 ++-- config/locales/es.yml | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/config/locales/admin.en.yml b/config/locales/admin.en.yml index 151a9fc47..cdf6774db 100644 --- a/config/locales/admin.en.yml +++ b/config/locales/admin.en.yml @@ -39,7 +39,7 @@ en: index: title: 'Debate topics' add_tag: 'Add a new debate topic' - mark_as_featured: 'Mark as featured' + mark_as_featured: 'Propose topic to create debate' name: placeholder: 'Write a topic' destroy: Delete Tag diff --git a/config/locales/admin.es.yml b/config/locales/admin.es.yml index fbaed7566..02f0ef65a 100644 --- a/config/locales/admin.es.yml +++ b/config/locales/admin.es.yml @@ -33,13 +33,13 @@ es: actions: hide: Ocultar hide_author: Bloquear al autor - restore: Permitir + restore: Volver a mostrar confirm: '¿Estás seguro?' tags: index: title: 'Temas de debate' add_tag: 'Añade un nuevo tema de debate' - mark_as_featured: 'Marcar como destacado' + mark_as_featured: 'Proponer etiqueta al crear debate' name: placeholder: 'Escribe el nombre del tema' destroy: Elimina la etiqueta diff --git a/config/locales/es.yml b/config/locales/es.yml index 856560e46..0a953276a 100644 --- a/config/locales/es.yml +++ b/config/locales/es.yml @@ -115,7 +115,7 @@ es: show: title: "Mi cuenta" save_changes_submit: "Guardar cambios" - change_credentials_link: "Cambiar mis credenciales" + change_credentials_link: "Cambiar mis datos de acceso" email_on_debate_comment_label: "Recibir un email cuando alguien comenta en mis debates" email_on_comment_reply_label: "Recibir un email cuando alguien contesta a mis comentarios" avatar: "Avatar"