Merge pull request #669 from AyuntamientoMadrid/user-page

User page

config/locales/en.yml

@@ -22,6 +22,7 @@ en:
         "There are cities that are governed directly by their inhabitants, who <b>discuss</b> the topics they are concerned about, <b>propose</b> ideas to improve
         their lives and <b>decide</b> among themselves which ones will be carried out. Madrid is already one of these cities."
       see_all: "See proposals"
+      my_activity_link: "My activity"
       my_account_link: "My account"
       locale: "Language:"
       administration: "Administration"
@@ -283,6 +284,7 @@ en:
       title: "My account"
       save_changes_submit: "Save changes"
       change_credentials_link: "Change my credentials"
+      public_activity_label: "Keep my list of activities public"
       email_on_comment_label: "Notify me by email when someone comments on my proposals or debates"
       email_on_comment_reply_label: "Notify me by email when someone replies to my comments"
       erase_account_link: "Erase my account"
@@ -324,6 +326,20 @@ en:
     check: "Select"
     check_all: "All"
     check_none: "None"
+  users:
+    show:
+      filters:
+        proposals:
+          one: "1 Proposal"
+          other: "%{count} Proposals"
+        debates:
+          one: "1 Debate"
+          other: "%{count} Debates"
+        comments:
+          one: "1 Comment"
+          other: "%{count} Comments"
+      no_activity: "User has no public activity"
+      private_activity: "This user decided to keep the activity list private"
   unauthorized:
     default: "You do not have permission to access this page."
     manage:

config/locales/es.yml

@@ -22,6 +22,7 @@ es:
         "Existen ciudades gobernadas directamente por sus habitantes, que <b>debaten</b> sobre temas que les preocupan, <b>proponen</b> ideas para mejorar
         sus vidas y <b>deciden</b> entre todas y todos las que se llevan a cabo. Madrid ya es una de ellas."
       see_all: "Ver propuestas"
+      my_activity_link: "Mi actividad"
       my_account_link: "Mi cuenta"
       locale: "Idioma:"
       administration: "Administrar"
@@ -283,6 +284,7 @@ es:
       title: "Mi cuenta"
       save_changes_submit: "Guardar cambios"
       change_credentials_link: "Cambiar mis datos de acceso"
+      public_activity_label: "Mostrar públicamente mi lista de actividades"
       email_on_comment_label: "Recibir un email cuando alguien comenta en mis propuestas o debates"
       email_on_comment_reply_label: "Recibir un email cuando alguien contesta a mis comentarios"
       erase_account_link: "Darme de baja"
@@ -324,6 +326,20 @@ es:
     check: "Seleccionar"
     check_all: "Todos"
     check_none: "Ninguno"
+  users:
+    show:
+      filters:
+        proposals:
+          one: "1 Propuesta"
+          other: "%{count} Propuestas"
+        debates:
+          one: "1 Debate"
+          other: "%{count} Debates"
+        comments:
+          one: "1 Comentario"
+          other: "%{count} Comentarios"
+      no_activity: "Usuario sin actividad pública"
+      private_activity: "Este usuario ha decidido mantener en privado su lista de actividades"
   unauthorized:
     default: "No tienes permiso para acceder a esta página."
     manage: