decidim-proposals 0.28.4 → 0.28.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e03d9becd88af502a15e10d6b7596e4a4d0c2a41d914fc32931379c8b84313af
-  data.tar.gz: 96d7de88818c77f8f6f9c2c2718b15ae307785d8c43e7ca9d496895f671b10e8
+  metadata.gz: 2a1d75f047cf77a3873fed131cdefcd187c822c14f9fedb1b4d5c5d8a006454f
+  data.tar.gz: 825829e1601b57bcb849fd9359190839dc2e8691d4c203377d0cb8d1865c43c2
 SHA512:
-  metadata.gz: 8f7d3a09bb63fe6e45295e8c1636d46d635e121ad51aa60f409723c0ace5e3cce9a32b15739940459821ceb47109d8349fe9d0ffa39d0d509db5e97ddd0ce70e
-  data.tar.gz: 3a819d8a0556c18c08740b908d79a2f8366526876260ce74383674333194118ea64bc197ff581855091a4fbdb69f16273a5bf0312c3254e760f4b988918372f3
+  metadata.gz: 56fd50c16ab2a410a880b20896c64c3faf5be9e295223d3a6a42aa5045719057e5ad9effb1511ed953e52c89c270c037dc57100167566cba67e2b04f952e52ef
+  data.tar.gz: 46d01f111fab1ce7ba565990f435027a943dbb75f992f8873eb522739c9454a5a0c5ec3562daa20616ec03cf2ef4366d8ba82fd67dc51234464d262ff3cadbbf

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_l_cell.rb

@@ -22,25 +22,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
+        @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)
         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)
-
-        hash.join(Decidim.cache_key_separator)
       end
     end
   end

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/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

@@ -347,12 +347,8 @@ module Decidim
         where(query, value:)
       end
 
-      def self.ransackable_scopes(auth_object = nil)
-        base = [:with_any_origin, :with_any_state, :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, :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/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,7 +21,9 @@ 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_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

@@ -21,7 +21,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") ) %>
@@ -54,7 +54,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 class="actions"><%= t("actions.title", scope: "decidim.proposals") %></th>

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

@@ -311,12 +311,10 @@ ar:
             notification_title: تم رفض الاقتراح <a href="%{resource_path}">%{resource_title}</a>.
         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:
@@ -376,7 +374,7 @@ ar:
         title: الدعم
     participatory_spaces:
       highlighted_proposals:
-        see_all: شاهد الكل (%{count})
+        see_all: شاهد الكل
     proposals:
       actions:
         answer_proposal: الرد على المُقتَرَح

data/config/locales/bg.yml

@@ -105,7 +105,7 @@ bg:
               'false': Предложения
               'true': Изменения
           scope_id_eq:
-            label: Обхват
+            label: Сфера
           state_eq:
             label: Състояние
             values:
@@ -130,7 +130,7 @@ bg:
         actions:
           amend: Промяна
           comment: Коментар
-          create: Създай
+          create: Създаване
           endorse: Одобри
           vote: Поддръжка
           vote_comment: Оцени коментара
@@ -179,7 +179,7 @@ bg:
             proposal_wizard_step_3_help_text: Текст на помощника за стъпка "Завърши"
             proposal_wizard_step_4_help_text: Помощен текст на стъпка "Публикуване" на съветника за предложения
             resources_permissions_enabled: Позволените действия могат да се задават за всяко предложение
-            scope_id: Обхват
+            scope_id: Сфера
             scopes_enabled: Обхватите са активирани
             threshold_per_proposal: Праг за предложенията
             vote_limit: Максимален брой поддръжки на участник
@@ -320,12 +320,10 @@ bg:
             notification_title: Предложението <a href="%{resource_path}">%{resource_title}</a> беше отхвърлено.
         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:
@@ -653,7 +651,7 @@ bg:
           open: Отворен
           published: Публикувано
           related_to: Свързано с
-          scope: Обхват
+          scope: Сфера
           search: Търсене
           state: Статус
           withdrawn: Оттеглено
@@ -739,7 +737,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

@@ -130,7 +130,7 @@ ca:
         actions:
           amend: Esmena
           comment: Comentar
-          create: Crear
+          create: Crea
           endorse: Adherir-se
           vote: Donar suport
           vote_comment: Votar el comentari
@@ -320,12 +320,12 @@ ca:
             notification_title: S'ha rebutjat la proposta <a href="%{resource_path}">%{resource_title}</a>.
         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:
@@ -498,7 +498,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
@@ -834,7 +834,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

data/config/locales/cs.yml

@@ -113,7 +113,7 @@ cs:
               'false': Návrhy
               'true': Pozměňovací návrhy
           scope_id_eq:
-            label: Oblast působnosti
+            label: Rozsah
           state_eq:
             label: Stav
             values:
@@ -187,7 +187,7 @@ cs:
             proposal_wizard_step_3_help_text: Text průvodce kroku nápovědy „Dokončit“ Návrh
             proposal_wizard_step_4_help_text: Text nápovědy ke kroku "Zveřejnit" průvodce návrhem
             resources_permissions_enabled: Pro každý návrh lze nastavit oprávnění akce
-            scope_id: Oblast působnosti
+            scope_id: Rozsah
             scopes_enabled: Oblasti působnosti povoleny
             threshold_per_proposal: Prah na návrh
             vote_limit: Počet hlasů na uživatele
@@ -328,12 +328,12 @@ cs:
             notification_title: Návrh <a href="%{resource_path}">%{resource_title}</a> byl zamítnut.
         proposal_update_category:
           email_intro: 'Správce aktualizoval kategorii vašeho návrhu "%{resource_title}", podívejte se na něj:'
-          email_outro: Toto oznámení jste obdrželi, protože jste autorem návrhu.
+          email_outro: Obdrželi jste toto oznámení, protože jste autorem návrhu.
           email_subject: Kategorie návrhů %{resource_title} byla aktualizována
           notification_title: Kategorie návrhu <a href="%{resource_path}">%{resource_title}</a> byla aktualizována administrátorem.
         proposal_update_scope:
           email_intro: 'Administrátor aktualizoval rozsah vašeho návrhu "%{resource_title}", podívejte se na tuto stránku:'
-          email_outro: Toto oznámení jste obdrželi, protože jste autorem návrhu.
+          email_outro: Obdrželi jste toto oznámení, protože jste autorem návrhu.
           email_subject: Rámec návrhu %{resource_title} byl aktualizován
           notification_title: Rozsah návrhu <a href="%{resource_path}">%{resource_title}</a> byl aktualizován správcem.
         voting_enabled:
@@ -396,7 +396,7 @@ cs:
     participatory_spaces:
       highlighted_proposals:
         last: Poslední návrhy
-        see_all: Zobrazit všechny (%{count})
+        see_all: Zobrazit všechny
     proposals:
       actions:
         answer_proposal: Odpověď na návrh

data/config/locales/de.yml

@@ -179,7 +179,7 @@ de:
             proposal_wizard_step_3_help_text: Hilfetext "Fertigstellen"-Schritt im Vorschlagsassistenten
             proposal_wizard_step_4_help_text: Hilfetext "Veröffentlichen"-Schritt im Vorschlagsassistenten
             resources_permissions_enabled: Berechtigungen können für jeden Vorschlag festgelegt werden
-            scope_id: Bereich
+            scope_id: Umfang
             scopes_enabled: Bereiche aktiviert
             threshold_per_proposal: Schwellenwert pro Vorschlag
             vote_limit: Unterstützungslimit pro Benutzer
@@ -320,12 +320,12 @@ de:
             notification_title: Der Vorschlag <a href="%{resource_path}">%{resource_title}</a> wurde abgelehnt.
         proposal_update_category:
           email_intro: 'Ein Administrator hat die Kategorie Ihres Vorschlags "%{resource_title}" aktualisiert, sehen Sie es sich an:'
-          email_outro: Sie haben diese Benachrichtigung erhalten, weil Sie der Autor des Vorschlags sind.
+          email_outro: Sie haben diese Benachrichtigung erhalten, weil Sie diesen Vorschlag verfasst haben.
           email_subject: Die Vorschlagskategorie %{resource_title} wurde aktualisiert
           notification_title: Die Vorschlagskategorie <a href="%{resource_path}">%{resource_title}</a> wurde von einem Administrator aktualisiert.
         proposal_update_scope:
           email_intro: 'Ein Administrator hat den Bereich Ihres Vorschlags „%{resource_title}“ aktualisiert, sehen Sie es sich das auf dieser Seite an:'
-          email_outro: Sie haben diese Benachrichtigung erhalten, weil Sie der Autor des Vorschlags sind.
+          email_outro: Sie haben diese Benachrichtigung erhalten, weil Sie diesen Vorschlag verfasst haben.
           email_subject: Der Bereich des Vorschlags %{resource_title} wurde aktualisiert
           notification_title: Der Bereich des Vorschlags <a href="%{resource_path}">%{resource_title}</a> wurde von einem Administrator aktualisiert.
         voting_enabled:
@@ -388,7 +388,7 @@ de:
     participatory_spaces:
       highlighted_proposals:
         last: Letzte Vorschläge
-        see_all: Alle anzeigen (%{count})
+        see_all: Alle anzeigen
     proposals:
       actions:
         answer_proposal: Vorschlag beantworten
@@ -498,7 +498,7 @@ de:
             title: Vorschlag aktualisieren
             update: Aktualisieren
           form:
-            attachment_legend: "(Optional) Anhang hinzufügen"
+            attachment_legend: "(Optional) Fügen Sie einen Anhang hinzu"
             created_in_meeting: Dieser Vorschlag stammt von einer Besprechung
             delete_attachment: Anhang löschen
             select_a_category: Kategorie auswählen
@@ -693,7 +693,7 @@ de:
             error: Konnte nicht als Mitarbeiter abgelehnt werden, versuche es später erneut.
             success: "@%{user} wurde als Mitwirkende erfolgreich abgelehnt."
         show:
-          edit: Bearbeiten Sie den gemeinsamen Entwurf
+          edit: Gemeinsamen Entwurf bearbeiten
           final_proposal: Endgültiger Vorschlag
           final_proposal_help_text: Dieser Entwurf ist fertig. Sie können den endgültigen fertigen Vorschlag sehen
           hidden_authors_count:
@@ -742,7 +742,7 @@ de:
             scope: Umfang
             state: Status
             title: Titel
-            valuator: BewerterIn
+            valuator: Bewertende
             valuators: Bewertende
             votes: Stimmen
       new: