diff --git a/app/assets/stylesheets/community.scss b/app/assets/stylesheets/community.scss index 13ff3bf60..55db691ad 100644 --- a/app/assets/stylesheets/community.scss +++ b/app/assets/stylesheets/community.scss @@ -33,7 +33,7 @@ } } -.communities-participants{ +.communities-participant{ .comment-body{ display: inline-block; float: left; diff --git a/app/views/communities/show.html.erb b/app/views/communities/show.html.erb index 69bf729c0..5485cf371 100644 --- a/app/views/communities/show.html.erb +++ b/app/views/communities/show.html.erb @@ -1,9 +1,11 @@ -
-
-
-

<%= t("community.show.title") %>

-

<%= @community.proposal.title %>

-

<%= t("community.show.description") %>

+
+
+
+
+

<%= t("community.show.title") %>

+

<%= @community.proposal.title %>

+

<%= t("community.show.description") %>

+
@@ -22,13 +24,12 @@
-
+
  • <%= link_to "#tab-participantes" do %>

    - Participantes - + <%= t("community.tab.participant") %> (<%= @participants.count %>)

    <% end %> diff --git a/app/views/topics/_filter_subnav.html.erb b/app/views/topics/_filter_subnav.html.erb index 4af1b4962..8b8c39d40 100644 --- a/app/views/topics/_filter_subnav.html.erb +++ b/app/views/topics/_filter_subnav.html.erb @@ -1,10 +1,10 @@
    -
      +
      • <%= link_to "#tab-comments" do %>

        - <%= t("topics.show.comments_tab") %> + <%= t("community.topic.show.tab.comments_tab") %> (<%= @topic.comments_count %>)

        <% end %> diff --git a/app/views/topics/_topics.html.erb b/app/views/topics/_topics.html.erb index 48b878bec..3df284461 100644 --- a/app/views/topics/_topics.html.erb +++ b/app/views/topics/_topics.html.erb @@ -25,5 +25,5 @@
    <% end %> <% else %> - Crea el primer tema de la comunidad!!! +

    <%= t("community.create_first_community_theme") %>

    <% end %> diff --git a/app/views/topics/show.html.erb b/app/views/topics/show.html.erb index b5eb454fa..8525fe337 100644 --- a/app/views/topics/show.html.erb +++ b/app/views/topics/show.html.erb @@ -2,7 +2,8 @@
    <%= render "shared/back_link" %>
    -

    Comunidad de la propuesta: <%= @community.proposal.title %>

    + +

    <%= t("community.topic.show.community_of_the_proposal") %> <%= @community.proposal.title %>

    <%= @topic.title %>

    <%= render '/shared/author_info', resource: @topic %> @@ -13,7 +14,7 @@  
    -
    +
    <%= render "topics/filter_subnav" %>
    <%= render "topics/comments" %> diff --git a/config/locales/en/community.yml b/config/locales/en/community.yml new file mode 100644 index 000000000..fb6b98dd6 --- /dev/null +++ b/config/locales/en/community.yml @@ -0,0 +1,41 @@ +en: + community: + create_first_community_theme: Create the first community theme + join_the_community_of_users: Join the community of users, give your opinion. + tab: + participant: Participants + + sidebar: + title: Community + description: Join the community of users, give your opinion. + button_to_access: Access the community + + topic: + title: Participants + new_topic: Create topic + edit_topic: Edit theme + recommendations_title: Recommendations to create a theme + recommendation_one: Do not write the topic title or whole sentences in capital letters. On the internet that is considered shouting. And no one likes to be yelled at. + recommendation_two: Any topic or comment that implies an illegal action will be eliminated, also those that intend to sabotage the spaces of the subject, everything else is allowed. + recommendation_three: Enjoy this space, the voices that fill it, it's yours too + without_topics: Create the first community topic + + show: + title: User community + description: Participate in the community of this proposal + participants: Participants + + topic: + create: Create a theme + edit_button: Edit + form: + topic_title: Topic Title + topic_description_as_comment: Initial comment + new: + submit_button: Create theme + edit: + submit_button: Edit theme + show: + community_of_the_proposal: Community of the proposal + tab: + comments_tab: Comments diff --git a/config/locales/es/community.yml b/config/locales/es/community.yml index bfde5227b..b0d1f8236 100644 --- a/config/locales/es/community.yml +++ b/config/locales/es/community.yml @@ -1,5 +1,10 @@ es: community: + create_first_community_theme: Crea el primer tema de la comunidad + join_the_community_of_users: Partecipa a la comunidad de usuarios, da tu opinión. + tab: + participant: Participantes + sidebar: title: Comunidad description: Partecipa a la comunidad de usuarios, da tu opinión. @@ -11,10 +16,12 @@ es: recommendation_one: No escribas el título del tema o frases enteras en mayúsculas. En internet eso se considera gritar. Y a nadie le gusta que le griten. recommendation_two: Cualquier tema o comentario que implique una acción ilegal será eliminada, también las que tengan la intención de sabotear los espacios del tema, todo lo demás está permitido. recommendation_three: Disfruta de este espacio, de las voces que lo llenan, también es tuyo + without_topics: Crea el primer tema de la comunidad show: title: Comunidad de usuarios description: Participa en la comunidad de esta propuesta + paricipants: Participantes topic: create: Crear un tema @@ -26,3 +33,7 @@ es: submit_button: Crear tema edit: submit_button: Editar tema + show: + community_of_the_proposal: Comunidad de la propuesta + tab: + comments_tab: Comentarios