decidim-comments 0.25.2 → 0.26.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1e3298db6f46520ee3aec73dfd157903fdd6c2d04df4aecaa2f12adaa7459b8
-  data.tar.gz: bed10b00feb2030206840417606cdb319e6c7b22c1a43bd97aaffa5f4b38c285
+  metadata.gz: 3e83817a1c75bea86a18203c7337082ff1985b080c40d59e29d66170f2b08e87
+  data.tar.gz: db421cb33aa1382ab61b6c35497b3eedba6df9337bc534490c38a13f2fc82354
 SHA512:
-  metadata.gz: f93e2ace868d629d78f279ff19fae6abe67c9bee71c177dc2cb22b1c96a76b78834722b118f7206f210b9c28ff2f3126b57c68f84a5cb9fe49bd307275edd38f
-  data.tar.gz: 609fd4dea72997a20dfea7570d2524a5f9a614521dde027fce2bec1cb696d5458ade26a7bb1e2697fe0bb27029b9a1de459060c00929c10f056a5e6f4719db29
+  metadata.gz: 822bce1d6c9aaec9fc7b9cf7ad7def2e1e3ed1b9c26c00d3547c05a4b566f40f38c9a332f563c780af86de97954a5a3da1f287ef69462ed00024f73bc0d33c26
+  data.tar.gz: bd08532ef5fa64c9a442466e8e881a70f7bedf4bef2a2650998193cc7b9817997c3d47dfd86015a2c4cd2c7ea6df6a302ec55b4cd0ac7d198a7cb3ceb3849d4b

data/app/cells/decidim/comments/comment/utilities.erb

@@ -4,7 +4,7 @@
   </label>
   <ul id="<%= context_menu_id %>" data-dropdown data-close-on-click="true" data-position="left" data-alignment="top" class="card dropdown-pane comment__header__context-menu__content">
     <li>
-      <button type="button" class="link-alt comment__header__context-menu__content-item" data-open="<%= current_user.present? ? "flagModalComment#{model.id}" : "loginModal" %>" title="<%= t("decidim.components.comment.report.title") %>" aria-controls="<%= current_user.present? ? "flagModalComment#{model.id}" : "loginModal" %>" aria-haspopup="true" tabindex="0">
+      <button type="button" class="link-alt comment__header__context-menu__content-item" data-open="<%= current_user.present? ? "flagModalComment#{model.id}" : "loginModal" %>" title="<%= t("decidim.components.comment.report.title") %>" aria-controls="<%= current_user.present? ? "flagModalComment#{model.id}" : "loginModal" %>" aria-haspopup="dialog" tabindex="0">
         <%= icon "flag", class: "icon--small", aria_label: t("decidim.components.comment.report.title") %>
         <span><%= t("decidim.components.comment.report.action") %></span>
       </button>
@@ -17,7 +17,7 @@
     </li>
     <% if model.authored_by?(current_user) %>
       <li>
-      <button type="button" class="link-alt comment__header__context-menu__content-item" data-open="<%= "editCommentModal#{model.id}" %>" title="<%= t("decidim.components.comment.edit") %>" aria-controls="<%= "editCommentModal#{model.id}" %>" aria-haspopup="true" tabindex="0">
+      <button type="button" class="link-alt comment__header__context-menu__content-item" data-open="<%= "editCommentModal#{model.id}" %>" title="<%= t("decidim.components.comment.edit") %>" aria-controls="<%= "editCommentModal#{model.id}" %>" aria-haspopup="dialog" tabindex="0">
           <%= icon "pencil", class: "icon--small", aria_label: t("decidim.components.comment.edit") %>
           <span><%= t("decidim.components.comment.edit") %></span>
       </button>

data/app/cells/decidim/comments/comment_cell.rb

@@ -16,6 +16,7 @@ module Decidim
       property :deleted_at
       property :alignment
       property :translated_body
+      property :formatted_body
       property :comment_threads
       property :accepts_new_comments?
       property :edited?
@@ -32,14 +33,31 @@ module Decidim
         render :votes
       end
 
+      def perform_caching?
+        super && has_replies? == false
+      end
+
       private
 
+      def cache_hash
+        return @hash if defined?(@hash)
+
+        hash = []
+        hash.push(I18n.locale)
+        hash.push(model.must_render_translation?(current_organization) ? 1 : 0)
+        hash.push(model.authored_by?(current_user) ? 1 : 0)
+        hash.push(model.reported_by?(current_user) ? 1 : 0)
+        hash.push(model.cache_key_with_version)
+        hash.push(model.author.cache_key_with_version)
+        @hash = hash.join(Decidim.cache_key_separator)
+      end
+
       def decidim_comments
         Decidim::Comments::Engine.routes.url_helpers
       end
 
       def comment_body
-        Decidim::ContentProcessor.render(translated_body)
+        formatted_body
       end
 
       def replies

data/app/cells/decidim/comments/comment_form_cell.rb

@@ -17,6 +17,15 @@ module Decidim
 
       private
 
+      def cache_hash
+        hash = []
+        hash.push(I18n.locale)
+        hash.push(model.cache_key)
+        hash.push(order)
+        hash.push(current_user.try(:id))
+        hash.join(Decidim.cache_key_separator)
+      end
+
       def decidim_comments
         Decidim::Comments::Engine.routes.url_helpers
       end

data/app/cells/decidim/comments/comments/order_control.erb

@@ -12,7 +12,7 @@
       <a href="#" id="comments-order-menu-control"
         aria-label="<%= t("decidim.components.comment_order_selector.title") %>"
         aria-controls="comments-order-menu"
-        aria-haspopup="true"
+        aria-haspopup="menu"
         role="menuitem"><%= t("decidim.components.comment_order_selector.order.#{order}") %></a>
       <ul class="menu is-dropdown-submenu submenu first-sub vertical"
         id="comments-order-chooser-menu"

data/app/cells/decidim/comments/edit_comment_modal_form/show.erb

@@ -1,6 +1,6 @@
-<div class="reveal edit-comment-modal" id="<%= "editCommentModal#{model.id}" %>" data-reveal>
+<div class="reveal edit-comment-modal" id="<%= "editCommentModal#{model.id}" %>" data-reveal role="dialog" aria-modal="true" aria-labelledby="<%= "editCommentModal#{model.id}" %>-label">
   <div class="reveal__header">
-    <h3 class="reveal__title"><%= t("decidim.components.edit_comment_modal_form.title") %></h3>
+    <h3 id="<%= "editCommentModal#{model.id}" %>-label" class="reveal__title"><%= t("decidim.components.edit_comment_modal_form.title") %></h3>
     <button class="close-button" data-close aria-label="<%= t("decidim.components.edit_comment_modal_form.close") %>" type="button">
       <span aria-hidden="true">&times;</span>
     </button>

data/app/cells/decidim/comments/edit_comment_modal_form_cell.rb

@@ -9,6 +9,14 @@ module Decidim
 
       private
 
+      def cache_hash
+        hash = []
+        hash.push(I18n.locale)
+        hash.push(model.id)
+        hash.push(current_user.try(:id))
+        hash.join(Decidim.cache_key_separator)
+      end
+
       def decidim_comments
         Decidim::Comments::Engine.routes.url_helpers
       end

data/app/events/decidim/comments/comment_event.rb

@@ -7,10 +7,12 @@ module Decidim
     module CommentEvent
       extend ActiveSupport::Concern
       include Decidim::Events::AuthorEvent
+      include Decidim::Events::MachineTranslatedEvent
 
       included do
-        def resource_text
-          comment.formatted_body
+        def resource_text(override_translation = nil)
+          translated_body = translated_attribute(comment.body, comment.organization, override_translation)
+          Decidim::ContentProcessor.render(sanitize_content(render_markdown(translated_body)), "div")
         end
 
         def author
@@ -28,14 +30,45 @@ module Decidim
                                 end
         end
 
+        def translatable_resource
+          comment
+        end
+
+        def translatable_text
+          comment.body
+        end
+
+        def safe_resource_text
+          I18n.with_locale(comment.content_original_language) { resource_text }
+        end
+
+        def safe_resource_translated_text
+          I18n.with_locale(I18n.locale) { resource_text(true) }
+        end
+
         private
 
+        # Private: Initializes the Markdown parser
+        def markdown
+          @markdown ||= Decidim::Comments::Markdown.new
+        end
+
+        # Private: converts the string from markdown to html
+        def render_markdown(string)
+          markdown.render(string)
+        end
+
+        # Private: Returns the comment body sanitized, sanitizing HTML tags
+        def sanitize_content(content)
+          Decidim::ContentProcessor.sanitize(content)
+        end
+
         def comment
           @comment ||= Decidim::Comments::Comment.find(extra[:comment_id])
         end
 
         def resource_url_params
-          { anchor: "comment_#{comment.id}" }
+          { anchor: "comment_#{comment.id}", commentId: comment.id }
         end
       end
     end

data/app/events/decidim/comments/comment_voted_event.rb

@@ -21,6 +21,10 @@ module Decidim
         extra[:downvotes]
       end
 
+      def perform_translation?
+        false
+      end
+
       private
 
       def resource_url_params

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

@@ -179,11 +179,11 @@ module Decidim
       end
 
       def formatted_body
-        Decidim::ContentProcessor.render(sanitize_content(render_markdown(translated_body)), "div")
+        Decidim::ContentProcessor.render(sanitize_content_for_comment(render_markdown(translated_body)), "div")
       end
 
       def translated_body
-        @translated_body ||= translated_attribute(body, organization)
+        translated_attribute(body, organization)
       end
 
       def delete!
@@ -234,11 +234,6 @@ module Decidim
         self.depth = commentable.depth + 1 if commentable.respond_to?(:depth)
       end
 
-      # Private: Returns the comment body sanitized, sanitizing HTML tags
-      def sanitize_content(content)
-        Decidim::ContentProcessor.sanitize(content)
-      end
-
       # Private: Initializes the Markdown parser
       def markdown
         @markdown ||= Decidim::Comments::Markdown.new
@@ -254,6 +249,13 @@ module Decidim
 
         root_commentable.update_comments_count
       end
+
+      def sanitize_content_for_comment(text, options = {})
+        Rails::Html::WhiteListSanitizer.new.sanitize(
+          text,
+          { scrubber: Decidim::Comments::UserInputScrubber.new }.merge(options)
+        ).try(:html_safe)
+      end
     end
   end
 end

data/app/packs/src/decidim/comments/comments.component.test.js

@@ -114,7 +114,6 @@ describe("CommentsComponent", () => {
                   data-tooltip="true"
                   data-disable-hover="false"
                   data-keep-on-hover="true"
-                  aria-haspopup="true"
                   class="label-required has-tip"
               >
                 <span aria-hidden="true">*</span><span class="show-for-sr">Required field</span>
@@ -170,7 +169,7 @@ describe("CommentsComponent", () => {
               </span>
             </div>
             <div class="author-data__extra">
-                <button type="button" class="link-alt" data-open="flagModalComment${commentId}" title="Report inappropriate content" aria-controls="flagModalComment${commentId}" aria-haspopup="true" tabindex="0">
+                <button type="button" class="link-alt" data-open="flagModalComment${commentId}" title="Report inappropriate content" aria-controls="flagModalComment${commentId}" aria-haspopup="dialog" tabindex="0">
                   <svg role="img" aria-hidden="true" class="icon--flag icon icon--small">
                     <title></title>
                     <use href="/assets/decidim/icons-123.svg#icon-flag"></use>
@@ -261,7 +260,7 @@ describe("CommentsComponent", () => {
     let orderSelector = `
       <ul id="comments-order-menu" class="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" role="menubar">
         <li class="is-dropdown-submenu-parent opens-right" tabindex="-1" role="none">
-          <a href="#" id="comments-order-menu-control" aria-label="Order by:" aria-controls="comments-order-menu" aria-haspopup="true" role="menuitem">Older</a>
+          <a href="#" id="comments-order-menu-control" aria-label="Order by:" aria-controls="comments-order-menu" aria-haspopup="menu" role="menuitem">Older</a>
           <ul class="menu is-dropdown-submenu submenu first-sub vertical" id="comments-order-chooser-menu" role="menu" aria-labelledby="comments-order-menu-control" tabindex="-1" data-submenu="">
             <li role="none" class="is-submenu-item is-dropdown-submenu-item">
               <a tabindex="-1" role="menuitem" data-remote="true" href="/comments?commentable_gid=commentable-gid&amp;order=best_rated&amp;reload=1">

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

@@ -56,7 +56,7 @@ module Decidim
           affected_users = group.accepted_users - already_notified_users
           @already_notified_users += affected_users
 
-          notify(:user_group_mentioned, affected_users: affected_users, extra: { group: group })
+          notify(:user_group_mentioned, affected_users: affected_users, extra: { group_id: group.id })
         end
       end
 

data/app/views/decidim/comments/admin/shared/_availability_fields.html.erb

@@ -0,0 +1,15 @@
+<div class="row column">
+  <%= form.check_box :comments_enabled, label: t(".enabled"), :"data-toggle" => "customize_comments_times-div" %>
+</div>
+
+<div id="customize_comments_times-div" data-toggler=".hide" class="row column <%= @form.comments_enabled ? nil : "hide" %>">
+  <div class="row">
+    <div class="columns xlarge-6">
+      <%= form.datetime_field :comments_start_time, label: t(".start_time") %>
+    </div>
+
+    <div class="columns xlarge-6">
+      <%= form.datetime_field :comments_end_time, label: t(".end_time") %>
+    </div>
+  </div>
+</div>

data/config/locales/ar.yml

@@ -77,7 +77,6 @@ ar:
         blocked_comments_warning: التعليقات معطلة في هذا الوقت ، لكن يمكنك قراءة التعليقات السابقة.
         comment_details_title: تفاصيل التعليق
         loading: جارٍ تحميل التعليقات ...
-        single_comment_warning: يمكنك الإطلاع على التعليقات المتبقية الأخرى <a href="%{url}">هنا</a>.
         single_comment_warning_title: إنك ترى تعليقا واحدا
     events:
       comments:

data/config/locales/ca.yml

@@ -93,7 +93,7 @@ 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 href="%{url}">aquí</a>.
+        single_comment_warning: <a href="%{url}">Mostra tots els comentaris</a>
         single_comment_warning_title: Estàs veient un sol comentari
         title:
           one: "%{count} comentari"

data/config/locales/cs.yml

@@ -20,6 +20,12 @@ cs:
         other: Hlasy
   decidim:
     comments:
+      admin:
+        shared:
+          availability_fields:
+            enabled: Komentáře povoleny
+            end_time: Komentáře povoleny do
+            start_time: Komentáře povoleny od
       comments:
         create:
           error: Při vytváření komentáře došlo k chybě.
@@ -97,7 +103,7 @@ cs:
         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: <a href="%{url}">Zobrazit všechny komentáře</a>
         single_comment_warning_title: Vidíte jeden komentář
         title:
           one: "%{count} komentář"

data/config/locales/de.yml

@@ -16,6 +16,12 @@ de:
         other: Stimmen
   decidim:
     comments:
+      admin:
+        shared:
+          availability_fields:
+            enabled: Kommentare aktiviert
+            end_time: Kommentare aktiviert bis
+            start_time: Kommentare aktiviert von
       comments:
         create:
           error: Beim Erstellen des Kommentars ist ein Fehler aufgetreten.
@@ -93,7 +99,7 @@ de:
         blocked_comments_warning: Kommentare sind zu diesem Zeitpunkt deaktiviert, aber Sie können die vorherigen lesen.
         comment_details_title: Kommentarinformationen
         loading: Kommentare werden geladen ...
-        single_comment_warning: Sie können die restlichen Kommentare <a href="%{url}">hier</a> prüfen.
+        single_comment_warning: <a href="%{url}">Alle Kommentare anzeigen</a>
         single_comment_warning_title: Ihnen wird ein einzelner Kommentar angezeigt
         title:
           one: "%{count} Kommentar"

data/config/locales/el.yml

@@ -93,7 +93,6 @@ el:
         blocked_comments_warning: Τα σχόλια είναι απενεργοποιημένα αυτήν τη στιγμή, αλλά μπορείτε να διαβάσετε τα προηγούμενα σχόλια.
         comment_details_title: Λεπτομέρειες σχολίων
         loading: Φόρτωση σχολίων...
-        single_comment_warning: Μπορείτε να δείτε τα υπόλοιπα σχόλια <a href="%{url}">εδώ</a>.
         single_comment_warning_title: Βλέπετε ένα μόνο σχόλιο
         title:
           one: "%{count} σχόλιο"

data/config/locales/en.yml

@@ -17,6 +17,12 @@ en:
         other: Votes
   decidim:
     comments:
+      admin:
+        shared:
+          availability_fields:
+            enabled: Comments enabled
+            end_time: Comments enabled until
+            start_time: Comments enabled from
       comments:
         create:
           error: There was a problem creating the comment.
@@ -94,7 +100,7 @@ en:
         blocked_comments_warning: Comments are disabled at this time, but you can read the previous ones.
         comment_details_title: Comment details
         loading: Loading comments ...
-        single_comment_warning: You can check the rest of the comments <a href="%{url}">here</a>.
+        single_comment_warning: <a href="%{url}">View all comments</a>
         single_comment_warning_title: You are seeing a single comment
         title:
           one: "%{count} comment"

data/config/locales/es-MX.yml

@@ -93,7 +93,6 @@ es-MX:
         blocked_comments_warning: Los comentarios están deshabilitados en este momento, pero puedes leer los anteriores.
         comment_details_title: Detalles del comentario
         loading: Cargando los comentarios ...
-        single_comment_warning: Puedes revisar el resto de los comentarios <a href="%{url}">aquí</a>.
         single_comment_warning_title: Estás viendo un solo comentario
         title:
           one: "%{count} comentario"

data/config/locales/es-PY.yml

@@ -93,7 +93,6 @@ es-PY:
         blocked_comments_warning: Los comentarios están deshabilitados en este momento, pero puedes leer los anteriores.
         comment_details_title: Detalles del comentario
         loading: Cargando los comentarios ...
-        single_comment_warning: Puedes revisar el resto de los comentarios <a href="%{url}">aquí</a>.
         single_comment_warning_title: Estás viendo un solo comentario
         title:
           one: "%{count} comentario"

data/config/locales/es.yml

@@ -16,6 +16,12 @@ es:
         other: Votos
   decidim:
     comments:
+      admin:
+        shared:
+          availability_fields:
+            enabled: Comentarios habilitados
+            end_time: Comentarios habilitados hasta
+            start_time: Comentarios habilitados desde
       comments:
         create:
           error: Se ha producido un error al crear el comentario.
@@ -93,7 +99,7 @@ es:
         blocked_comments_warning: Los comentarios están deshabilitados en este momento, pero puedes leer los anteriores.
         comment_details_title: Detalles del comentario
         loading: Cargando los comentarios ...
-        single_comment_warning: Puedes revisar el resto de los comentarios <a href="%{url}">aquí</a>.
+        single_comment_warning: <a href="%{url}">Ver todos los comentarios</a>
         single_comment_warning_title: Estás viendo un solo comentario
         title:
           one: "%{count} comentario"

data/config/locales/eu.yml

@@ -16,6 +16,12 @@ eu:
         other: Botoak
   decidim:
     comments:
+      admin:
+        shared:
+          availability_fields:
+            enabled: Iruzkinak gaituta
+            end_time: Iruzkinak noiz arte aktibatuta
+            start_time: Iruzkinak noiztik aktibatuta
       comments:
         create:
           error: Arazoa gertatu da iruzkina sortzean.
@@ -93,7 +99,7 @@ eu:
         blocked_comments_warning: Iruzkinak desgaituta daude une honetan, baina aurrekoak irakur ditzakezu.
         comment_details_title: Iruzkinaren xehetasunak
         loading: Iruzkinak kargatzen...
-        single_comment_warning: Gainontzeko iruzkinak berrikusi ahal dituzu <a href="%{url}">hemen</a>.
+        single_comment_warning: <a href="%{url}">k erakusten ditu iruzkin guztiak</a>
         single_comment_warning_title: Iruzkin bakar bat ikusten ari zara
       down_vote_button:
         text: Ez nago ados iruzkin honekin

data/config/locales/fi-plain.yml

@@ -16,6 +16,12 @@ fi-pl:
         other: Äänet
   decidim:
     comments:
+      admin:
+        shared:
+          availability_fields:
+            enabled: Kommentointi sallittu
+            end_time: Kommentointi sallittu aikarajaan saakka
+            start_time: Kommentointi sallittu alkaen
       comments:
         create:
           error: Kommentin luotaessa tapahtui virhe.
@@ -93,7 +99,7 @@ fi-pl:
         blocked_comments_warning: Kommentit on poistettu käytöstä tällä hetkellä, mutta voit lukea aikaisempia kommentteja.
         comment_details_title: Kommentin yksityiskohdat
         loading: Ladataan kommentteja ...
-        single_comment_warning: Voit katsoa loput kommentit <a href="%{url}">täältä</a>.
+        single_comment_warning: <a href="%{url}">Näytä kaikki kommentit</a>
         single_comment_warning_title: Näet yhden kommentin
         title:
           one: "%{count} kommentti"

data/config/locales/fi.yml

@@ -16,6 +16,12 @@ fi:
         other: Äänet
   decidim:
     comments:
+      admin:
+        shared:
+          availability_fields:
+            enabled: Kommentointi sallittu
+            end_time: Kommentointi sallittu aikarajaan saakka
+            start_time: Kommentointi sallittu alkaen
       comments:
         create:
           error: Kommentin luotaessa tapahtui virhe.
@@ -93,7 +99,7 @@ fi:
         blocked_comments_warning: Kommentit on poistettu käytöstä tällä hetkellä, mutta voit lukea aikaisempia kommentteja.
         comment_details_title: Kommentin yksityiskohdat
         loading: Ladataan kommentteja ...
-        single_comment_warning: Voit katsoa loput kommentit <a href="%{url}">täältä</a>.
+        single_comment_warning: <a href="%{url}">Näytä kaikki kommentit</a>
         single_comment_warning_title: Näet yhden kommentin
         title:
           one: "%{count} kommentti"

data/config/locales/fr-CA.yml

@@ -16,6 +16,12 @@ fr-CA:
         other: Votes
   decidim:
     comments:
+      admin:
+        shared:
+          availability_fields:
+            enabled: Commentaires activés
+            end_time: Commentaires activés jusqu'à
+            start_time: Commentaires activés depuis
       comments:
         create:
           error: Une erreur s'est produite lors de la création du commentaire.
@@ -93,7 +99,7 @@ fr-CA:
         blocked_comments_warning: Les commentaires sont actuellement désactivés, mais vous pouvez lire ceux déjà saisis.
         comment_details_title: Détails du commentaire
         loading: Chargement des commentaires ...
-        single_comment_warning: Vous pouvez accéder au reste des commentaires <a href="%{url}">ici</a>.
+        single_comment_warning: <a href="%{url}">Voir tous les commentaires</a>
         single_comment_warning_title: Vous ne voyez qu'un seul commentaire
         title:
           one: "%{count} commentaire"

data/config/locales/fr.yml

@@ -16,6 +16,12 @@ fr:
         other: Votes
   decidim:
     comments:
+      admin:
+        shared:
+          availability_fields:
+            enabled: Commentaires activés
+            end_time: Commentaires activés jusqu'à
+            start_time: Commentaires activés depuis
       comments:
         create:
           error: Une erreur s'est produite lors de la création du commentaire.
@@ -93,7 +99,7 @@ fr:
         blocked_comments_warning: Les commentaires sont actuellement désactivés, mais vous pouvez lire ceux déjà saisis.
         comment_details_title: Détails du commentaire
         loading: Chargement des commentaires ...
-        single_comment_warning: Vous pouvez accéder au reste des commentaires <a href="%{url}">ici</a>.
+        single_comment_warning: <a href="%{url}">Voir tous les commentaires</a>
         single_comment_warning_title: Vous ne voyez qu'un seul commentaire
         title:
           one: "%{count} commentaire"

data/config/locales/gl.yml

@@ -16,6 +16,12 @@ gl:
         other: Votos
   decidim:
     comments:
+      admin:
+        shared:
+          availability_fields:
+            enabled: Comentarios habilitados
+            end_time: Comentarios habilitados até
+            start_time: Comentarios habilitados dende
       comments:
         create:
           error: Produciuse un problema ao crear o comentario.
@@ -93,7 +99,7 @@ gl:
         blocked_comments_warning: Os comentarios están desactivados neste momento, pero podes ler os anteriores.
         comment_details_title: Detalles do comentario
         loading: Cargando comentarios ...
-        single_comment_warning: Podes revisar os comentarios restantes <a href="%{url}">aquí</a>.
+        single_comment_warning: <a href="%{url}">Ver todos os comentarios</a>
         single_comment_warning_title: Estás a ver un único comentario
         title:
           one: "%{count} comentario"

data/config/locales/hu.yml

@@ -69,7 +69,6 @@ hu:
         blocked_comments_warning: A megjegyzések jelenleg le vannak tiltva, de a korábbiakat elolvashatod.
         comment_details_title: Megjegyzés részletei
         loading: Hozzászólások betöltése ...
-        single_comment_warning: A többi hozzászólást <a href="%{url}">itt</a> ellenőrizheti.
         single_comment_warning_title: Egyetlen megjegyzést látsz
     events:
       comments:

data/config/locales/it.yml

@@ -16,6 +16,12 @@ it:
         other: voti
   decidim:
     comments:
+      admin:
+        shared:
+          availability_fields:
+            enabled: Commenti abilitati
+            end_time: Commenti abilitati fino a
+            start_time: Commenti abilitati da
       comments:
         create:
           error: Ci sono stati problemi durante la creazione del commento.
@@ -93,7 +99,7 @@ it:
         blocked_comments_warning: I commenti sono disabilitati in questo momento, ma puoi leggere quelli precedenti.
         comment_details_title: Dettagli commento
         loading: Sto caricando i commenti ...
-        single_comment_warning: Puoi controllare il resto dei commenti <a href="%{url}">qui</a>.
+        single_comment_warning: <a href="%{url}">Visualizza tutti i commenti</a>
         single_comment_warning_title: Stai vedendo un singolo commento
         title:
           one: "%{count} commento"

data/config/locales/ja.yml

@@ -14,6 +14,12 @@ ja:
         other: 投票
   decidim:
     comments:
+      admin:
+        shared:
+          availability_fields:
+            enabled: コメントを有効にする
+            end_time: 次の時点までのコメントを有効にする
+            start_time: 次の時点からコメントを有効にする
       comments:
         create:
           error: コメントの登録に問題がありました。
@@ -91,7 +97,7 @@ ja:
         blocked_comments_warning: コメントは現時点で無効になっていますが、以前のコメントを読むことができます。
         comment_details_title: コメントの詳細
         loading: コメントを読み込んでいます...
-        single_comment_warning: コメントの残りは <a href="%{url}">こちら</a>で確認できます。
+        single_comment_warning: <a href="%{url}">すべてのコメントを表示</a>
         single_comment_warning_title: コメントを1件のみ表示しています
         title:
           other: "%{count} 件のコメント"
@@ -113,12 +119,12 @@ ja:
           email_intro: "%{author_name} は %{resource_title}にコメントを残しました。このページで読むことができます:"
           email_outro: '%{author_name}をフォローしているため、この通知を受け取りました。プロフィールページからこのユーザーのフォローを解除することができます。'
           email_subject: '%{author_name} から %{resource_title} に対して新しいコメントがあります'
-          notification_title: There is a new comment by <a href="%{author_path}">%{author_name} %{author_nickname}</a> in <a href="%{resource_path}">%{resource_title}</a>.
+          notification_title: <a href="%{author_path}">%{author_name} %{author_nickname}</a> より <a href="%{resource_path}">%{resource_title} に対して新しいコメントがあります</a>.
         comment_by_followed_user_group:
           email_intro: 'グループ %{author_name} は %{resource_title}にコメントを残しました。このページで読むことができます:'
           email_outro: '%{author_name}をフォローしているため、この通知を受け取りました。プロフィールページからこのグループのフォローを解除できます。'
           email_subject: '%{author_name} から %{resource_title} に対して新しいコメントがあります'
-          notification_title: There is a new comment by <a href="%{author_path}">%{author_name} %{author_nickname}</a> in <a href="%{resource_path}">%{resource_title}</a>.
+          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}" 、またはその参加者をフォローしているためこの通知を受け取りました。前のリンクからフォローを解除することができます。'