decidim-comments 0.2.0 → 0.3.0

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

@@ -13,15 +13,15 @@ module Decidim
         property :commentable_type
       end
 
-      field :acceptsNewComments, !types.Boolean, "Wether the object can have new comments or not" do
+      field :acceptsNewComments, !types.Boolean, "Whether the object can have new comments or not" do
         property :accepts_new_comments?
       end
 
-      field :commentsHaveAlignment, !types.Boolean, "Wether the object comments have alignment or not" do
+      field :commentsHaveAlignment, !types.Boolean, "Whether the object comments have alignment or not" do
         property :comments_have_alignment?
       end
 
-      field :commentsHaveVotes, !types.Boolean, "Wether the object comments have votes or not" do
+      field :commentsHaveVotes, !types.Boolean, "Whether the object comments have votes or not" do
         property :comments_have_votes?
       end
 

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

@@ -4,7 +4,7 @@
   <%=
     t(".new_comment_html", {
       commenter: @comment.author.name,
-      commentable_link: link_to(commentable_title, decidim_resource_url(@commentable))
+      commentable_link: link_to(commentable_title, @locator.url(anchor: "comment_#{@comment.id}"))
     })
   %>
 </p>

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

@@ -4,7 +4,7 @@
   <%=
     t(".new_reply_html", {
       commenter: @reply.author.name,
-      commentable_link: link_to(commentable_title, decidim_resource_url(@commentable))
+      commentable_link: link_to(commentable_title, @locator.url(anchor: "comment_#{@reply.id}"))
     })
   %>
 </p>

data/config/locales/ca.yml

@@ -19,6 +19,9 @@ ca:
             subject: Tens un nou comentari
           reply_created:
             subject: Tens una nova resposta del teu comentari
+      votes:
+        create:
+          error: Hi ha hagut errors en votar el comentari.
     components:
       add_comment_form:
         account_message: "<a href=\"%{sign_in_url}\">Entra amb el teu compte</a> o <a href=\"%{sign_up_url}\">registra't</a> per a deixar un comentari.\n"
@@ -37,6 +40,7 @@ ca:
         alignment:
           against: En contra
           in_favor: A favor
+        deleted_user: Usuari eliminat
         reply: Respondre
         report:
           action: Denuncia
@@ -49,6 +53,7 @@ ca:
             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: Denuncia un problema
+        verified_user_group: Organització verificada
       comment_order_selector:
         order:
           best_rated: Més ben valorats

data/config/locales/en.yml

@@ -20,6 +20,9 @@ en:
             subject: You have a new comment
           reply_created:
             subject: You have a new reply of your comment
+      votes:
+        create:
+          error: There's been errors when voting the comment.
     components:
       add_comment_form:
         account_message: '<a href="%{sign_in_url}">Sign in with your account</a> or <a href="%{sign_up_url}">sign up</a> to add your comment. '
@@ -38,6 +41,7 @@ en:
         alignment:
           against: Against
           in_favor: In favor
+        deleted_user: Deleted user
         reply: Reply
         report:
           action: Report
@@ -50,6 +54,7 @@ en:
             offensive: Contains racism, sexism, slurs, personal attacks, death threats, suicide requests or any form of hate speech.
             spam: Contains clickbait, advertising, scams or script bots.
           title: Report a problem
+        verified_user_group: Verified organization
       comment_order_selector:
         order:
           best_rated: Best rated

data/config/locales/es.yml

@@ -19,6 +19,9 @@ es:
             subject: Tienes un nuevo comentario
           reply_created:
             subject: Uno de tus comentarios ha recibido respuesta
+      votes:
+        create:
+          error: Ha habido errores al votar el comentario.
     components:
       add_comment_form:
         account_message: "<a href=\"%{sign_in_url}\">Entra con tu cuenta</a> o <a href=\"%{sign_up_url}\">regístrate</a> para dejar tu comentario.\n"
@@ -37,6 +40,7 @@ es:
         alignment:
           against: En contra
           in_favor: A favor
+        deleted_user: Usuario eliminado
         reply: Respuesta
         report:
           action: Denunciar
@@ -49,6 +53,7 @@ es:
             offensive: Contiene racismo, sexismo, insultos, ataques personales, amenazas de muerte, solicitudes de suicidio o cualquier forma de discurso de odio.
             spam: Contiene clickbait, publicidad o estafas.
           title: Denunciar un problema
+        verified_user_group: Organización verificada
       comment_order_selector:
         order:
           best_rated: Mejor valoración

data/config/locales/it.yml

@@ -0,0 +1,65 @@
+it:
+  activerecord:
+    errors:
+      messages:
+        cannot_have_comments: non si possono fare commenti
+  decidim:
+    comments:
+      comment_notification_mailer:
+        comment_created:
+          new_comment_html: C'è un nuovo commento da parte di <b>%{commenter}</b> al link <b>%{commentable_link}</b>
+        hello: Ciao %{name},
+        manage_email_subscriptions_html: Puoi bloccare la ricezione di questo tipo di email variando le impostazioni su %{link}.
+        notifications_settings_link: pagina per le impostazioni delle notifiche
+        reply_created:
+          new_reply_html: C'è una nuova risposta al tuo commento da parte di <b>%{commenter}</b> in <b>%{commentable_link}</b>
+      mailer:
+        comment_notification:
+          comment_created:
+            subject: C'è un nuovo commento
+          reply_created:
+            subject: Hai ricevuto una nuova risposta ad un tuo commento
+    components:
+      add_comment_form:
+        account_message: '<a href="%{sign_in_url}">Entra col tuo account</a> or <a href="%{sign_up_url}">Registrati</a> per poter commentare. '
+        form:
+          body:
+            label: Commenta
+            placeholder: Cosa ne pensi?
+          form_error: Il testo è necessario, deve essere obbligatoriamente indicato (max %{length} caratteri).
+          submit: Invia
+          user_group_id:
+            label: Commenta come
+        opinion:
+          neutral: Neutro
+        title: Aggiungi il tuo commento
+      comment:
+        alignment:
+          against: Contro
+          in_favor: A favore
+        reply: Rispondi
+        report:
+          already_reported: Questo contenuto è già stato indicato e sarà revisionato da un utente Admnistrator.
+          close: Chiudi
+          description: Trovi questo contenuto inappropriato?
+          details: motivazione
+          reasons:
+            does_not_belong: Contiene un'attività illegale, istigazioni al suicidio, minacce, informazioni personali o riservate, oppure vi sono dei contenuti che reputi inappropriati per %{organization_name}.
+            offensive: Vi sono contenuti razzisti, sessisti, offensivi, attacchi di carattere personale, minacce di morte o altro tipo di minacci, istigazioni al suicidio o altre forme d'odio verbale.
+            spam: Contiene pubblicità, truffe, clickbait ("esca da click") o altro contenuto mirato ad attrarre traffico internet.
+          title: Segnala un problema
+      comment_order_selector:
+        order:
+          best_rated: Favoriti
+          most_discussed: Più discussi
+          older: Più vecchi
+          recent: Più recenti
+        title: 'Ordina per:'
+      comment_thread:
+        title: Conversazioni con %{authorName}
+      comments:
+        blocked_comments_warning: I commenti sono disabilitati per questa fase, ma puoi leggere i commenti delle fasi precedenti.
+        loading: Sto caricando i commenti ...
+        title: "%{count} commenti"
+      featured_comment:
+        title: Commento in primo piano

data/db/migrate/20161130143508_create_comments.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class CreateComments < ActiveRecord::Migration[5.0]
   def change
     create_table :decidim_comments_comments do |t|

data/db/migrate/20161214082645_add_depth_to_comments.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddDepthToComments < ActiveRecord::Migration[5.0]
   def change
     add_column :decidim_comments_comments, :depth, :integer, null: false, default: 0

data/db/migrate/20161216102820_add_alignment_to_comments.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddAlignmentToComments < ActiveRecord::Migration[5.0]
   def change
     add_column :decidim_comments_comments, :alignment, :integer, null: false, default: 0

data/db/migrate/20161219150806_create_comment_votes.rb

@@ -1,10 +1,12 @@
+# frozen_string_literal: true
+
 class CreateCommentVotes < ActiveRecord::Migration[5.0]
   def change
     create_table :decidim_comments_comment_votes do |t|
       t.integer :weight, null: false
       t.references :decidim_comment, null: false, index: { name: "decidim_comments_comment_vote_comment" }
       t.references :decidim_author, null: false, index: { name: "decidim_comments_comment_vote_author" }
-      
+
       t.timestamps
     end
 

data/db/migrate/20170123102043_add_user_group_id_to_comments.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddUserGroupIdToComments < ActiveRecord::Migration[5.0]
   def change
     add_column :decidim_comments_comments, :decidim_user_group_id, :integer, index: true

data/db/migrate/20170504085413_add_root_commentable_to_comments.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class AddRootCommentableToComments < ActiveRecord::Migration[5.0]
   def change
     change_table :decidim_comments_comments do |t|

data/db/migrate/20170510091348_update_root_commentable_for_comments.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class UpdateRootCommentableForComments < ActiveRecord::Migration[5.0]
   def up
     Decidim::Comments::Comment.where(depth: 0).update_all(
@@ -10,8 +12,7 @@ class UpdateRootCommentableForComments < ActiveRecord::Migration[5.0]
     end
   end
 
-  def down
-  end
+  def down; end
 
   private
 

data/db/migrate/20170510091409_set_root_commentable_null_constraints.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class SetRootCommentableNullConstraints < ActiveRecord::Migration[5.0]
   def change
     change_column_null(:decidim_comments_comments, :decidim_root_commentable_id, false)

data/lib/decidim/comments/comment_serializer.rb

@@ -30,7 +30,7 @@ module Decidim
       private
 
       def root_commentable_url
-        @root_commentable_url ||= decidim_resource_url(resource.root_commentable)
+        @root_commentable_url ||= Decidim::ResourceLocatorPresenter.new(resource.root_commentable).url
       end
     end
   end

data/lib/decidim/comments/commentable.rb

@@ -11,23 +11,23 @@ module Decidim
       included do
         has_many :comments, as: :commentable, foreign_key: "decidim_commentable_id", foreign_type: "decidim_commentable_type", class_name: "Decidim::Comments::Comment"
 
-        # Public: Wether the object's comments are visible or not.
+        # Public: Whether the object's comments are visible or not.
         def commentable?
           true
         end
 
-        # Public: Wether the object can have new comments or not.
+        # Public: Whether the object can have new comments or not.
         def accepts_new_comments?
           true
         end
 
-        # Public: Wether the object's comments can have alignment or not. It enables the
+        # Public: Whether the object's comments can have alignment or not. It enables the
         # alignment selector in the add new comment form.
         def comments_have_alignment?
           false
         end
 
-        # Public: Wether the object's comments can have have votes or not. It enables the
+        # Public: Whether the object's comments can have have votes or not. It enables the
         # upvote and downvote buttons for comments.
         def comments_have_votes?
           false

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: decidim-comments
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Josep Jaume Rey Peroy
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-06-02 00:00:00.000000000 Z
+date: 2017-06-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-core
@@ -18,28 +18,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
 - !ruby/object:Gem::Dependency
   name: rails
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.2
+        version: 5.1.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 5.0.2
+        version: 5.1.1
 - !ruby/object:Gem::Dependency
   name: jquery-rails
   requirement: !ruby/object:Gem::Requirement
@@ -60,14 +60,14 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.2.0
+        version: 0.3.0
 description: Pluggable comments system for some components.
 email:
 - josepjaume@gmail.com
@@ -149,6 +149,7 @@ files:
 - config/locales/eu.yml
 - config/locales/fi.yml
 - config/locales/fr.yml
+- config/locales/it.yml
 - config/locales/nl.yml
 - db/migrate/20161130143508_create_comments.rb
 - db/migrate/20161214082645_add_depth_to_comments.rb