decidim-proposals 0.29.1 → 0.29.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 2109029e1165afe1fe039f4f5e1d2f0b8af26d8e80bb2e0db0c11053da033e61
-  data.tar.gz: 9e72ff8d19ba6f4442eed68fa4c5625e2d22367b3c00a8faf2b36fa58c888dbe
+  metadata.gz: 8f0a793e0fdf54677810a839a8e177a8d3077aee2e25ff1618751d76f03f6401
+  data.tar.gz: 90b7698d7c3560677628165a4ce38c5fdf78b3d1dc5cb00671967a83a9af0d72
 SHA512:
-  metadata.gz: 3d2b4e79ae0fb506248ca119acca6ce128649457f53b6047a9def36168110a63a36bccb6abde7fd8300194cd8bf785546d9d21d066e4f628da6742c2601fb8d6
-  data.tar.gz: 3ad98b72afdc5b9b2601cffa7f5c872b5bf5202ed35f9bff830014af78d7b1de2c5aaae4b5ffc4e721f2d21594a8229bb96ef549f653a0caf36ae8f2a36b0cf9
+  metadata.gz: fd2a28b72d4d22a47f40a4ccbd000421d19c0e014f0788a6888ce36f6665660c5d2d3c862b034280cc4798da73d1137fe4815e773ac48113a89a1baeacee9d2e
+  data.tar.gz: 499ac55e1d39ae1b19c105f69187ef399ee5bb97d110ea7ab6f15cef2aaa08c30456c12dbb45a85ff72041aaf0d38df9fca5b202e895286a7e2731e450eca263

data/app/cells/decidim/proposals/highlighted_proposals_for_component/show.erb

@@ -11,21 +11,21 @@
   <% end %>
 </div>
 
+<div class="flex items-center justify-between space-x-6">
+  <span class="content-block__span flex-shrink-0">
+    <%= t("decidim.participatory_spaces.highlighted_proposals.last") %>
+  </span>
+  <% if single_component? %>
+    <%= link_to decidim_proposals.new_proposal_path, class: "button button__xs md:button__lg button__secondary" do %>
+      <span class="text-center"><%= t("decidim.proposals.actions.new") %></span>
+      <%= icon "add-line" %>
+    <% end %>
+  <% end %>
+</div>
 <div class="flex items-start justify-between">
   <div class="grow space-y-6">
-    <span class="content-block__span">
-      <%= t("decidim.participatory_spaces.highlighted_proposals.last") %>
-    </span>
-
     <% proposals_to_render.each do |p| %>
       <%= card_for p, link_whole_card: true, title_tag: :h3, **options.slice(:show_space) %>
     <% end %>
   </div>
-
-  <% if single_component? %>
-    <%= link_to decidim_proposals.new_proposal_path, class: "button button__sm md:button__lg button__secondary" do %>
-      <span><%= t("decidim.proposals.actions.new") %></span>
-      <%= icon "add-line" %>
-    <% end %>
-  <% end %>
 </div>

data/app/cells/decidim/proposals/proposal_g_cell.rb

@@ -34,6 +34,27 @@ module Decidim
 
       private
 
+      def cache_hash
+        @cache_hash ||= begin
+          hash = []
+          hash << I18n.locale.to_s
+          hash << self.class.name.demodulize.underscore
+          hash << model.cache_key_with_version
+          hash << model.proposal_votes_count
+          hash << model.endorsements_count
+          hash << model.comments_count
+          hash << Digest::MD5.hexdigest(model.component.cache_key_with_version)
+          hash << Digest::MD5.hexdigest(resource_image_url) if resource_image_url
+          hash << 0 # render space
+          hash << model.follows_count
+          hash << Digest::MD5.hexdigest(model.authors.map(&:cache_key_with_version).to_s)
+          hash << (model.must_render_translation?(model.organization) ? 1 : 0) if model.respond_to?(:must_render_translation?)
+          hash << model.component.participatory_space.active_step.id if model.component.participatory_space.try(:active_step)
+
+          hash.join(Decidim.cache_key_separator)
+        end
+      end
+
       def classes
         super.merge(metadata: "card__list-metadata")
       end

data/app/cells/decidim/proposals/proposal_l_cell.rb

@@ -20,25 +20,24 @@ module Decidim
       end
 
       def cache_hash
-        hash = []
-        hash << I18n.locale.to_s
-        hash << model.cache_key_with_version
-        hash << model.proposal_votes_count
-        hash << model.endorsements_count
-        hash << model.comments_count
-        hash << Digest::MD5.hexdigest(model.component.cache_key_with_version)
-        hash << Digest::MD5.hexdigest(resource_image_url) if resource_image_url
-        hash << render_space? ? 1 : 0
-        if current_user
-          hash << current_user.cache_key_with_version
-          hash << current_user.follows?(model) ? 1 : 0
-        end
-        hash << model.follows_count
-        hash << Digest::MD5.hexdigest(model.authors.map(&:cache_key_with_version).to_s)
-        hash << (model.must_render_translation?(model.organization) ? 1 : 0) if model.respond_to?(:must_render_translation?)
-        hash << model.component.participatory_space.active_step.id if model.component.participatory_space.try(:active_step)
+        @cache_hash ||= begin
+          hash = []
+          hash << I18n.locale.to_s
+          hash << self.class.name.demodulize.underscore
+          hash << model.cache_key_with_version
+          hash << model.proposal_votes_count
+          hash << model.endorsements_count
+          hash << model.comments_count
+          hash << Digest::MD5.hexdigest(model.component.cache_key_with_version)
+          hash << Digest::MD5.hexdigest(resource_image_url) if resource_image_url
+          hash << render_space? ? 1 : 0
+          hash << model.follows_count
+          hash << Digest::MD5.hexdigest(model.authors.map(&:cache_key_with_version).to_s)
+          hash << (model.must_render_translation?(model.organization) ? 1 : 0) if model.respond_to?(:must_render_translation?)
+          hash << model.component.participatory_space.active_step.id if model.component.participatory_space.try(:active_step)
 
-        hash.join(Decidim.cache_key_separator)
+          hash.join(Decidim.cache_key_separator)
+        end
       end
     end
   end

data/app/controllers/concerns/decidim/proposals/admin/filterable.rb

@@ -47,7 +47,7 @@ module Decidim
           end
 
           def valuator_role_ids
-            current_participatory_space.user_roles(:valuator).pluck(:id)
+            current_participatory_space.user_roles(:valuator).order_by_name.pluck(:id)
           end
 
           def translated_valuator_role_ids_has(valuator_role_id)

data/app/controllers/decidim/proposals/proposals_controller.rb

@@ -43,13 +43,11 @@ module Decidim
                        .order(position: :asc)
           render "decidim/proposals/proposals/participatory_texts/participatory_text"
         else
-          @base_query = search
-                        .result
-                        .published
-                        .not_hidden
+          @proposals = search.result
 
-          @proposals = @base_query.includes(:component, :coauthorships, :attachments)
-          @all_geocoded_proposals = @base_query.geocoded
+          @proposals = reorder(@proposals)
+          @proposals = paginate(@proposals)
+          @proposals = @proposals.includes(:component, :coauthorships, :attachments)
 
           @voted_proposals = if current_user
                                ProposalVote.where(
@@ -59,8 +57,6 @@ module Decidim
                              else
                                []
                              end
-          @proposals = reorder(@proposals)
-          @proposals = paginate(@proposals)
         end
       end
 

data/app/forms/decidim/proposals/admin/proposal_answer_form.rb

@@ -8,9 +8,9 @@ module Decidim
         include TranslatableAttributes
         mimic :proposal_answer
 
-        translatable_attribute :answer, String
-        translatable_attribute :cost_report, String
-        translatable_attribute :execution_period, String
+        translatable_attribute :answer, Decidim::Attributes::RichText
+        translatable_attribute :cost_report, Decidim::Attributes::RichText
+        translatable_attribute :execution_period, Decidim::Attributes::RichText
         attribute :cost, Float
         attribute :internal_state, String
 

data/app/forms/decidim/proposals/admin/proposal_form.rb

@@ -10,7 +10,7 @@ module Decidim
         translatable_attribute :title, String do |field, _locale|
           validates field, length: { in: 15..150 }, if: proc { |resource| resource.send(field).present? }
         end
-        translatable_attribute :body, String
+        translatable_attribute :body, Decidim::Attributes::RichText
 
         validates :title, :body, translatable_presence: true
 

data/app/forms/decidim/proposals/admin/proposals_import_form.rb

@@ -6,6 +6,7 @@ module Decidim
       # A form object to be used when admin users want to import a collection of proposals
       # from another component.
       class ProposalsImportForm < Decidim::Form
+        include TranslatableAttributes
         mimic :proposals_import
 
         attribute :origin_component_id, Integer
@@ -19,15 +20,11 @@ module Decidim
         validates :import_proposals, allow_nil: false, acceptance: true
         validate :valid_states
 
-        VALID_STATES = %w(accepted not_answered evaluating rejected).freeze
-
         def states_collection
-          VALID_STATES.map do |state|
-            OpenStruct.new(
-              name: I18n.t(state, scope: "decidim.proposals.answers"),
-              value: state
-            )
-          end
+          @states_collection ||= ProposalState.where(component: current_component) + [ProposalState.new(token: "not_answered",
+                                                                                                        title: I18n.t(
+                                                                                                          :not_answered, scope: "decidim.proposals.answers"
+                                                                                                        ))]
         end
 
         def states
@@ -56,7 +53,7 @@ module Decidim
 
         def valid_states
           return if states.all? do |state|
-            VALID_STATES.include?(state)
+            states_collection.pluck(:token).include?(state)
           end
 
           errors.add(:states, :invalid)

data/app/forms/decidim/proposals/admin/valuation_assignment_form.rb

@@ -16,7 +16,10 @@ module Decidim
         end
 
         def valuator_roles
-          @valuator_roles ||= current_component.participatory_space.user_roles(:valuator).where(id: valuator_role_ids)
+          @valuator_roles ||= current_component.participatory_space
+                                               .user_roles(:valuator)
+                                               .order_by_name
+                                               .where(id: valuator_role_ids)
         end
 
         def same_participatory_space

data/app/helpers/decidim/proposals/admin/proposal_bulk_actions_helper.rb

@@ -10,7 +10,7 @@ module Decidim
 
         # find the valuators for the current space.
         def find_valuators_for_select(participatory_space, current_user)
-          valuator_roles = participatory_space.user_roles(:valuator)
+          valuator_roles = participatory_space.user_roles(:valuator).order_by_name
           valuators = Decidim::User.where(id: valuator_roles.pluck(:decidim_user_id)).to_a
 
           filtered_valuator_roles = valuator_roles.filter do |role|

data/app/helpers/decidim/proposals/map_helper.rb

@@ -9,7 +9,7 @@ module Decidim
       #
       # geocoded_proposals - A collection of geocoded proposals
       def proposals_data_for_map(geocoded_proposals)
-        geocoded_proposals.map do |proposal|
+        geocoded_proposals.select(&:geocoded_and_valid?).map do |proposal|
           proposal_data_for_map(proposal)
         end
       end

data/app/models/decidim/proposals/proposal.rb

@@ -402,12 +402,8 @@ module Decidim
         where(query, value:)
       end
 
-      def self.ransackable_scopes(auth_object = nil)
-        base = [:with_any_origin, :with_any_state, :state_eq, :voted_by, :coauthored_by, :related_to, :with_any_scope, :with_any_category]
-        return base unless auth_object&.admin?
-
-        # Add extra scopes for admins for the admin panel searches
-        base + [:valuator_role_ids_has]
+      def self.ransackable_scopes(_auth_object = nil)
+        [:with_any_origin, :with_any_state, :state_eq, :voted_by, :coauthored_by, :related_to, :with_any_scope, :with_any_category, :valuator_role_ids_has]
       end
 
       # Create i18n ransackers for :title and :body.

data/app/packs/stylesheets/decidim/proposals/proposals.scss

@@ -103,11 +103,7 @@
   }
 
   &__grid-text-title {
-    @apply flex justify-between flex-row md:flex-col md:items-start lg:flex-row lg:items-center;
-
-    .label {
-      @apply md:mt-2;
-    }
+    @apply flex justify-between flex-row md:flex-col items-start lg:flex-row;
   }
 
   &__list-metadata {

data/app/permissions/decidim/proposals/permissions.rb

@@ -4,15 +4,16 @@ module Decidim
   module Proposals
     class Permissions < Decidim::DefaultPermissions
       def permissions
-        return permission_action unless user
-
         # Delegate the admin permission checks to the admin permissions class
         return Decidim::Proposals::Admin::Permissions.new(user, permission_action, context).permissions if permission_action.scope == :admin
         return permission_action if permission_action.scope != :public
 
+        toggle_allow(!proposal.hidden?) if permission_action.subject == :proposal && permission_action.action == :read
+        return permission_action unless user
+
         case permission_action.subject
         when :proposal
-          apply_proposal_permissions(permission_action)
+          apply_proposal_permissions(permission_action) unless permission_action.action == :read
         when :collaborative_draft
           apply_collaborative_draft_permissions(permission_action)
         else

data/app/services/decidim/proposals/collaborative_draft_diff_renderer.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module Decidim
+  module Proposals
+    class CollaborativeDraftDiffRenderer < DiffRenderer
+      private
+
+      def attribute_types
+        {
+          title: :string,
+          body: :string,
+          decidim_category_id: :category,
+          decidim_scope_id: :scope,
+          address: :string,
+          latitude: :string,
+          longitude: :string,
+          decidim_proposals_proposal_state_id: :string
+        }
+      end
+    end
+  end
+end

data/app/services/decidim/proposals/diff_renderer.rb

@@ -21,8 +21,10 @@ module Decidim
 
       # Parses the values before parsing the changeset.
       def parse_changeset(attribute, values, type, diff)
+        return parse_i18n_changeset(attribute, values, type, diff) if [:i18n, :i18n_html].include?(type)
         return parse_scope_changeset(attribute, values, type, diff) if type == :scope
         return parse_state_changeset(attribute, values, type, diff) if type == :state
+        return parse_user_group_changeset(attribute, values, type, diff) if type == :user_group
 
         values = parse_values(attribute, values)
         old_value = values[0]

data/app/services/decidim/proposals/proposal_builder.rb

@@ -117,7 +117,7 @@ module Decidim
           if attachment.file.attached?
             new_attachment.file = attachment.file.blob
           else
-            new_attachment.attached_uploader(:file).remote_url = attachment.attached_uploader(:file).url(host: original_proposal.organization.host)
+            new_attachment.attached_uploader(:file).remote_url = attachment.attached_uploader(:file).url
           end
 
           new_attachment.save!

data/app/views/decidim/proposals/admin/proposals/index.html.erb

@@ -25,7 +25,7 @@
             <%= check_box_tag "proposals_bulk", "all", false, class: "js-check-all" %>
           </th>
           <th class="!text-left">
-            <%= sort_link(query, :title, t("models.proposal.fields.title", scope: "decidim.proposals") ) %>
+            <%= sort_link(query, :translated_title, t("models.proposal.fields.title", scope: "decidim.proposals") ) %>
           </th>
           <th>
             <%= sort_link(query, :published_at, t("models.proposal.fields.published_at", scope: "decidim.proposals") ) %>
@@ -58,7 +58,7 @@
           </th>
 
           <th>
-            <%= sort_link(query, :state, [:state, :is_emendation], t("models.proposal.fields.state", scope: "decidim.proposals") ) %>
+            <%= t("models.proposal.fields.state", scope: "decidim.proposals") %>
           </th>
 
           <th><%= t("actions.title", scope: "decidim.proposals") %></th>

data/app/views/decidim/proposals/admin/proposals_imports/new.html.erb

@@ -17,9 +17,9 @@
               </div>
               <div class="row column">
                 <%= f.label t(".select_states") %>
-                <%= f.collection_check_boxes :states, @form.states_collection, :value, :name do |b| %>
+                <%= f.collection_check_boxes :states, @form.states_collection, :token, :title do |b| %>
                   <div>
-                    <%= b.label { b.check_box + b.text } %>
+                    <%= b.label { b.check_box + translated_attribute(b.text) } %>
                   </div>
                 <% end %>
               </div>

data/app/views/decidim/proposals/proposals/index.html.erb

@@ -31,7 +31,7 @@
 
   <% if Decidim::Map.available?(:geocoding, :dynamic) && component_settings.geocoding_enabled? %>
     <div class="proposal-list__map">
-      <%= dynamic_map_for proposals_data_for_map(@all_geocoded_proposals) do %>
+      <%= dynamic_map_for proposals_data_for_map(@proposals) do %>
         <template id="marker-popup">
           <div class="space-y-6">
             <a href="${link}" class="card__list">

data/app/views/decidim/proposals/proposals/index.js.erb

@@ -3,3 +3,15 @@ var $orderFilterInput = $('.order_filter');
 
 $proposals.html('<%= j(render partial: "proposals").strip.html_safe %>');
 $orderFilterInput.val('<%= order %>');
+
+<% if Decidim::Map.available?(:geocoding, :dynamic) && component_settings.geocoding_enabled? %>
+  var $map = $("#map");
+  var controller = $map.data("map-controller");
+  if (controller) {
+    var markerData = JSON.parse('<%= escape_javascript proposals_data_for_map(@proposals).to_json.html_safe %>');
+    controller.clearMarkers();
+    if (markerData.length > 0 ) {
+      controller.addMarkers(markerData);
+    }
+  }
+<% end %>

data/app/views/decidim/proposals/proposals/show.html.erb

@@ -77,7 +77,7 @@ extra_admin_link(
   <% end %>
 
   <% if component_settings.geocoding_enabled? && @proposal.geocoded? %>
-    <div class="static-map__container">
+    <div class="static-map__container py-6">
       <%= render partial: "decidim/shared/static_map", locals: { icon_name: "proposals", geolocalizable: @proposal } %>
     </div>
   <% end %>

data/config/locales/ar.yml

@@ -262,12 +262,10 @@ ar:
           email_subject: تمت إضافة اقتراح جديد "%{resource_title}" إلى %{participatory_space_title}
         proposal_update_category:
           email_intro: 'قام المشرف بتحديث فئة اقتراحك "%{resource_title}" ، تحقق من ذلك في هذه الصفحة:'
-          email_outro: لقد تلقيت هذا الإشعار لأنك مؤلف الاقتراح.
           email_subject: تم تحديث فئة %{resource_title} اقتراح
           notification_title: تم تحديث فئة اقتراح <a href="%{resource_path}">%{resource_title}</a> بواسطة مسؤول.
         proposal_update_scope:
           email_intro: 'قام مدير بتحديث نطاق اقتراحك "%{resource_title}" ، يرجى التحقق منه على هذه الصفحة:'
-          email_outro: لقد تلقيت هذا الإشعار لأنك مؤلف الاقتراح.
           email_subject: تم تحديث نطاق الاقتراح %{resource_title}
           notification_title: نطاق الاقتراح <a href="%{resource_path}">%{resource_title}</a> تم تحديثه من قبل مدير.
         voting_enabled:
@@ -316,7 +314,7 @@ ar:
         object: أصوات
     participatory_spaces:
       highlighted_proposals:
-        see_all: شاهد الكل (%{count})
+        see_all: شاهد الكل
     proposals:
       actions:
         answer_proposal: الرد على المُقتَرَح

data/config/locales/bg.yml

@@ -117,7 +117,7 @@ bg:
           proposal_state_id_eq:
             label: Състояние
           scope_id_eq:
-            label: Обхват
+            label: Сфера
           state_eq:
             label: Състояние
             values:
@@ -142,7 +142,7 @@ bg:
         actions:
           amend: Промяна
           comment: Коментар
-          create: Създай
+          create: Създаване
           endorse: Одобри
           vote: Глас
           vote_comment: Оцени коментара
@@ -190,7 +190,7 @@ bg:
             proposal_wizard_step_1_help_text: Текст на помощника за стъпка "Създай"
             proposal_wizard_step_2_help_text: Помощен текст на стъпка "Публикуване" на съветника за предложения
             resources_permissions_enabled: Позволените действия могат да се задават за всяко предложение
-            scope_id: Обхват
+            scope_id: Сфера
             scopes_enabled: Обхватите са активирани
             threshold_per_proposal: Праг за предложенията
             vote_limit: Лимит за гласуване на участник
@@ -309,12 +309,10 @@ bg:
             notification_title: Вашето предложение <a href="%{resource_path}">%{resource_title}</a> промени състоянието си на „%{state}“.
         proposal_update_category:
           email_intro: 'Администратор актуализира категорията на Вашето предложение „%{resource_title}“. Вижте повече на тази страница:'
-          email_outro: Получавате това известие, защото сте авторът на предложението.
           email_subject: Категорията на предложението %{resource_title} беше актуализирана
           notification_title: Категорията на предложението <a href="%{resource_path}">%{resource_title}</a> беше актуализирана от администратор.
         proposal_update_scope:
           email_intro: 'Администратор актуализира обхвата на Вашето предложение „%{resource_title}“. Вижте повече на тази страница:'
-          email_outro: Получавате това известие, защото сте авторът на предложението.
           email_subject: Обхватът на предложението %{resource_title} беше актуализиран
           notification_title: Обхватът на предложението <a href="%{resource_path}">%{resource_title}</a> беше актуализиран от администратор.
         voting_enabled:
@@ -660,7 +658,7 @@ bg:
           open: Отворен
           published: Публикувано
           related_to: Свързано с
-          scope: Обхват
+          scope: Сфера
           search: Търсене
           state: Статус
           withdrawn: Оттеглено
@@ -746,7 +744,7 @@ bg:
             official_proposal: Официално предложение
             published_answer: Публикуван отговор
             published_at: Публикувано на
-            scope: Обхват
+            scope: Сфера
             state: Статус
             title: Заглавие
             valuator: Оценител

data/config/locales/bn-BD.yml

@@ -0,0 +1 @@
+bn:

data/config/locales/bs-BA.yml

@@ -0,0 +1,100 @@
+---
+bs:
+  activemodel:
+    attributes:
+      valuation_assignment:
+        admin_log:
+          valuator_role_id: Ime procenjivača
+    errors:
+      models:
+        proposal:
+          attributes:
+            body:
+              cant_be_equal_to_template: ne može biti jednak šablonu
+    models:
+      decidim/proposals/admin/update_proposal_scope_event: Predlog opsega izmenjen
+  decidim:
+    admin:
+      filters:
+        proposals:
+          valuator_role_ids_has:
+            label: Dodeljeno procenjivaču
+        search_placeholder:
+          id_string_or_title_cont: Pretraži %{collection} prema identifikacionom broju ili nazivu.
+    components:
+      proposals:
+        settings:
+          global:
+            new_proposal_body_template: Novi predlog šablona glavnog teksta
+            new_proposal_body_template_help: Možete da definišete tekst koji će se pojavljivati pri kreiranju novog predloga
+          step:
+            amendments_visibility: Vidljivost izmena
+            amendments_visibility_choices:
+              all: Izmene su vidljive svima
+              participants: Izmene su vidljive samo svojim autorima
+            answers_with_costs: Omogući troškove za odgovore na predloge
+            publish_answers_immediately: Objavi odgovore na predloge odmah
+    events:
+      proposals:
+        admin:
+          proposal_note_created:
+            email_outro: Dobili ste ovo obaveštenje jer možete da procenite predlog.
+            email_subject: Neko je ostavio poruku na predlogu %{resource_title}.
+        proposal_update_scope:
+          email_intro: 'Administrator je ažurirao opseg vašeg predloga "%{resource_title}", pogledajte na ovoj strani:'
+          email_subject: Opseg predloga %{resource_title} je ažuriran
+    proposals:
+      actions:
+        answer_proposal: Odgovor na predlog
+        show: Prikaži predlog
+      admin:
+        proposals:
+          index:
+            assign_to_valuator: Dodeli procenjivaču
+            assign_to_valuator_button: Dodeli
+            change_scope: Promeni opseg
+            publish_answers: Objavi odgovore
+            unassign_from_valuator: Oduzmi od procenjivača
+            unassign_from_valuator_button: Od dodeli
+            update_scope_button: Ažuriraj opseg
+          show:
+            amendments_count: Broj izmena
+            assigned_valuators: Dodeljeni procenjivači
+            comments_count: Broj komentara
+            documents: Dokumenti
+            endorsements_count: Broj podržavanja
+            endorsers: Podržavaoci
+            n_more_endorsers:
+              one: i još 1
+              few: i još %{count}
+              other: i još %{count}
+            photos: Slike
+            ranking: "%{ranking} od %{total}"
+            related_meetings: Slični sastanci
+            remove_assignment: Ukloni zadatak
+            remove_assignment_confirmation: Da li ste sigurni da želite da uklonite procenjivača sa ovog predloga?
+            valuators: Procenjivači
+          update_category:
+            invalid: 'Ovi predlozi već imaju %{subject_name} kategoriju: %{proposals}.'
+            success: 'Predlozi uspešno dodati u kategoriju %{subject_name}: %{proposals}.'
+          update_scope:
+            invalid: 'Ovi predlozi već imaju %{subject_name} opseg: %{proposals}.'
+            success: 'Predlozi kojima je uspešno dodat opseg %{subject_name}: %{proposals}.'
+      admin_log:
+        proposal:
+          publish_answer: "%{user_name} je objavio odgovor na predlog %{resource_name} u prostoru %{space_name}"
+        valuation_assignment:
+          create: "%{user_name} je dodao predlog %{resource_name} procenjivaču"
+      models:
+        proposal:
+          fields:
+            published_answer: Objavljeni odgovor
+            valuator: Procenjivač
+            valuators: Procenjivači
+      proposals:
+        show:
+          estimated_cost: Procenjen trošak
+      proposals_picker:
+        choose_proposals: Izaberi predloge
+      publish_answers:
+        success: Odgovori na predloge uspešno objavljeni.

data/config/locales/ca.yml

@@ -143,7 +143,7 @@ ca:
         actions:
           amend: Esmena
           comment: Comentar
-          create: Crear
+          create: Crea
           endorse: Adherir-se
           vote: Donar suport
           vote_comment: Votar el comentari
@@ -310,12 +310,12 @@ ca:
             notification_title: La teva proposta <a href="%{resource_path}">%{resource_title}</a>ha canviat el seu estat a "%{state}".
         proposal_update_category:
           email_intro: 'Una administradora ha actualitzat la categoria de la teva proposta "%{resource_title}", fes-hi una ullada:'
-          email_outro: Has rebut aquesta notificació perquè vas presentar aquesta proposta.
+          email_outro: Has rebut aquesta notificació perquè ets l'autora de la proposta.
           email_subject: S'ha actualitzat la categoria de la proposta %{resource_title}
           notification_title: La categoria de la proposta <a href="%{resource_path}">%{resource_title}</a> ha estat actualitzada per una administradora.
         proposal_update_scope:
           email_intro: 'Una administradora ha actualitzat l''àmbit de la teva proposta "%{resource_title}", fes-hi una ullada:'
-          email_outro: Has rebut aquesta notificació perquè vas presentar aquesta proposta.
+          email_outro: Has rebut aquesta notificació perquè ets l'autora de la proposta.
           email_subject: S'ha actualitzat l'àmbit de la proposta %{resource_title}
           notification_title: L'àmbit de la proposta <a href="%{resource_path}">%{resource_title}</a> ha estat actualitzat per una administradora.
         voting_enabled:
@@ -507,7 +507,7 @@ ca:
             title: Actualitza la proposta
             update: Actualizar
           form:
-            attachment_legend: "(Opcional) Afegiu un fitxer adjunt"
+            attachment_legend: "(Opcional) Afegeix un fitxer adjunt"
             created_in_meeting: Aquesta proposta prové d'una trobada
             delete_attachment: Suprimeix l'adjunt
             select_a_category: Selecciona una categoria
@@ -842,7 +842,7 @@ ca:
         show:
           answer: Resposta
           changes_at_title: Esmena a "%{title}"
-          edit_proposal: Edita proposta
+          edit_proposal: Edita la proposta
           estimated_cost: Cost estimat
           hidden_endorsers_count:
             one: i %{count} persona més