decidim-comments 0.21.0 → 0.22.0

data/app/frontend/comments/comment_order_selector.component.tsx

@@ -43,28 +43,47 @@ class CommentOrderSelector extends React.Component<CommentOrderSelectorProps, Co
         <ul
           className="dropdown menu"
           data-dropdown-menu="data-dropdown-menu"
+          data-autoclose="false"
+          data-disable-hover="true"
+          data-click-open="true"
+          data-close-on-click="true"
+          tabIndex={-1}
           ref={this.setDropdown}
         >
-          <li>
-            <a>{I18n.t(`components.comment_order_selector.order.${orderBy}`)}</a>
-            <ul className="menu">
+          <li className="is-dropdown-submenu-parent" tabIndex={-1}>
+            <a
+              href="#"
+              id="comments-order-menu-control"
+              aria-label={I18n.t("components.comment_order_selector.title")}
+              aria-controls="comments-order-menu"
+              aria-haspopup="true"
+            >
+              {I18n.t(`components.comment_order_selector.order.${orderBy}`)}
+            </a>
+            <ul
+              className="menu is-dropdown-submenu"
+              id="language-chooser-menu"
+              role="menu"
+              aria-labelledby="comments-order-menu-control"
+              tabIndex={-1}
+            >
               <li>
-                <a href="" className="test" onClick={this.updateOrder("best_rated")} >
+                <a href="#" className="test" onClick={this.updateOrder("best_rated")} tabIndex={-1}>
                   {I18n.t("components.comment_order_selector.order.best_rated")}
                 </a>
               </li>
               <li>
-                <a href="" onClick={this.updateOrder("recent")} >
+                <a href="#" onClick={this.updateOrder("recent")} tabIndex={-1}>
                   {I18n.t("components.comment_order_selector.order.recent")}
                 </a>
               </li>
               <li>
-                <a href="" onClick={this.updateOrder("older")} >
+                <a href="#" onClick={this.updateOrder("older")} tabIndex={-1}>
                   {I18n.t("components.comment_order_selector.order.older")}
                 </a>
               </li>
               <li>
-                <a href="" onClick={this.updateOrder("most_discussed")} >
+                <a href="" onClick={this.updateOrder("most_discussed")} tabIndex={-1}>
                   {I18n.t("components.comment_order_selector.order.most_discussed")}
                 </a>
               </li>

data/app/frontend/comments/down_vote_button.component.tsx

@@ -12,6 +12,8 @@ import {
   GetCommentsQuery
 } from "../support/schema";
 
+const { I18n } = require("react-i18nify");
+
 interface DownVoteButtonProps {
   session: AddCommentFormSessionFragment & {
     user: any;
@@ -42,6 +44,7 @@ export const DownVoteButton: React.SFC<DownVoteButtonProps> = ({
     <VoteButton
       buttonClassName="comment__votes--down"
       iconName="icon-chevron-bottom"
+      text={I18n.t("components.down_vote_button.text")}
       votes={downVotes}
       voteAction={downVote}
       disabled={disabled}

data/app/frontend/comments/up_vote_button.component.tsx

@@ -3,6 +3,8 @@ import { graphql, MutationFunc } from "react-apollo";
 
 import VoteButton from "./vote_button.component";
 
+const { I18n } = require("react-i18nify");
+
 import {
   AddCommentFormCommentableFragment,
   AddCommentFormSessionFragment,
@@ -42,6 +44,7 @@ export const UpVoteButton: React.SFC<UpVoteButtonProps> = ({
     <VoteButton
       buttonClassName="comment__votes--up"
       iconName="icon-chevron-top"
+      text={I18n.t("components.up_vote_button.text")}
       votes={upVotes}
       voteAction={upVote}
       disabled={disabled}

data/app/frontend/comments/vote_button.component.tsx

@@ -4,6 +4,7 @@ import Icon from "../application/icon.component";
 interface VoteButtonProps {
   buttonClassName: string;
   iconName: string;
+  text: string;
   votes: number;
   voteAction?: () => void;
   disabled?: boolean;
@@ -18,6 +19,7 @@ const preventDefault = (event: any) => {
 const VoteButton: React.SFC<VoteButtonProps> = ({
   buttonClassName,
   iconName,
+  text,
   votes,
   voteAction,
   disabled,
@@ -28,8 +30,10 @@ const VoteButton: React.SFC<VoteButtonProps> = ({
     className={`${buttonClassName} ${selectedClass}`}
     onClick={userLoggedIn ? voteAction : preventDefault}
     disabled={disabled}
+    title={text}
     data-open={userLoggedIn ? null : "loginModal"}
   >
+    <span className="show-for-sr">{text}</span>
     <Icon name={iconName} iconExtraClassName="icon--small" />
     {` ${votes}`}
   </button>

data/app/frontend/comments/vote_button_component.test.tsx

@@ -13,44 +13,50 @@ describe("<VoteButton />", () => {
   });
 
   it("should render the number of votes passed as a prop", () => {
-    const wrapper = shallow(<VoteButton votes={10} buttonClassName="vote-button" iconName="vote-icon" voteAction={voteAction} userLoggedIn={true} />);
+    const wrapper = shallow(<VoteButton votes={10} buttonClassName="vote-button" iconName="vote-icon" text="Test" voteAction={voteAction} userLoggedIn={true} />);
     expect(wrapper.find("button").text()).toMatch(/10/);
   });
 
   it("should render a button with the given buttonClassName", () => {
-    const wrapper = shallow(<VoteButton votes={10} buttonClassName="vote-button" iconName="vote-icon" voteAction={voteAction} userLoggedIn={true} />);
+    const wrapper = shallow(<VoteButton votes={10} buttonClassName="vote-button" iconName="vote-icon" text="Test" voteAction={voteAction} userLoggedIn={true} />);
     expect(wrapper.find("button.vote-button").exists()).toBeTruthy();
   });
 
   it("should render a Icon component with the correct name prop", () => {
-    const wrapper = shallow(<VoteButton votes={10} buttonClassName="vote-button" iconName="vote-icon" voteAction={voteAction} userLoggedIn={true} />);
+    const wrapper = shallow(<VoteButton votes={10} buttonClassName="vote-button" iconName="vote-icon" text="Test" voteAction={voteAction} userLoggedIn={true} />);
     expect(wrapper.find(Icon).prop("name")).toEqual("vote-icon");
   });
 
+  it("should render a button with the text as title attribute and screen reader visible element", () => {
+    const wrapper = shallow(<VoteButton votes={10} buttonClassName="vote-button" iconName="vote-icon" text="Test" voteAction={voteAction} userLoggedIn={true} />);
+    expect(wrapper.find("button").prop("title")).toBe("Test");
+    expect(wrapper.find("button span.show-for-sr").text()).toEqual("Test");
+  });
+
   it("should call the voteAction prop on click", () => {
-    const wrapper = shallow(<VoteButton votes={10} buttonClassName="vote-button" iconName="vote-icon" voteAction={voteAction} userLoggedIn={true} />);
+    const wrapper = shallow(<VoteButton votes={10} buttonClassName="vote-button" iconName="vote-icon" text="Test" voteAction={voteAction} userLoggedIn={true} />);
     wrapper.find("button").simulate("click");
     expect(voteAction).toHaveBeenCalled();
   });
 
   it("should disable the button based on the disabled prop", () => {
-    const wrapper = shallow(<VoteButton votes={10} buttonClassName="vote-button" iconName="vote-icon" voteAction={voteAction} disabled={true} userLoggedIn={true} />);
+    const wrapper = shallow(<VoteButton votes={10} buttonClassName="vote-button" iconName="vote-icon" text="Test" voteAction={voteAction} disabled={true} userLoggedIn={true} />);
     expect(wrapper.find("button").props()).toHaveProperty("disabled");
   });
 
   it("should render a button with the given selectedClass", () => {
-    const wrapper = shallow(<VoteButton votes={10} buttonClassName="vote-button" iconName="vote-icon" voteAction={voteAction} disabled={true} selectedClass="is-vote-selected" userLoggedIn={true} />);
+    const wrapper = shallow(<VoteButton votes={10} buttonClassName="vote-button" iconName="vote-icon" text="Test" voteAction={voteAction} disabled={true} selectedClass="is-vote-selected" userLoggedIn={true} />);
     expect(wrapper.find(".is-vote-selected").exists()).toBeTruthy();
   });
 
   describe("when userLoggedIn prop is false", () => {
     it("should add data-open prop as 'loginModal' to the button", () => {
-      const wrapper = shallow(<VoteButton votes={10} buttonClassName="vote-button" iconName="vote-icon" voteAction={voteAction} userLoggedIn={false} />);
+      const wrapper = shallow(<VoteButton votes={10} buttonClassName="vote-button" iconName="vote-icon" text="Test" voteAction={voteAction} userLoggedIn={false} />);
       expect(wrapper.find("button").prop("data-open")).toBe("loginModal");
     });
 
     it("should call the event preventDefault method", () => {
-      const wrapper = shallow(<VoteButton votes={10} buttonClassName="vote-button" iconName="vote-icon" voteAction={voteAction} userLoggedIn={false} />);
+      const wrapper = shallow(<VoteButton votes={10} buttonClassName="vote-button" iconName="vote-icon" text="Test" voteAction={voteAction} userLoggedIn={false} />);
       wrapper.find("button").simulate("click", { preventDefault });
       expect(preventDefault).toHaveBeenCalled();
     });

data/app/models/decidim/comments/comment.rb

@@ -28,14 +28,14 @@ module Decidim
       has_many :down_votes, -> { where(weight: -1) }, foreign_key: "decidim_comment_id", class_name: "CommentVote", dependent: :destroy
 
       validates :body, presence: true
-      validates :depth, numericality: { greater_than_or_equal_to: 0 }
+      validates :depth, numericality: { only_integer: true, greater_than_or_equal_to: 0, less_than_or_equal_to: MAX_DEPTH }
       validates :alignment, inclusion: { in: [0, 1, -1] }
 
       validates :body, length: { maximum: 1000 }
 
       validate :commentable_can_have_comments
 
-      before_save :compute_depth
+      before_validation :compute_depth
 
       delegate :organization, to: :commentable
 

data/app/queries/decidim/comments/metrics/comments_metric_manage.rb

@@ -9,9 +9,6 @@ module Decidim
         end
 
         def save
-          return @registry if @registry
-
-          @registry = []
           query.each do |key, results|
             cumulative_value = results[:cumulative]
             next if cumulative_value.zero?
@@ -23,10 +20,8 @@ module Decidim
                                                            organization: @organization, decidim_category_id: category_id,
                                                            related_object_type: related_object_type, related_object_id: related_object_id)
             record.assign_attributes(cumulative: cumulative_value, quantity: quantity_value)
-            @registry << record
+            record.save!
           end
-          @registry.each(&:save!)
-          @registry
         end
 
         private

data/app/services/decidim/comments/new_comment_notification_creator.rb

@@ -17,9 +17,12 @@ module Decidim
       # comment - the Comment from which to generate notifications.
       # mentioned_users - An ActiveRecord::Relation of the users that have been
       #   mentioned
-      def initialize(comment, mentioned_users)
+      # mentioned_groups - And ActiveRecord::Relation of the user_groups that have
+      #   been mentioned
+      def initialize(comment, mentioned_users, mentioned_groups = nil)
         @comment = comment
         @mentioned_users = mentioned_users
+        @mentioned_groups = mentioned_groups
         @already_notified_users = [comment.author]
       end
 
@@ -28,14 +31,16 @@ module Decidim
       # Returns nothing.
       def create
         notify_mentioned_users
+        notify_mentioned_groups
         notify_parent_comment_author
         notify_author_followers
+        notify_user_group_followers
         notify_commentable_recipients
       end
 
       private
 
-      attr_reader :comment, :mentioned_users, :already_notified_users
+      attr_reader :comment, :mentioned_users, :mentioned_groups, :already_notified_users
 
       def notify_mentioned_users
         affected_users = mentioned_users - already_notified_users
@@ -44,6 +49,17 @@ module Decidim
         notify(:user_mentioned, affected_users: affected_users)
       end
 
+      def notify_mentioned_groups
+        return unless mentioned_groups
+
+        mentioned_groups.each do |group|
+          affected_users = group.accepted_users - already_notified_users
+          @already_notified_users += affected_users
+
+          notify(:user_group_mentioned, affected_users: affected_users, extra: { group: group })
+        end
+      end
+
       # Notifies the author of a comment that their comment has been replied.
       # Only applies if the comment is a reply.
       def notify_parent_comment_author
@@ -62,6 +78,15 @@ module Decidim
         notify(:comment_by_followed_user, followers: followers)
       end
 
+      def notify_user_group_followers
+        return if comment.user_group.blank?
+
+        followers = comment.user_group.followers - already_notified_users
+        @already_notified_users += followers
+
+        notify(:comment_by_followed_user_group, followers: followers)
+      end
+
       # Notifies the users the `comment.commentable` resource implements as necessary.
       def notify_commentable_recipients
         followers = comment.commentable.users_to_notify_on_comment_created - already_notified_users
@@ -90,7 +115,7 @@ module Decidim
           extra: {
             comment_id: comment.id
           }
-        }.merge(users)
+        }.deep_merge(users)
 
         Decidim::EventsManager.publish(data)
       end

data/app/types/decidim/comments/commentable_mutation_type.rb

@@ -16,9 +16,9 @@ module Decidim
         argument :userGroupId, types.ID, "The comment's user group id. Replaces the author."
 
         resolve lambda { |obj, args, ctx|
-          params = { "comment" => { "body" => args[:body], "alignment" => args[:alignment], "user_group_id" => args[:userGroupId] } }
+          params = { "comment" => { "body" => args[:body], "alignment" => args[:alignment], "user_group_id" => args[:userGroupId], "commentable" => obj } }
           form = Decidim::Comments::CommentForm.from_params(params).with_context(current_organization: ctx[:current_organization])
-          Decidim::Comments::CreateComment.call(form, ctx[:current_user], obj) do
+          Decidim::Comments::CreateComment.call(form, ctx[:current_user]) do
             on(:ok) do |comment|
               return comment
             end

data/config/locales/ar.yml

@@ -4,6 +4,7 @@ ar:
       decidim/comments/comment_by_followed_user_event: تعليق
       decidim/comments/comment_created_event: تعليق
       decidim/comments/reply_created_event: تعليق الرد
+      decidim/comments/user_group_mentioned_event: أشير
       decidim/comments/user_mentioned_event: أشير
   activerecord:
     models:
@@ -62,7 +63,6 @@ ar:
             does_not_belong: يحتوي على نشاط غير قانوني أو تهديدات انتحارية أو معلومات شخصية أو أي شيء آخر تعتقد أنه لا ينتمي إلى %{organization_name}.
             offensive: يحتوي على العنصرية والتمييز الجنسي والتشهير والهجمات الشخصية والتهديدات بالقتل أو طلبات الانتحار أو أي شكل من أشكال خطاب الكراهية.
             spam: يحتوي على clickbait أو الإعلان أو الخدع أو روبوت البرامج النصية.
-          title: الإبلاغ عن مشكلة
         show_replies: اظهر الردود الـ %{replies_count}
         single_comment_link_title: الحصول على رابط نحو تعليق واحد
       comment_order_selector:
@@ -89,6 +89,9 @@ ar:
           email_outro: لقد تلقيت هذا الإشعار لأنك تتابع %{author_name}. يمكنك إلغاء تتبع هذا المستخدم من صفحة ملفه الشخصي.
           email_subject: هناك تعليق جديد مِن %{author_name} على %{resource_title}
           notification_title: هناك تعليق جديد مِن <a href="%{author_path}">%{author_name} %{author_nickname}</a> على <a href="%{resource_path}">%{resource_title}</a>.
+        comment_by_followed_user_group:
+          email_subject: هناك تعليق جديد مِن %{author_name} على %{resource_title}
+          notification_title: هناك تعليق جديد مِن <a href="%{author_path}">%{author_name} %{author_nickname}</a> على <a href="%{resource_path}">%{resource_title}</a>.
         comment_created:
           email_intro: "%{resource_title} تم التعليق. يمكنك قراءة التعليق في هذه الصفحة:"
           email_outro: لقد تلقيت هذا الإشعار لأنك تتابع "%{resource_title}" أو مؤلفه. يمكنك إلغاء تتبعه من الرابط السابق.

data/config/locales/bg-BG.yml

@@ -0,0 +1,6 @@
+bg:
+  activemodel:
+    models:
+      decidim/comments/comment_by_followed_user_event: Коментар
+      decidim/comments/comment_created_event: Коментар
+      decidim/comments/reply_created_event: Отговор на коментар

data/config/locales/ca.yml

@@ -4,6 +4,7 @@ ca:
       decidim/comments/comment_by_followed_user_event: Comentari
       decidim/comments/comment_created_event: Comentari
       decidim/comments/reply_created_event: Resposta al comentari
+      decidim/comments/user_group_mentioned_event: Mencionar
       decidim/comments/user_mentioned_event: Mencionar
   activerecord:
     models:
@@ -16,6 +17,7 @@ ca:
   decidim:
     comments:
       comments: Comentaris
+      comments_count: Número de comentaris
       last_activity:
         new_comment_at_html: "<span>Nou comentari a %{link}</span>"
       votes:
@@ -54,7 +56,7 @@ ca:
             does_not_belong: Conté activitat il·legal, amenaces de suïcidi, informació personal, o qualsevol altra cosa que creguis que no pertany a %{organization_name}.
             offensive: Conté racisme, sexisme, insults, atacs personals, amenaces de mort, peticions de suïcidi o qualsevol forma de discurs d'odi.
             spam: Conté "clickbait", publicitat o estafes.
-          title: Denúncia un problema
+          title: Notificar contingut inapropiat
         show_replies: Mostra %{replies_count} respostes
         single_comment_link_title: Aconsegueix l'enllaç al comentari
       comment_order_selector:
@@ -71,9 +73,13 @@ ca:
         blocked_comments_warning: Els comentaris estan desactivats en aquest moment, però pots llegir els anteriors.
         comment_details_title: Detalls del comentari
         loading: Carregant els comentaris ...
-        single_comment_warning: 'Pots revisar la resta de comentaris a: <a href="%{url}">here</a>.'
+        single_comment_warning: Pots revisar la resta de comentaris <a href="%{url}">aquí</a>.
         single_comment_warning_title: Estàs veient un sol comentari
         title: "%{count} comentaris"
+      down_vote_button:
+        text: No estic d'acord amb aquest comentari
+      up_vote_button:
+        text: Estic d'acord amb aquest comentari
     events:
       comments:
         comment_by_followed_user:
@@ -81,6 +87,11 @@ ca:
           email_outro: Has rebut aquesta notificació perquè estàs seguint %{author_name}. Pots deixar de seguir a aquesta participant des de la seva pàgina de perfil.
           email_subject: Hi ha un nou comentari de %{author_name} en %{resource_title}
           notification_title: Hi ha un nou comentari per <a href="%{author_path}">%{author_name} %{author_nickname}</a> a <a href="%{resource_path}">%{resource_title}</a>.
+        comment_by_followed_user_group:
+          email_intro: '%{author_name} ha deixat un comentari a%{resource_title}. Pots llegir-lo en aquesta pàgina:'
+          email_outro: Reps aquesta notificació perquè segueixes a %{author_name}. Pots deixar de seguir aquest grup des de la seva pàgina de perfil.
+          email_subject: Hi ha un nou comentari de %{author_name} en %{resource_title}
+          notification_title: Hi ha un nou comentari per <a href="%{author_path}">%{author_name} %{author_nickname}</a> a <a href="%{resource_path}">%{resource_title}</a>.
         comment_created:
           email_intro: "S'ha comentat %{resource_title}. Pots llegir el comentari d'aquesta pàgina:"
           email_outro: Has rebut aquesta notificació perquè estàs seguint "%{resource_title}" o la seva autora. Pots deixar de seguir-la des de l'enllaç anterior.
@@ -91,6 +102,11 @@ ca:
           email_outro: Has rebut aquesta notificació perquè s'ha respost el teu comentari.
           email_subject: "%{author_name} ha respost el teu comentari a %{resource_title}"
           notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> ha respost el teu comentari a <a href="%{resource_path}">%{resource_title}</a>
+        user_group_mentioned:
+          email_intro: Un grup al qual pertanys ha estat esmentat
+          email_outro: Has rebut aquesta notificació perquè formes part del grup %{group_name} que ha estat esmentat a %{resource_title}.
+          email_subject: T'han esmentat a %{resource_title} com a membre de %{group_name}
+          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> t'ha esmentat com a membre de <a href="%{group_path}">%{group_name} %{group_nickname}</a> a <a href="%{resource_path}">%{resource_title}</a>
         user_mentioned:
           email_intro: Has estat esmentada
           email_outro: Has rebut aquesta notificació perquè has estat esmentada a %{resource_title}.

data/config/locales/cs.yml

@@ -4,7 +4,8 @@ cs:
       decidim/comments/comment_by_followed_user_event: Komentář
       decidim/comments/comment_created_event: Komentář
       decidim/comments/reply_created_event: Odpověď na komentář
-      decidim/comments/user_mentioned_event: Zmínit se
+      decidim/comments/user_group_mentioned_event: Zmínka
+      decidim/comments/user_mentioned_event: Zmínka
   activerecord:
     models:
       decidim/comments/comment:
@@ -13,52 +14,53 @@ cs:
         many: Komentáře
         other: Komentáře
       decidim/comments/comment_vote:
-        one: Hlasování
+        one: Hlasovat
         few: Hlasy
         many: Hlasy
         other: Hlasy
   decidim:
     comments:
       comments: Komentáře
+      comments_count: Počet komentářů
       last_activity:
         new_comment_at_html: "<span>Nový komentář v %{link}</span>"
       votes:
         create:
-          error: Při hlasování se vyskytly chyby.
+          error: Při hlasování o komentáři došlo k chybě.
     components:
       add_comment_form:
-        account_message: <a href="%{sign_in_url}">Přihlaste se svým účtem</a> nebo <a href="%{sign_up_url}">přihlaste se</a> a přidejte svůj komentář.
+        account_message: <a href="%{sign_in_url}">Přihlaste se pomocí svého účtu</a> nebo se <a href="%{sign_up_url}">zaregistrujte</a> a přidejte svůj komentář.
         form:
           body:
             label: Komentář
             placeholder: Co si o tom myslíš?
           form_error: Text je povinný a nesmí být delší než %{length} znaků.
-          submit: Poslat
+          submit: Odeslat
           user_group_id:
             label: Komentovat jako
         opinion:
           neutral: Neutrální
         remaining_characters: "Zbývá %{count} znaků"
-        remaining_characters_1: "Zbývá %{count} znaků"
+        remaining_characters_1: "Zbývá %{count} znak"
         title: Přidejte svůj komentář
       comment:
         alignment:
           against: Proti
           in_favor: Ve prospěch
-        deleted_user: Vymazaný uživatel
+        deleted_user: Vymazaný účastník
         hide_replies: Skrýt odpovědi
         reply: Odpověď
         report:
           action: Zpráva
-          already_reported: Tento obsah je již nahlášen a bude kontrolován administrátorem.
+          already_reported: Tento obsah je již nahlášen a bude přezkoumán administrátorem.
           close: Zavřít
           description: Je tento obsah nevhodný?
           details: Další komentáře
           reasons:
             does_not_belong: Obsahuje nezákonnou činnost, sebevražedné hrozby, osobní informace nebo něco jiného, o kterém si myslíte, že nepatří na %{organization_name}.
             offensive: Obsahuje rasismus, sexismus, podvody, osobní útoky, hrozby smrti, žádosti o sebevraždu nebo jakoukoli formu projevy nenávisti.
-            spam: Obsahuje clickbait, reklama, podvody nebo skripty.
-          title: Nahlásit problém
+            spam: Obsahuje clickbait, reklamu, podvody nebo škodlivé skripty.
+          title: Nahlásit nevhodný obsah
         show_replies: Zobrazit %{replies_count} odpovědí
         single_comment_link_title: Získat odkaz na jeden komentář
       comment_order_selector:
@@ -66,18 +68,22 @@ cs:
           best_rated: Nejlépe hodnocené
           most_discussed: Nejdiskutovanější
           older: Starší
-          recent: Nedávno
+          recent: Nedávné
         title: 'Seřadit podle:'
       comment_thread:
         title: Konverzace s číslem %{authorName}
       comments:
-        blocked_comments_for_user_warning: V tuto chvíli nemůžete komentovat, ale můžete si přečíst předchozí.
-        blocked_comments_warning: Komentáře jsou v tuto chvíli zakázány, ale můžete si přečíst předchozí.
+        blocked_comments_for_user_warning: Momentálně nemůžete komentovat, ale můžete si přečíst ty předchozí.
+        blocked_comments_warning: Komentáře jsou momentálně zakázány, ale můžete si přečíst ty předchozí.
         comment_details_title: Podrobnosti komentáře
         loading: Načítání komentářů ...
         single_comment_warning: Můžete zkontrolovat zbytek komentářů <a href="%{url}">zde</a>.
         single_comment_warning_title: Vidíte jeden komentář
         title: "%{count} komentářů"
+      down_vote_button:
+        text: Nesouhlasím s tímto komentářem
+      up_vote_button:
+        text: Souhlasím s tímto komentářem
     events:
       comments:
         comment_by_followed_user:
@@ -85,6 +91,11 @@ cs:
           email_outro: Toto oznámení jste obdrželi, protože jste sledovali %{author_name}. Tento uživatel můžete zrušit ze své profilové stránky.
           email_subject: K dispozici je nový komentář %{author_name} v %{resource_title}
           notification_title: K dispozici je nový komentář <a href="%{author_path}">%{author_name} %{author_nickname}</a> v <a href="%{resource_path}">%{resource_title}</a>.
+        comment_by_followed_user_group:
+          email_intro: 'Skupina %{author_name} zanechala komentář v %{resource_title}. Můžete si jej přečíst na této stránce:'
+          email_outro: Obdrželi jste toto oznámení, protože sledujete %{author_name}. Můžete zrušit sledování této skupiny na její profilové stránce.
+          email_subject: K dispozici je nový komentář %{author_name} v %{resource_title}
+          notification_title: K dispozici je nový komentář <a href="%{author_path}">%{author_name} %{author_nickname}</a> v <a href="%{resource_path}">%{resource_title}</a>.
         comment_created:
           email_intro: "%{resource_title} bylo komentováno. Můžete si přečíst komentář na této stránce:"
           email_outro: Toto oznámení jste obdrželi, protože jste sledovali "%{resource_title}" nebo jeho autora. Můžete jej odhlásit od předchozího odkazu.
@@ -95,6 +106,11 @@ cs:
           email_outro: Toto oznámení jste obdrželi, protože váš komentář byl zodpovězen.
           email_subject: "%{author_name} odpověděl váš komentář v %{resource_title}"
           notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> odpověděl / a svůj komentář v <a href="%{resource_path}">%{resource_title}</a>
+        user_group_mentioned:
+          email_intro: Byla zmíněna skupina, do které patříte
+          email_outro: Obdrželi jste toto oznámení, protože jste členem skupiny %{group_name}, která byla zmíněna v %{resource_title}.
+          email_subject: Byl jste zmíněn v %{resource_title} jako člen %{group_name}
+          notification_title: Byli jste zmíněni v <a href="%{resource_path}">%{resource_title}</a> od <a href="%{author_path}">%{author_name} %{author_nickname}</a> jako člen <a href="%{group_path}">%{group_name} %{group_nickname}</a>
         user_mentioned:
           email_intro: Byl jste zmíněn
           email_outro: Toto oznámení jste obdrželi, protože jste byli uvedeni v %{resource_title}.