decidim-comments 0.5.1 → 0.6.0

data/config/locales/uk.yml

@@ -0,0 +1,70 @@
+uk:
+  decidim:
+    comments:
+      events:
+        comment_created:
+          comment:
+            email_intro: '"%{resource_title}" прокоментували'
+            email_outro: Ви отримали це сповіщення, тому що ви стежите за "%{resource_title}". Ви можете припинити стежити за ним, перейшовши за наведеним вище посиланням.
+            email_subject: Надійшов новий коментар від %{author_name} на <a href="%{resource_url}">%{resource_title}</a>
+            notification_title: Надійшов новий коментар від %{author_name} на <a href="%{resource_path}">%{resource_title}</a>
+          reply:
+            email_intro: '"%{resource_title}" прокоментували'
+            email_outro: Ви отримали це сповіщення, тому що ви стежите за "%{resource_title}". Ви можете припинити стежити за ним, перейшовши за наведеним вище посиланням.
+            email_subject: Надійшла нова відповідь на ваш коментар від %{author_name} на <a href="%{resource_url}">%{resource_title}</a>
+            notification_title: Надійшла нова відповідь на ваш коментар від %{author_name} на <a href="%{resource_path}">%{resource_title}</a>
+      votes:
+        create:
+          error: При голосуванні коментаря сталися помилки.
+    components:
+      add_comment_form:
+        account_message: <a href="%{sign_in_url}">Увійдіть за допомогою свого облікового запису</a> або <a href="%{sign_up_url}">зареєструйтесь</a>, щоб додати свій коментар.
+        form:
+          body:
+            label: Коментар
+            placeholder: Що ви думаєте з цього приводу?
+          form_error: Тут обов'язково потрібно ввести текст, але не більше, ніж %{length} символів.
+          submit: Надіслати
+          user_group_id:
+            label: Коментувати як
+        opinion:
+          neutral: Безсторонньо
+        remaining_characters: "Залишилось %{count} символів"
+        remaining_characters_1: "Залишився %{count} символ"
+        title: Додати свій коментар
+      comment:
+        alignment:
+          against: Проти
+          in_favor: За
+        deleted_user: Видалений користувач
+        reply: Відповісти
+        report:
+          action: Доповісти
+          already_reported: Про цей вміст вже повідомлено, і його перегляне адміністратор.
+          close: Закрити
+          description: Чи цей вміст недоречний?
+          details: Додаткові коментарі
+          reasons:
+            does_not_belong: Містить незаконну діяльність, загрози самогубства, особисту інформацію чи ще щось, чого, на вашу думку, не повинно бути в %{organization_name}.
+            offensive: Містить расизм, сексизм, образи, особисті напади, загрози смерті, заяви про самогубство або будь-які ненависницькі висловлювання.
+            spam: Містить клацоловки (маніпулятивно-сенсаційні заголовки), рекламу, афери або дописи ботів.
+          title: Повідомити про проблему
+        verified_user_group: Перевірена організація
+      comment_order_selector:
+        order:
+          best_rated: З найкращим рейтингом
+          most_discussed: Найбільш обговорюване
+          older: Давніші
+          recent: Нещодавнє
+        title: 'Впорядкувати за:'
+      comment_thread:
+        title: Бесіда з %{authorName}
+      comments:
+        blocked_comments_warning: Коментарі на цьому кроці відключені, проте ви можете прочитати коментарі з попередніх кроків.
+        loading: Завантаження коментарів...
+        title: "%{count} коментарів"
+      featured_comment:
+        title: Рекомендований коментар
+  errors:
+    messages:
+      cannot_have_comments: не підлягає коментуванню

data/lib/decidim/comments/commentable.rb

@@ -7,7 +7,6 @@ module Decidim
     # Shared behaviour for commentable models.
     module Commentable
       extend ActiveSupport::Concern
-      include Decidim::Notifiable
 
       included do
         has_many :comments, as: :commentable, foreign_key: "decidim_commentable_id", foreign_type: "decidim_commentable_type", class_name: "Decidim::Comments::Comment"
@@ -38,6 +37,14 @@ module Decidim
         def commentable_type
           self.class.name
         end
+
+        # Public: Defines which users will receive a notification when a comment is created.
+        # This method can be overridden at each resource model to include or exclude
+        # other users, eg. admins.
+        # Returns: a relation of Decidim::User objects.
+        def users_to_notify_on_comment_created
+          Decidim::User.none
+        end
       end
     end
   end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-comments
 version: !ruby/object:Gem::Version
-  version: 0.5.1
+  version: 0.6.0
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-08-21 00:00:00.000000000 Z
+date: 2017-09-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -18,14 +18,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
@@ -60,28 +60,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.6.0
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.6.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.5.1
+        version: 0.6.0
 description: Pluggable comments system for some components.
 email:
 - josepjaume@gmail.com
@@ -99,6 +99,7 @@ files:
 - app/assets/javascripts/decidim/comments/comments.js.erb
 - app/commands/decidim/comments/create_comment.rb
 - app/commands/decidim/comments/vote_comment.rb
+- app/events/decidim/comments/comment_created_event.rb
 - app/forms/decidim/comments/comment_form.rb
 - app/frontend/application/apollo_client.ts
 - app/frontend/application/application.component.test.tsx
@@ -142,7 +143,6 @@ files:
 - app/frontend/support/require_all.ts
 - app/frontend/support/resolve_graphql_query.ts
 - app/frontend/support/schema.ts
-- app/mailers/decidim/comments/comment_notification_mailer.rb
 - app/models/decidim/comments/abilities/admin_ability.rb
 - app/models/decidim/comments/abilities/current_user_ability.rb
 - app/models/decidim/comments/abilities/participatory_process_admin_ability.rb
@@ -156,9 +156,6 @@ files:
 - app/types/decidim/comments/commentable_interface.rb
 - app/types/decidim/comments/commentable_mutation_type.rb
 - app/types/decidim/comments/commentable_type.rb
-- app/views/decidim/comments/comment_notification_mailer/comment_created.html.erb
-- app/views/decidim/comments/comment_notification_mailer/reply_created.html.erb
-- config/i18n-tasks.yml
 - config/locales/ca.yml
 - config/locales/en.yml
 - config/locales/es.yml
@@ -168,6 +165,7 @@ files:
 - config/locales/it.yml
 - config/locales/nl.yml
 - config/locales/pl.yml
+- config/locales/uk.yml
 - db/migrate/20161130143508_create_comments.rb
 - db/migrate/20161214082645_add_depth_to_comments.rb
 - db/migrate/20161216102820_add_alignment_to_comments.rb

data/app/mailers/decidim/comments/comment_notification_mailer.rb

@@ -1,44 +0,0 @@
-# frozen_string_literal: true
-
-module Decidim
-  module Comments
-    # A custom mailer for sending notifications to users when
-    # a comment is created.
-    class CommentNotificationMailer < Decidim::ApplicationMailer
-      helper Decidim::ResourceHelper
-
-      helper_method :commentable_title
-
-      def comment_created(user, comment, commentable)
-        with_user(user) do
-          @user = user
-          @comment = comment
-          @commentable = commentable
-          @locator = Decidim::ResourceLocatorPresenter.new(@commentable)
-          @organization = commentable.organization
-          subject = I18n.t("comment_created.subject", scope: "decidim.comments.mailer.comment_notification")
-          mail(to: user.email, subject: subject)
-        end
-      end
-
-      def reply_created(user, reply, comment, commentable)
-        with_user(user) do
-          @user = user
-          @reply = reply
-          @comment = comment
-          @commentable = commentable
-          @locator = Decidim::ResourceLocatorPresenter.new(@commentable)
-          @organization = commentable.organization
-          subject = I18n.t("reply_created.subject", scope: "decidim.comments.mailer.comment_notification")
-          mail(to: user.email, subject: subject)
-        end
-      end
-
-      private
-
-      def commentable_title
-        @commentable.title.is_a?(Hash) ? @commentable.title[I18n.locale.to_s] : @commentable.title
-      end
-    end
-  end
-end

data/app/views/decidim/comments/comment_notification_mailer/comment_created.html.erb

@@ -1,18 +0,0 @@
-<p><%= t("decidim.comments.comment_notification_mailer.hello", name: @user.name) %></p>
-
-<p>
-  <%=
-    t(".new_comment_html", {
-      commenter: @comment.author.name,
-      commentable_link: link_to(commentable_title, @locator.url(anchor: "comment_#{@comment.id}"))
-    })
-  %>
-</p>
-
-<blockquote>
-  <%= @comment.body %>
-</blockquote>
-
-<p>
-  <%= t("decidim.comments.comment_notification_mailer.manage_email_subscriptions_html", link: link_to(t("decidim.comments.comment_notification_mailer.notifications_settings_link"), decidim.notifications_settings_url(host: @organization.host))) %>
-</p>

data/app/views/decidim/comments/comment_notification_mailer/reply_created.html.erb

@@ -1,18 +0,0 @@
-<p><%= t("decidim.comments.comment_notification_mailer.hello", name: @user.name) %></p>
-
-<p>
-  <%=
-    t(".new_reply_html", {
-      commenter: @reply.author.name,
-      commentable_link: link_to(commentable_title, @locator.url(anchor: "comment_#{@reply.id}"))
-    })
-  %>
-</p>
-
-<blockquote>
-  <%= @reply.body %>
-</blockquote>
-
-<p>
-  <%= t("decidim.comments.comment_notification_mailer.manage_email_subscriptions_html", link: link_to(t("decidim.comments.comment_notification_mailer.notifications_settings_link"), decidim.notifications_settings_url(host: @organization.host))) %>
-</p>

data/config/i18n-tasks.yml

@@ -1,123 +0,0 @@
-# i18n-tasks finds and manages missing and unused translations: https://github.com/glebm/i18n-tasks
-
-# The "main" locale.
-base_locale: en
-
-## Reporting locale, default: en. Available: en, ru.
-# internal_locale: en
-
-# Read and write translations.
-data:
-  ## Translations are read from the file system. Supported format: YAML, JSON.
-  ## Provide a custom adapter:
-  # adapter: I18n::Tasks::Data::FileSystem
-
-  # Locale files or `File.find` patterns where translations are read from:
-  read:
-    ## Default:
-    # - config/locales/%{locale}.yml
-    ## More files:
-    # - config/locales/**/*.%{locale}.yml
-    ## Another gem (replace %#= with %=):
-    # - "<%#= %x[bundle show vagrant].chomp %>/templates/locales/%{locale}.yml"
-
-  # Locale files to write new keys to, based on a list of key pattern => file rules. Matched from top to bottom:
-  # `i18n-tasks normalize -p` will force move the keys according to these rules
-  write:
-    ## For example, write devise and simple form keys to their respective files:
-    # - ['{devise, simple_form}.*', 'config/locales/\1.%{locale}.yml']
-    ## Catch-all default:
-    # - config/locales/%{locale}.yml
-
-  ## Specify the router (see Readme for details). Valid values: conservative_router, pattern_router, or a custom class.
-  # router: convervative_router
-
-  yaml:
-    write:
-      # do not wrap lines at 80 characters
-      line_width: -1
-
-  ## Pretty-print JSON:
-  # json:
-  #   write:
-  #     indent: '  '
-  #     space: ' '
-  #     object_nl: "\n"
-  #     array_nl: "\n"
-
-# Find translate calls
-search:
-  ## Paths or `File.find` patterns to search in:
-  # paths:
-  #  - app/
-
-  ## Root directories for relative keys resolution.
-  # relative_roots:
-  #   - app/controllers
-  #   - app/helpers
-  #   - app/mailers
-  #   - app/presenters
-  #   - app/views
-
-  ## Files or `File.fnmatch` patterns to exclude from search. Some files are always excluded regardless of this setting:
-  ##   %w(*.jpg *.png *.gif *.svg *.ico *.eot *.otf *.ttf *.woff *.woff2 *.pdf *.css *.sass *.scss *.less *.yml *.json)
-  exclude:
-    - app/assets/images
-    - app/assets/fonts
-    - app/assets/javascripts/decidim/comments/bundle.js
-    - app/assets/javascripts/decidim/comments/bundle.js.map
-
-  ## Alternatively, the only files or `File.fnmatch patterns` to search in `paths`:
-  ## If specified, this settings takes priority over `exclude`, but `exclude` still applies.
-  # only: ["*.rb", "*.html.slim"]
-
-  ## If `strict` is `false`, guess usages such as t("categories.#{category}.title"). The default is `true`.
-  strict: false
-
-  ## Multiple scanners can be used. Their results are merged.
-  ## The options specified above are passed down to each scanner. Per-scanner options can be specified as well.
-  ## See this example of a custom scanner: https://github.com/glebm/i18n-tasks/wiki/A-custom-scanner-example
-
-## Google Translate
-# translation:
-#   # Get an API key and set billing info at https://code.google.com/apis/console to use Google Translate
-#   api_key: "AbC-dEf5"
-
-## Do not consider these keys missing:
-ignore_missing:
-- 'components.*'
-# - 'errors.messages.{accepted,blank,invalid,too_short,too_long}'
-# - '{devise,simple_form}.*'
-
-## Consider these keys used:
-ignore_unused:
-- 'activerecord.errors.messages.*'
-- 'decidim.components.*'
-# - '{devise,kaminari,will_paginate}.*'
-# - 'simple_form.{yes,no}'
-# - 'simple_form.{placeholders,hints,labels}.*'
-# - 'simple_form.{error_notification,required}.:'
-
-## Exclude these keys from the `i18n-tasks eq-base' report:
-# ignore_eq_base:
-#   all:
-#     - common.ok
-#   fr,es:
-#     - common.brand
-
-## Ignore these keys completely:
-# ignore:
-#  - kaminari.*
-
-## Sometimes, it isn't possible for i18n-tasks to match the key correctly,
-## e.g. in case of a relative key defined in a helper method.
-## In these cases you can use the built-in PatternMapper to map patterns to keys, e.g.:
-#
-# <%#= I18n::Tasks.add_scanner 'I18n::Tasks::Scanners::PatternMapper',
-#        only: %w(*.html.haml *.html.slim),
-#        patterns: [['= title\b', '.page_title']] %>
-#
-# The PatternMapper can also match key literals via a special %{key} interpolation, e.g.:
-#
-# <%#= I18n::Tasks.add_scanner 'I18n::Tasks::Scanners::PatternMapper',
-#        patterns: [['\bSpree\.t[( ]\s*%{key}', 'spree.%{key}']] %>