decidim-blogs 0.24.3 → 0.25.0.rc1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 12010036fc39dbffd83e4eab11ef63ae9cfe01b1aa8fb3dfcefd91266f5d9609
-  data.tar.gz: eb78b7158b25db870b8752ea5df789bb4a4c17edf8cc3abb063cfaa8c0b4ad90
+  metadata.gz: 64516bfa5d6933d21c066c2faf7a88bbfee71eb0909a39816f96e0f2cdd650e9
+  data.tar.gz: 3eb683aece58e9e9d80bbf8704e9bc8c742a15231aeb031f174c5ab760e1494c
 SHA512:
-  metadata.gz: 406a124e0f124e05b983d30a42df71c44844997b320efe1f66fe6084fb7051e37b1fa22a50bc87f9b0aa8a99b55972dbb98ddd4aa8f4d8ed587314ebe021f3e2
-  data.tar.gz: 12abd00277f7135f93ea14f2f0f0e5f925b13fb1f559d4c5fffc7698f9c4a2e02ffc6c05ef709122cc1b10b1216305d150cf5e3a78133a8149a69105e61387e7
+  metadata.gz: 2ab903913efd95d49d35c80ab67edc3a37360b00691222aab53e48a6cfb1053c8aaded026429e872549e5f22c69d2ee0679042c659d86a2a6f1637791e1769f1
+  data.tar.gz: e1627fa2ec459e190a5e53d686753611e3b4a1ef35fe46c4597965aabc8117e806fe43a1973ff80fe2b8ae91e6a9ae085a5e30b300e877ad56836a06b5b93ddf

data/app/commands/decidim/blogs/admin/create_post.rb

@@ -32,7 +32,7 @@ module Decidim
             title: @form.title,
             body: @form.body,
             component: @form.current_component,
-            author: @current_user
+            author: @form.author
           }
 
           @post = Decidim.traceability.create!(

data/app/commands/decidim/blogs/admin/update_post.rb

@@ -35,7 +35,8 @@ module Decidim
         def update_post!
           post.update!(
             title: form.title,
-            body: form.body
+            body: form.body,
+            author: form.author
           )
         end
       end

data/app/controllers/decidim/blogs/admin/posts_controller.rb

@@ -5,6 +5,8 @@ module Decidim
     module Admin
       # This controller allows the create or update a blog.
       class PostsController < Admin::ApplicationController
+        helper UserGroupHelper
+
         def new
           enforce_permission_to :create, :blogpost
           @form = form(PostForm).instance

data/app/forms/decidim/blogs/admin/post_form.rb

@@ -10,8 +10,25 @@ module Decidim
         translatable_attribute :title, String
         translatable_attribute :body, String
 
+        attribute :user_group_id, Integer
+
         validates :title, translatable_presence: true
         validates :body, translatable_presence: true
+
+        def map_model(post)
+          self.user_group_id = post.author.id if post.author.is_a?(Decidim::UserGroup)
+        end
+
+        def user_group
+          @user_group ||= Decidim::UserGroup.find_by(
+            organization: current_organization,
+            id: user_group_id.to_i
+          )
+        end
+
+        def author
+          user_group || current_user
+        end
       end
     end
   end

data/app/models/decidim/blogs/post.rb

@@ -10,7 +10,7 @@ module Decidim
       include Decidim::HasAttachmentCollections
       include Decidim::HasComponent
       include Decidim::Authorable
-      include Decidim::Comments::Commentable
+      include Decidim::Comments::CommentableWithComponent
       include Decidim::Searchable
       include Decidim::Endorsable
       include Decidim::Followable
@@ -39,16 +39,6 @@ module Decidim
         participatory_space.try(:visible?) && component.try(:published?)
       end
 
-      # Public: Overrides the `commentable?` Commentable concern method.
-      def commentable?
-        component.settings.comments_enabled?
-      end
-
-      # Public: Overrides the `accepts_new_comments?` Commentable concern method.
-      def accepts_new_comments?
-        commentable? && !component.current_settings.comments_blocked
-      end
-
       # Public: Overrides the `comments_have_alignment?` Commentable concern method.
       def comments_have_alignment?
         true
@@ -59,13 +49,13 @@ module Decidim
         true
       end
 
-      def official?
-        author.nil?
+      # Public: Overrides the `allow_resource_permissions?` Resourceable concern method.
+      def allow_resource_permissions?
+        true
       end
 
-      # Public: Whether the object can have new comments or not.
-      def user_allowed_to_comment?(user)
-        can_participate_in_space?(user)
+      def official?
+        author.nil?
       end
 
       def users_to_notify_on_comment_created

data/app/packs/entrypoints/decidim_blogs.js

@@ -0,0 +1,2 @@
+// Images
+require.context("../images", true)

data/app/views/decidim/blogs/admin/posts/_form.html.erb

@@ -3,6 +3,11 @@
     <h2 class="card-title"><%= title %></h2>
   </div>
   <div class="card-section">
+    <% if current_organization.user_groups_enabled? && Decidim::UserGroups::ManageableUserGroups.for(current_user).verified.any? %>
+      <div class="field">
+        <%= user_group_select_field form, :user_group_id, label: t("decidim.blogs.actions.user_group_id") %>
+      </div>
+    <% end %>
     <div class="row column">
       <%= form.translated :text_field, :title, autofocus: true %>
     </div>

data/app/views/decidim/blogs/admin/posts/index.html.erb

@@ -47,6 +47,8 @@
                   <%= icon_link_to "paperclip", post_attachments_path(post), t("actions.attachments", scope: "decidim.meetings"), class: "action-icon--attachments" %>
                 <% end %>
 
+                <%= resource_permissions_link(post) %>
+
                 <% if allowed_to? :destroy, :blogpost, blog_post: post %>
                   <%= icon_link_to "circle-x", post_path(post), t("actions.destroy", scope: "decidim.blogs"), method: :delete, class: "action-icon--remove", data: { confirm: t("actions.confirm_destroy", scope: "decidim.blogs") } %>
                 <% end %>

data/app/views/decidim/blogs/posts/_posts.html.erb

@@ -9,7 +9,7 @@
           </h3>
           <% end %>
           <div class="card__author">
-            <%= cell "decidim/author", present(post.author), from: post %>
+            <%= cell "decidim/author", present(post.author), from: post, has_actions: true %>
           </div>
         </div>
         <%= decidim_sanitize post_description(post) %>

data/config/assets.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+base_path = File.expand_path("..", __dir__)
+
+Decidim::Webpacker.register_path("#{base_path}/app/packs")
+Decidim::Webpacker.register_entrypoints(
+  decidim_blogs: "#{base_path}/app/packs/entrypoints/decidim_blogs.js"
+)

data/config/locales/ar.yml

@@ -74,10 +74,3 @@ ar:
           email_outro: لقد تلقيت هذا الإشعار لأنك تتابع "%{participatory_space_title}". يمكنك إلغاء تتبعه من الرابط السابق.
           email_subject: منشور جديد منشور في %{participatory_space_title}
           notification_title: تم نشر المنشور <a href="%{resource_path}">%{resource_title}</a> في %{participatory_space_title}
-    pages:
-      home:
-        statistics:
-          posts_count: المشاركات
-    participatory_processes:
-      statistics:
-        posts_count: المشاركات

data/config/locales/ca.yml

@@ -15,6 +15,7 @@ ca:
         edit: Edita
         new: Nova publicació
         title: Accions
+        user_group_id: Crear publicació com
       admin:
         models:
           components:
@@ -76,10 +77,5 @@ ca:
           email_outro: Has rebut aquesta notificació perquè estàs seguint "%{participatory_space_title}". Pots deixar de seguir-lo des de l'enllaç anterior.
           email_subject: Nova publicació publicada a %{participatory_space_title}
           notification_title: La publicació <a href="%{resource_path}">%{resource_title}</a> ha estat publicada a %{participatory_space_title}
-    pages:
-      home:
-        statistics:
-          posts_count: Publicacions
-    participatory_processes:
-      statistics:
-        posts_count: Publicacions
+    statistics:
+      posts_count: Publicacions

data/config/locales/cs.yml

@@ -17,6 +17,7 @@ cs:
         edit: Upravit
         new: Nový příspěvek
         title: Akce
+        user_group_id: Vytvořit příspěvek jako
       admin:
         models:
           components:
@@ -78,10 +79,5 @@ cs:
           email_outro: Obdrželi jste toto oznámení, protože sledujete "%{participatory_space_title}". Můžete ho zrušit z předchozího odkazu.
           email_subject: Nový příspěvek publikován v %{participatory_space_title}
           notification_title: Příspěvek <a href="%{resource_path}">%{resource_title}</a> byl zveřejněn ve %{participatory_space_title}
-    pages:
-      home:
-        statistics:
-          posts_count: Příspěvky
-    participatory_processes:
-      statistics:
-        posts_count: Příspěvky
+    statistics:
+      posts_count: Příspěvky

data/config/locales/de.yml

@@ -15,6 +15,7 @@ de:
         edit: Bearbeiten
         new: Neuer Beitrag
         title: Aktionen
+        user_group_id: Beitrag erstellen als
       admin:
         models:
           components:
@@ -76,10 +77,5 @@ de:
           email_outro: Sie haben diese Benachrichtigung erhalten, weil Sie "%{participatory_space_title}" folgen. Falls Sie keine solchen Benachrichtigungen mehr erhalten möchten, besuchen Sie den obigen Link.
           email_subject: Neuer Beitrag in %{participatory_space_title}
           notification_title: Der Beitrag <a href="%{resource_path}">%{resource_title}</a> wurde in %{participatory_space_title} veröffentlicht
-    pages:
-      home:
-        statistics:
-          posts_count: Beiträge
-    participatory_processes:
-      statistics:
-        posts_count: Beiträge
+    statistics:
+      posts_count: Beiträge

data/config/locales/el.yml

@@ -75,10 +75,3 @@ el:
           email_outro: Λάβατε αυτήν την ειδοποίηση επειδή ακολουθείτε τον χώρο συμμετοχής «%{participatory_space_title}». Μπορείτε να σταματήσετε να τον ακολουθείτε από τον προηγούμενο σύνδεσμο.
           email_subject: Νέα δημοσίευση δημοσιεύτηκε στον χώρο συμμετοχής %{participatory_space_title}
           notification_title: Η δημοσίευση <a href="%{resource_path}">%{resource_title}</a> δημοσιεύτηκε στον χώρο συμμετοχής %{participatory_space_title}
-    pages:
-      home:
-        statistics:
-          posts_count: Δημοσιεύσεις
-    participatory_processes:
-      statistics:
-        posts_count: Δημοσιεύσεις

data/config/locales/en.yml

@@ -16,6 +16,7 @@ en:
         edit: Edit
         new: New post
         title: Actions
+        user_group_id: Create post as
       admin:
         models:
           components:
@@ -59,6 +60,11 @@ en:
       read_more: Read more
     components:
       blogs:
+        actions:
+          amend: Amend
+          comment: Comment
+          endorse: Endorse
+          vote: Vote
         name: Blog
         settings:
           global:
@@ -77,10 +83,5 @@ en:
           email_outro: You have received this notification because you are following "%{participatory_space_title}". You can unfollow it from the previous link.
           email_subject: New post published in %{participatory_space_title}
           notification_title: The post <a href="%{resource_path}">%{resource_title}</a> has been published in %{participatory_space_title}
-    pages:
-      home:
-        statistics:
-          posts_count: Posts
-    participatory_processes:
-      statistics:
-        posts_count: Posts
+    statistics:
+      posts_count: Posts

data/config/locales/es-MX.yml

@@ -15,6 +15,7 @@ es-MX:
         edit: Editar
         new: Nueva publicación
         title: Comportamiento
+        user_group_id: Crear publicación como
       admin:
         models:
           components:
@@ -76,10 +77,5 @@ es-MX:
           email_outro: Recibió esta notificación porque está siguiendo "%{participatory_space_title}". Puedes dejar de seguirlo desde el enlace anterior.
           email_subject: Nueva publicación publicada en %{participatory_space_title}
           notification_title: La publicación <a href="%{resource_path}">%{resource_title}</a> se publicó en %{participatory_space_title}.
-    pages:
-      home:
-        statistics:
-          posts_count: Publicaciones
-    participatory_processes:
-      statistics:
-        posts_count: Publicaciones
+    statistics:
+      posts_count: Publicaciones

data/config/locales/es-PY.yml

@@ -15,6 +15,7 @@ es-PY:
         edit: Editar
         new: Nueva publicación
         title: Comportamiento
+        user_group_id: Crear publicación como
       admin:
         models:
           components:
@@ -76,10 +77,5 @@ es-PY:
           email_outro: Recibió esta notificación porque está siguiendo "%{participatory_space_title}". Puedes dejar de seguirlo desde el enlace anterior.
           email_subject: Nueva publicación publicada en %{participatory_space_title}
           notification_title: La publicación <a href="%{resource_path}">%{resource_title}</a> se publicó en %{participatory_space_title}.
-    pages:
-      home:
-        statistics:
-          posts_count: Publicaciones
-    participatory_processes:
-      statistics:
-        posts_count: Publicaciones
+    statistics:
+      posts_count: Publicaciones

data/config/locales/es.yml

@@ -15,6 +15,7 @@ es:
         edit: Editar
         new: Nueva publicación
         title: Acciones
+        user_group_id: Crear publicación como
       admin:
         models:
           components:
@@ -76,10 +77,5 @@ es:
           email_outro: Recibió esta notificación porque está siguiendo "%{participatory_space_title}". Puedes dejar de seguirlo desde el enlace anterior.
           email_subject: Nueva publicación publicada en %{participatory_space_title}
           notification_title: La publicación <a href="%{resource_path}">%{resource_title}</a> se publicó en %{participatory_space_title}.
-    pages:
-      home:
-        statistics:
-          posts_count: Publicaciones
-    participatory_processes:
-      statistics:
-        posts_count: Publicaciones
+    statistics:
+      posts_count: Publicaciones

data/config/locales/eu.yml

@@ -70,10 +70,3 @@ eu:
           email_outro: Jakinarazpena jaso duzu "%{participatory_space_title}" jarraitzen ari zarenagatik. Aurreko esteka estekan jarrai dezakezu.
           email_subject: '%{participatory_space_title} urtean argitaratutako mezu berria'
           notification_title: <a href="%{resource_path}">%{resource_title}</a> post %{participatory_space_title} argitaratu da
-    pages:
-      home:
-        statistics:
-          posts_count: Mezuak
-    participatory_processes:
-      statistics:
-        posts_count: Mezuak

data/config/locales/fi-plain.yml

@@ -15,6 +15,7 @@ fi-pl:
         edit: Muokkaa
         new: Uusi artikkeli
         title: Toiminnot
+        user_group_id: Luo artikkeli käyttäjänä
       admin:
         models:
           components:
@@ -76,10 +77,5 @@ fi-pl:
           email_outro: Tämä ilmoitus on lähetetty sinulle, koska seuraat kohdetta "%{participatory_space_title}". Voit lopettaa seuraamisen edellä esitetyn linkin kautta.
           email_subject: Uusi artikkeli julkaistiin tilassa %{participatory_space_title}
           notification_title: Kohteessa %{participatory_space_title} on julkaistu artikkeli <a href="%{resource_path}">%{resource_title}</a>
-    pages:
-      home:
-        statistics:
-          posts_count: Artikkelit
-    participatory_processes:
-      statistics:
-        posts_count: Artikkelit
+    statistics:
+      posts_count: Artikkelia

data/config/locales/fi.yml

@@ -15,6 +15,7 @@ fi:
         edit: Muokkaa
         new: Uusi artikkeli
         title: Toiminnot
+        user_group_id: Luo artikkeli käyttäjänä
       admin:
         models:
           components:
@@ -76,10 +77,5 @@ fi:
           email_outro: Tämä ilmoitus on lähetetty sinulle, koska seuraat kohdetta "%{participatory_space_title}". Voit lopettaa seuraamisen edellä esitetyn linkin kautta.
           email_subject: Uusi artikkeli julkaistiin osallistumistilassa %{participatory_space_title}
           notification_title: Kohteessa %{participatory_space_title} on julkaistu artikkeli <a href="%{resource_path}">%{resource_title}</a>
-    pages:
-      home:
-        statistics:
-          posts_count: Artikkelit
-    participatory_processes:
-      statistics:
-        posts_count: Artikkelit
+    statistics:
+      posts_count: Artikkelia

data/config/locales/fr-CA.yml

@@ -15,6 +15,7 @@ fr-CA:
         edit: Modifier
         new: Nouvel article
         title: Actions
+        user_group_id: Créer un article comme
       admin:
         models:
           components:
@@ -76,10 +77,3 @@ fr-CA:
           email_outro: Vous avez reçu cette notification parce que vous suivez "%{participatory_space_title}". Vous pouvez le retirer du lien précédent.
           email_subject: Nouvel article publié dans %{participatory_space_title}
           notification_title: L'article <a href="%{resource_path}">%{resource_title}</a> a été publié dans %{participatory_space_title}
-    pages:
-      home:
-        statistics:
-          posts_count: Articles
-    participatory_processes:
-      statistics:
-        posts_count: Articles

data/config/locales/fr-LU.yml

@@ -0,0 +1,79 @@
+fr-LU:
+  activemodel:
+    models:
+      decidim/blogs/create_post_event: Nouvel article
+  activerecord:
+    models:
+      decidim/blogs/post:
+        one: Article
+        other: Articles
+  decidim:
+    blogs:
+      actions:
+        confirm_destroy: Êtes-vous certain de vouloir supprimer cet article ?
+        destroy: Supprimer
+        edit: Modifier
+        new: Nouvel article
+        title: Actions
+        user_group_id: Créer un article comme
+      admin:
+        models:
+          components:
+            body: Corps du texte
+          post:
+            name: Publier
+        posts:
+          create:
+            invalid: Un problème est survenu lors de la création de cet article
+            success: Article créé avec succès
+          destroy:
+            success: Article supprimé avec succès
+          edit:
+            save: Mettre à jour
+            title: Éditer le post
+          index:
+            title: Articles
+          new:
+            create: Créer
+            title: Créer un article
+          update:
+            invalid: Il y a eu des erreurs lors de l'enregistrement de l'article.
+            success: Article enregistré avec succès
+      last_activity:
+        new_post_at_html: "<span>Nouvel article à %{link}</span>"
+      models:
+        post:
+          fields:
+            author: Auteur
+            body: Corps du texte
+            created_at: Créé à
+            title: titre
+      posts:
+        show:
+          back: Retour à la liste
+          comments: Commentaires
+          view: Voir
+        sidebar_blog:
+          comments: commentaires
+          most_commented_posts: Articles les plus commentés
+      read_more: Voir la suite
+    components:
+      blogs:
+        name: Actualités
+        settings:
+          global:
+            announcement: Annonce
+            comments_enabled: Activer le module de commentaire
+            comments_max_length: Longueur max des commentaires (laisser 0 pour la valeur par défaut)
+          step:
+            announcement: Annonce
+            comments_blocked: Commentaires désactivés
+            endorsements_blocked: Soutiens bloqués
+            endorsements_enabled: Soutiens activés
+    events:
+      blogs:
+        post_created:
+          email_intro: L'article "%{resource_title}" a été publié dans "%{participatory_space_title}" que vous suivez.
+          email_outro: Vous avez reçu cette notification parce que vous suivez "%{participatory_space_title}". Vous pouvez le retirer du lien précédent.
+          email_subject: Nouvel article publié dans %{participatory_space_title}
+          notification_title: L'article <a href="%{resource_path}">%{resource_title}</a> a été publié dans %{participatory_space_title}

data/config/locales/fr.yml

@@ -15,6 +15,7 @@ fr:
         edit: Modifier
         new: Nouvel article
         title: Actions
+        user_group_id: Créer un article comme
       admin:
         models:
           components:
@@ -76,10 +77,3 @@ fr:
           email_outro: Vous avez reçu cette notification parce que vous suivez "%{participatory_space_title}". Vous pouvez le retirer du lien précédent.
           email_subject: Nouvel article publié dans %{participatory_space_title}
           notification_title: L'article <a href="%{resource_path}">%{resource_title}</a> a été publié dans %{participatory_space_title}
-    pages:
-      home:
-        statistics:
-          posts_count: Articles
-    participatory_processes:
-      statistics:
-        posts_count: Articles

data/config/locales/gl.yml

@@ -15,6 +15,7 @@ gl:
         edit: Editar
         new: Nova publicación
         title: Accións
+        user_group_id: Crear publicación como
       admin:
         models:
           components:
@@ -76,10 +77,5 @@ gl:
           email_outro: Recibiches esta notificación porque estás seguindo "%{participatory_space_title}". Podes deixar de seguir dende a ligazón anterior.
           email_subject: Nova publicación publicada en %{participatory_space_title}
           notification_title: A publicación <a href="%{resource_path}">%{resource_title}</a> publicouse en %{participatory_space_title}
-    pages:
-      home:
-        statistics:
-          posts_count: Publicacións
-    participatory_processes:
-      statistics:
-        posts_count: Publicacións
+    statistics:
+      posts_count: Publicacións

data/config/locales/hu.yml

@@ -74,10 +74,3 @@ hu:
           email_outro: 'Ezt az értesítést azért kaptad, mert ezt követed: "%{participatory_space_title}". Leiratkozás az előző link segítségével.'
           email_subject: 'Új bejegyzés ehhez: %{participatory_space_title}'
           notification_title: 'A(z) <a href="%{resource_path}">%{resource_title}</a> bejegyzés közzétéve itt: %{participatory_space_title}'
-    pages:
-      home:
-        statistics:
-          posts_count: Bejegyzések
-    participatory_processes:
-      statistics:
-        posts_count: Bejegyzések

data/config/locales/id-ID.yml

@@ -69,10 +69,3 @@ id:
           email_outro: Anda telah menerima pemberitahuan ini karena Anda mengikuti "%{participatory_space_title}". Anda dapat berhenti mengikutinya dari tautan sebelumnya.
           email_subject: Posting baru diterbitkan pada %{participatory_space_title}
           notification_title: Posting <a href="%{resource_path}">%{resource_title}</a> telah diterbitkan dalam %{participatory_space_title}
-    pages:
-      home:
-        statistics:
-          posts_count: Posting
-    participatory_processes:
-      statistics:
-        posts_count: Posting

data/config/locales/is-IS.yml

@@ -51,10 +51,3 @@ is-IS:
           email_outro: Þú hefur fengið þessa tilkynningu vegna þess að þú fylgist með "%{participatory_space_title}". Þú getur sleppt því frá fyrri tengilinn.
           email_subject: Ný staða birt í %{participatory_space_title}
           notification_title: Staða <a href="%{resource_path}">%{resource_title}</a> hefur verið birt í %{participatory_space_title}
-    pages:
-      home:
-        statistics:
-          posts_count: Innlegg
-    participatory_processes:
-      statistics:
-        posts_count: Innlegg

data/config/locales/it.yml

@@ -15,6 +15,7 @@ it:
         edit: Modifica
         new: Nuovo post
         title: Azioni
+        user_group_id: Crea post come
       admin:
         models:
           components:
@@ -29,6 +30,7 @@ it:
             success: Posta cancellata con successo
           edit:
             save: Aggiornare
+            title: Modifica post
           index:
             title: Messaggi
           new:
@@ -75,10 +77,5 @@ it:
           email_outro: Hai ricevuto questa notifica perché stai seguendo "%{participatory_space_title}". Puoi smettere di seguirlo dal link precedente.
           email_subject: Nuovo post pubblicato su %{participatory_space_title}
           notification_title: Il post <a href="%{resource_path}">%{resource_title}</a> è stato pubblicato su %{participatory_space_title}
-    pages:
-      home:
-        statistics:
-          posts_count: Messaggi
-    participatory_processes:
-      statistics:
-        posts_count: Messaggi
+    statistics:
+      posts_count: Post

data/config/locales/ja.yml

@@ -14,6 +14,7 @@ ja:
         edit: 編集
         new: 新規投稿
         title: アクション
+        user_group_id: 次のように投稿を作成
       admin:
         models:
           components:
@@ -75,10 +76,5 @@ ja:
           email_outro: '「%{participatory_space_title}」をフォローしているため、この通知を受け取りました。前のリンクからこの通知をアンフォローすることができます。'
           email_subject: '%{participatory_space_title} に新しい投稿が公開されました'
           notification_title: The post <a href="%{resource_path}">%{resource_title}</a> has been published in %{participatory_space_title}
-    pages:
-      home:
-        statistics:
-          posts_count: 投稿
-    participatory_processes:
-      statistics:
-        posts_count: 投稿
+    statistics:
+      posts_count: 投稿

data/config/locales/lb-LU.yml

@@ -0,0 +1 @@
+lb:

data/config/locales/lv.yml

@@ -75,10 +75,3 @@ lv:
           email_outro: Jūs saņēmāt šo paziņojumu, jo sekojat "%{participatory_space_title}". Jūs varat atsekot tai no iepriekšējās saites.
           email_subject: Telpā %{participatory_space_title} ir publicēta jauna ziņa
           notification_title: Ziņa <a href="%{resource_path}">%{resource_title}</a> ir publicēta telpā %{participatory_space_title}
-    pages:
-      home:
-        statistics:
-          posts_count: Ziņas
-    participatory_processes:
-      statistics:
-        posts_count: Ziņas

data/config/locales/nl.yml

@@ -15,6 +15,7 @@ nl:
         edit: Bewerk
         new: Nieuw bericht
         title: acties
+        user_group_id: Bericht aanmaken als
       admin:
         models:
           components:
@@ -76,10 +77,5 @@ nl:
           email_outro: Je hebt deze melding ontvangen omdat je "%{participatory_space_title}" volgt. Ontvolgen kan door te klikken op de voorgaande link.
           email_subject: Nieuw bericht gepubliceerd in %{participatory_space_title}
           notification_title: Het bericht <a href="%{resource_path}">%{resource_title}</a> is gepubliceerd in %{participatory_space_title}
-    pages:
-      home:
-        statistics:
-          posts_count: berichten
-    participatory_processes:
-      statistics:
-        posts_count: berichten
+    statistics:
+      posts_count: Berichten

data/config/locales/no.yml

@@ -75,10 +75,3 @@
           email_outro: Du har mottatt denne varslingen fordi du følger "%{participatory_space_title}". Du kan slutte å følge den fra den forrige lenken.
           email_subject: Nytt innlegg publisert i %{participatory_space_title}
           notification_title: Innlegget <a href="%{resource_path}">%{resource_title}</a> er blitt publisert til %{participatory_space_title}
-    pages:
-      home:
-        statistics:
-          posts_count: Innlegg
-    participatory_processes:
-      statistics:
-        posts_count: Innlegg

data/config/locales/pl.yml

@@ -17,6 +17,7 @@ pl:
         edit: Edytuj
         new: Nowy wpis
         title: Działania
+        user_group_id: Utwórz wpis jako
       admin:
         models:
           components:
@@ -78,10 +79,5 @@ pl:
           email_outro: Otrzymałeś to powiadomienie, ponieważ obserwujesz "%{participatory_space_title}". Możesz zrezygnować z obserwowania klikając w poprzedni link.
           email_subject: Opublikowano nowy wpis w %{participatory_space_title}
           notification_title: Wpis <a href="%{resource_path}">%{resource_title}</a> został opublikowany w %{participatory_space_title}
-    pages:
-      home:
-        statistics:
-          posts_count: Wpisy
-    participatory_processes:
-      statistics:
-        posts_count: Wpisy
+    statistics:
+      posts_count: Wpisy

data/config/locales/pt-BR.yml

@@ -1,7 +1,7 @@
 pt:
   activemodel:
     models:
-      decidim/blogs/create_post_event: Novo post de blog
+      decidim/blogs/create_post_event: Nova postagem no blog
   activerecord:
     models:
       decidim/blogs/post:
@@ -15,6 +15,7 @@ pt:
         edit: Editar
         new: Nova postagem
         title: Ações
+        user_group_id: Criar publicação como
       admin:
         models:
           components:
@@ -29,6 +30,7 @@ pt:
             success: Postagem excluída com sucesso
           edit:
             save: Atualizar
+            title: Editar publicação
           index:
             title: Postagens
           new:
@@ -48,6 +50,8 @@ pt:
             title: título
       posts:
         show:
+          back: Voltar para a lista
+          comments: Comentários
           view: Visualizar
         sidebar_blog:
           comments: comentários
@@ -60,9 +64,12 @@ pt:
           global:
             announcement: Anúncio
             comments_enabled: Comentários ativados
+            comments_max_length: Tamanho máximo de comentários (deixe 0 para o valor padrão)
           step:
             announcement: Anúncio
             comments_blocked: Comentários bloqueados
+            endorsements_blocked: Endossos bloqueados
+            endorsements_enabled: Endossos ativados
     events:
       blogs:
         post_created:
@@ -70,10 +77,5 @@ pt:
           email_outro: Você recebeu esta notificação porque está seguindo "%{participatory_space_title}". Você pode deixar de segui-lo no link anterior.
           email_subject: Nova postagem publicada em %{participatory_space_title}
           notification_title: A postagem <a href="%{resource_path}">%{resource_title}</a> foi publicada em %{participatory_space_title}
-    pages:
-      home:
-        statistics:
-          posts_count: Postagens
-    participatory_processes:
-      statistics:
-        posts_count: Postagens
+    statistics:
+      posts_count: Postagens

data/config/locales/pt.yml

@@ -75,10 +75,3 @@ pt:
           email_outro: Recebeu esta notificação porque segue "%{participatory_space_title}". Pode deixar de segui-lo através da hiperligação anterior.
           email_subject: Nova publicação publicada em %{participatory_space_title}
           notification_title: A publicação <a href="%{resource_path}">%{resource_title}</a> foi publicada em %{participatory_space_title}
-    pages:
-      home:
-        statistics:
-          posts_count: Publicações
-    participatory_processes:
-      statistics:
-        posts_count: Publicações

data/config/locales/ro-RO.yml

@@ -16,6 +16,7 @@ ro:
         edit: Editare
         new: Postare nouă
         title: Acțiuni
+        user_group_id: Creează postare ca
       admin:
         models:
           components:
@@ -77,10 +78,5 @@ ro:
           email_outro: Ați primit această notificare deoarece urmăriți „%{participatory_space_title}”. O puteți anula de la link-ul anterior.
           email_subject: Postare nouă publicată în %{participatory_space_title}
           notification_title: Postarea <a href="%{resource_path}">%{resource_title}</a> a fost publicată în %{participatory_space_title}
-    pages:
-      home:
-        statistics:
-          posts_count: Mesaje
-    participatory_processes:
-      statistics:
-        posts_count: Mesaje
+    statistics:
+      posts_count: Postări

data/config/locales/ru.yml

@@ -72,10 +72,3 @@ ru:
           email_outro: Вы получили это уведомление, потому что вы следите за «%{participatory_space_title}». Вы можете перестать за ним следить, перейдя по приведенной выше ссылке.
           email_subject: В %{participatory_space_title} обнародован новый пост
           notification_title: В %{participatory_space_title} был обнародован пост <a href="%{resource_path}">%{resource_title}</a>
-    pages:
-      home:
-        statistics:
-          posts_count: Посты
-    participatory_processes:
-      statistics:
-        posts_count: Посты

data/config/locales/sk.yml

@@ -76,10 +76,3 @@ sk:
           email_outro: Túto notifikáciu ste dostali, pretože sledujete priestor "%{participatory_space_title}". Notifikácie môžete zrušiť po kliknutí na predchádzajúci odkaz.
           email_subject: Nový príspevok publikovaný v %{participatory_space_title}
           notification_title: Príspevok <a href="%{resource_path}">%{resource_title}</a> bol publikovaný v %{participatory_space_title}
-    pages:
-      home:
-        statistics:
-          posts_count: Príspevky
-    participatory_processes:
-      statistics:
-        posts_count: Príspevky

data/config/locales/sv.yml

@@ -15,6 +15,7 @@ sv:
         edit: Redigera
         new: Nytt inlägg
         title: Åtgärder
+        user_group_id: Skapa inlägg som
       admin:
         models:
           components:
@@ -76,10 +77,5 @@ sv:
           email_outro: Du har fått det här meddelandet eftersom du följer "%{participatory_space_title}". Du kan sluta att följa det från den föregående länken.
           email_subject: Ett nytt inlägg har publicerats i %{participatory_space_title}
           notification_title: Inlägget <a href="%{resource_path}">%{resource_title}</a> har publicerats i %{participatory_space_title}
-    pages:
-      home:
-        statistics:
-          posts_count: Inlägg
-    participatory_processes:
-      statistics:
-        posts_count: Inlägg
+    statistics:
+      posts_count: Inlägg

data/config/locales/tr-TR.yml

@@ -76,10 +76,3 @@ tr:
           email_outro: Bu bildirimi aldınız çünkü "%{participatory_space_title}" u takip ediyorsun. Bunu önceki linkten takip edebilirsiniz.
           email_subject: '%{participatory_space_title}yayınlanan yeni gönderi'
           notification_title: <a href="%{resource_path}">%{resource_title}</a> sonrası %{participatory_space_title}olarak yayınlandı.
-    pages:
-      home:
-        statistics:
-          posts_count: Mesajlar
-    participatory_processes:
-      statistics:
-        posts_count: Mesajlar

data/config/locales/uk.yml

@@ -70,10 +70,3 @@ uk:
           email_outro: Ви отримали це сповіщення, тому що ви стежите за "%{participatory_space_title}". Ви можете припинити стежити за ним, перейшовши за наведеним вище посиланням.
           email_subject: В %{participatory_space_title} оприлюднено новий допис
           notification_title: В %{participatory_space_title} було оприлюднено допис <a href="%{resource_path}">%{resource_title}</a>
-    pages:
-      home:
-        statistics:
-          posts_count: Дописи
-    participatory_processes:
-      statistics:
-        posts_count: Дописи

data/config/locales/zh-CN.yml

@@ -74,10 +74,3 @@ zh-CN:
           email_outro: 您收到此通知是因为您正在关注 "%{participatory_space_title}"。您可以从上一个链接取消关注它。
           email_subject: 新帖子发布于 %{participatory_space_title}
           notification_title: 帖子 <a href="%{resource_path}">%{resource_title}</a> 已经在 %{participatory_space_title} 中发布
-    pages:
-      home:
-        statistics:
-          posts_count: 员额
-    participatory_processes:
-      statistics:
-        posts_count: 员额

data/lib/decidim/blogs/component.rb

@@ -5,7 +5,7 @@ require "decidim/components/namer"
 Decidim.register_component(:blogs) do |component|
   component.engine = Decidim::Blogs::Engine
   component.admin_engine = Decidim::Blogs::AdminEngine
-  component.icon = "decidim/blogs/icon.svg"
+  component.icon = "media/images/decidim_blogs.svg"
   component.permissions_class_name = "Decidim::Blog::Permissions"
 
   component.query_type = "Decidim::Blogs::BlogsType"
@@ -18,7 +18,7 @@ Decidim.register_component(:blogs) do |component|
     Decidim::Blogs::Post.where(component: components).count
   end
 
-  component.actions = %w(endorse vote create withdraw amend)
+  component.actions = %w(endorse vote create withdraw amend comment)
 
   component.settings(:global) do |settings|
     settings.attribute :announcement, type: :text, translated: true, editor: true
@@ -36,7 +36,7 @@ Decidim.register_component(:blogs) do |component|
   component.register_resource(:blogpost) do |resource|
     resource.model_class_name = "Decidim::Blogs::Post"
     resource.card = "decidim/blogs/post"
-    resource.actions = %w(endorse vote amend)
+    resource.actions = %w(endorse vote amend comment)
     resource.searchable = true
   end
 

data/lib/decidim/blogs/engine.rb

@@ -2,8 +2,6 @@
 
 require "rails"
 require "active_support/all"
-require "kaminari"
-require "jquery-tmpl-rails"
 
 require "decidim/core"
 

data/lib/decidim/blogs/version.rb

@@ -4,7 +4,7 @@ module Decidim
   # This holds the decidim-pages version.
   module Blogs
     def self.version
-      "0.24.3"
+      "0.25.0.rc1"
     end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: decidim-blogs
 version: !ruby/object:Gem::Version
-  version: 0.24.3
+  version: 0.25.0.rc1
 platform: ruby
 authors:
 - Isaac Massot Gil
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-06-01 00:00:00.000000000 Z
+date: 2021-07-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: decidim-admin
@@ -16,132 +16,98 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.3
+        version: 0.25.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.3
+        version: 0.25.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-comments
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.3
+        version: 0.25.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.3
+        version: 0.25.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-core
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.3
+        version: 0.25.0.rc1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.3
-- !ruby/object:Gem::Dependency
-  name: jquery-tmpl-rails
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.1'
-- !ruby/object:Gem::Dependency
-  name: kaminari
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.2.1
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - "~>"
-      - !ruby/object:Gem::Version
-        version: '1.2'
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 1.2.1
+        version: 0.25.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-admin
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.3
+        version: 0.25.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.3
+        version: 0.25.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-assemblies
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.3
+        version: 0.25.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.3
+        version: 0.25.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-dev
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.3
+        version: 0.25.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.3
+        version: 0.25.0.rc1
 - !ruby/object:Gem::Dependency
   name: decidim-participatory_processes
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.3
+        version: 0.25.0.rc1
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 0.24.3
+        version: 0.25.0.rc1
 description: A Blog component for decidim's participatory spaces.
 email:
 - isaac.mg@coditramuntana.com
@@ -151,7 +117,6 @@ extra_rdoc_files: []
 files:
 - README.md
 - Rakefile
-- app/assets/images/decidim/blogs/icon.svg
 - app/cells/decidim/blogs/post_activity_cell.rb
 - app/cells/decidim/blogs/post_cell.rb
 - app/cells/decidim/blogs/post_m/footer.erb
@@ -171,6 +136,8 @@ files:
 - app/helpers/decidim/blogs/posts_helper.rb
 - app/models/decidim/blogs/application_record.rb
 - app/models/decidim/blogs/post.rb
+- app/packs/entrypoints/decidim_blogs.js
+- app/packs/images/decidim/blogs/decidim_blogs.svg
 - app/permissions/decidim/blog/permissions.rb
 - app/presenters/decidim/blogs/post_presenter.rb
 - app/views/decidim/blogs/admin/posts/_form.html.erb
@@ -182,6 +149,7 @@ files:
 - app/views/decidim/blogs/posts/_sidebar_blog.html.erb
 - app/views/decidim/blogs/posts/index.html.erb
 - app/views/decidim/blogs/posts/show.html.erb
+- config/assets.rb
 - config/locales/am-ET.yml
 - config/locales/ar-SA.yml
 - config/locales/ar.yml
@@ -208,6 +176,7 @@ files:
 - config/locales/fi-plain.yml
 - config/locales/fi.yml
 - config/locales/fr-CA.yml
+- config/locales/fr-LU.yml
 - config/locales/fr.yml
 - config/locales/ga-IE.yml
 - config/locales/gl.yml
@@ -218,10 +187,10 @@ files:
 - config/locales/is-IS.yml
 - config/locales/is.yml
 - config/locales/it.yml
-- config/locales/ja-JP.yml
 - config/locales/ja.yml
 - config/locales/ko-KR.yml
 - config/locales/ko.yml
+- config/locales/lb-LU.yml
 - config/locales/lt-LT.yml
 - config/locales/lt.yml
 - config/locales/lv.yml
@@ -285,11 +254,11 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '2.7'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - ">="
+  - - ">"
     - !ruby/object:Gem::Version
-      version: '0'
+      version: 1.3.1
 requirements: []
-rubygems_version: 3.1.2
+rubygems_version: 3.1.4
 signing_key:
 specification_version: 4
 summary: Decidim blogs module

data/config/locales/ja-JP.yml

@@ -1,83 +0,0 @@
-ja:
-  activemodel:
-    models:
-      decidim/blogs/create_post_event: 新しいブログ投稿
-  activerecord:
-    models:
-      decidim/blogs/post:
-        other: 投稿
-  decidim:
-    blogs:
-      actions:
-        confirm_destroy: この投稿を削除してもよろしいですか？
-        destroy: 削除
-        edit: 編集
-        new: 新規投稿
-        title: アクション
-      admin:
-        models:
-          components:
-            body: 本文
-          post:
-            name: 投稿
-        posts:
-          create:
-            invalid: この投稿を作成する際に問題が発生しました
-            success: 投稿を作成しました
-          destroy:
-            success: 投稿を削除しました
-          edit:
-            save: 更新
-          index:
-            title: 投稿
-          new:
-            create: 作成
-            title: 投稿を作成
-          update:
-            invalid: 投稿の保存中に問題が発生しました。
-            success: 投稿を保存しました
-      last_activity:
-        new_post_at_html: "<span> %{link}に新しい投稿</span>"
-      models:
-        post:
-          fields:
-            author: 作成者
-            body: 本文
-            created_at: 作成日時
-            title: タイトル
-      posts:
-        show:
-          back: リストに戻る
-          comments: コメント
-          view: 表示
-        sidebar_blog:
-          comments: コメント
-          most_commented_posts: 最もコメントされた投稿
-      read_more: もっと読む
-    components:
-      blogs:
-        name: ブログ
-        settings:
-          global:
-            announcement: お知らせ
-            comments_enabled: コメントは有効です
-            comments_max_length: コメント最大長 (デフォルト値は 0 のまま)
-          step:
-            announcement: お知らせ
-            comments_blocked: コメントがブロックされました
-            endorsements_blocked: エンドースメントがブロックされました
-            endorsements_enabled: エンドースメントを有効にする
-    events:
-      blogs:
-        post_created:
-          email_intro: The post "%{resource_title}" has been published in "%{participatory_space_title}" that you are following.
-          email_outro: '「%{participatory_space_title}」をフォローしているため、この通知を受け取りました。前のリンクからこの通知をアンフォローすることができます。'
-          email_subject: '%{participatory_space_title} に新しい投稿が公開されました'
-          notification_title: The post <a href="%{resource_path}">%{resource_title}</a> has been published in %{participatory_space_title}
-    pages:
-      home:
-        statistics:
-          posts_count: 投稿
-    participatory_processes:
-      statistics:
-        posts_count: 投稿