From 2415a0fae2a7870d4578966ed0ac270b84c46d79 Mon Sep 17 00:00:00 2001
From: Alberto Garcia Cabeza <alberto@decabeza.es>
Date: Thu, 20 Aug 2015 21:28:10 +0200
Subject: [PATCH 1/2] 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-<Q6+}E)@S}S0q$dx8Qv3rV2zn6eY?`DVj0>|f^YT8=`}NFvZt6mB
z_la(bqI$C#IZyUu{^~kJ{<{_F7uk;E$s(Rcv$&!<kV@*P1VPqR=U^VH`pV)vI7(6N
z!$zTqi^?TYLnfp8K8$DD1Wi$+W1g*Q^ALj)oHHzm{`UL@4GdkPuf`Nku~V>YWU3CF
zu1*!S>bxfC^w@bY>WPHFgjfZhxnQ}XC($)tk(_-qOM{vVo|owTq>4%oq>uwaj2Q`O
z+(;b61%{8s<I(sz5a#$8%SG4-7YawjC?`h4p#IS$nxoH(c{yE=MQ##Z#@H5Fwo<7u
zl?a2JIhGd$f#t$%I2<A#A$P^Xsu!}{!3Kj2UCl9UY#<BxjA{ujVTmT0?w4TNO<K#X
zw}~{2^;DbX8O|@M;ixG8cQwtXw~O=eAm4uyyM+}SvU%vDB}XHJn;rB+*<#9pDn?EL
zp@l{lb7h2)TShiWrD|OR!-}dImTx>;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*<Zc_41AFMl8M-)DAmO5U27x%CIEqe0OC

literal 0
HcmV?d00001

diff --git a/app/assets/stylesheets/participacion.scss b/app/assets/stylesheets/participacion.scss
index d4442e11c..448938dd0 100644
--- a/app/assets/stylesheets/participacion.scss
+++ b/app/assets/stylesheets/participacion.scss
@@ -436,6 +436,24 @@ footer {
 // 08. Forms
 // - - - - - - - - - - - - - - - - - - - - - - - - -
 
+form.language {
+  display: inline-block;
+  position: relative;
+
+  select {
+    background-image: url("language_select.png");
+
+    &.js-locale-switcher {
+      background-color: transparent;
+      border: 0;
+      color: white;
+      outline: none;
+      padding-left: rem-calc(3);
+      padding-right: rem-calc(24);
+    }
+  }
+}
+
 form {
 
   label {
diff --git a/app/views/shared/_locale_switcher.html.erb b/app/views/shared/_locale_switcher.html.erb
index 3ab2b0a98..3f992e1b2 100644
--- a/app/views/shared/_locale_switcher.html.erb
+++ b/app/views/shared/_locale_switcher.html.erb
@@ -1,10 +1,8 @@
 <div class="locale">
-  <span>
-    <%= t("layouts.header.language") %>
-    <form>
-      <select class="js-locale-switcher" name='locale-switcher'>
-        <%= available_locale_options_for_select %>
-      </select>
-    </form>
-  </span>
+  <span class="inline-block"><%= t("layouts.header.language") %></span>
+  <form class="language">
+    <select class="js-locale-switcher" name="locale-switcher">
+      <%= available_locale_options_for_select %>
+    </select>
+  </form>
 </div>
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 <alberto@decabeza.es>
Date: Fri, 21 Aug 2015 08:50:09 +0200
Subject: [PATCH 2/2] 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 @@
 <div class="locale">
-  <span class="inline-block"><%= t("layouts.header.language") %></span>
-  <form class="language">
+  <span class="inline-block"><%= t("layouts.header.locale") %></span>
+  <form class="locale-form">
     <select class="js-locale-switcher" name="locale-switcher">
       <%= available_locale_options_for_select %>
     </select>
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