decidim-reporting_proposals 0.6.1 → 0.7.1

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

@@ -0,0 +1,31 @@
+<%= append_javascript_pack_tag "decidim_reporting_proposals", defer: true %>
+<%= append_stylesheet_pack_tag "decidim_proposals", media: "all" %>
+
+<% if allowed_to?(:assign_to_valuator, :proposals, proposal:) %>
+  <div id="js-assign-proposal-to-valuator-actions" class="js-bulk-action-form form-single-proposal" style="max-width:400px">
+    <%= form_tag(valuation_assignment_path, method: :post, id: "js-form-assign-proposal-to-valuator", class: "form form-defaults") do %>
+      <div class="form__wrapper">
+        <div class="card">
+          <div class="flex items-center">
+            <div class="checkboxes hide">
+              <%= check_box_tag "proposal_ids[]", proposal.id, true, class: "js-check-all-proposal js-proposal-id-#{proposal.id}" %>
+            </div>
+
+            <select
+              id="assign_valuator_role_ids"
+              name="valuator_role_ids[]"
+              placeholder="<%= t("decidim.proposals.admin.proposals.index.select_valuators") %>"
+              class="w-full mt-2 js-valuator-multiselect"
+              multiple>
+              <%= available_valuators_for_proposal(proposal, current_user).map do |option| %>
+                <option value="<%= option[1] %>"><%= option[0] %></option>
+              <% end %>
+            </select>
+
+            <%= submit_tag(t("decidim.proposals.admin.proposals.index.assign_to_valuator_button"), id: "js-submit-assign-proposal-to-valuator", class: "button button__sm button__secondary ml-2") %>
+          </div>
+        </div>
+      </div>
+    <% end %>
+  </div>
+<% end %>

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

@@ -0,0 +1,34 @@
+<% add_decidim_page_title(proposal_wizard_step_title(action_name)) %>
+
+<% append_stylesheet_pack_tag "decidim_proposals", media: "all" %>
+<% if reporting_proposal? %>
+  <% append_stylesheet_pack_tag "decidim_reporting_proposals" %>
+<% end %>
+<% append_javascript_pack_tag "decidim_proposals" %>
+
+<%= render layout: "layouts/decidim/shared/layout_center" do %>
+
+  <%= render partial: "wizard_header", locals: { callout_step_help_text_class: "warning" } %>
+
+  <% if @similar_proposals.present? %>
+    <div class="proposal__container my-10">
+      <% @similar_proposals.each do |proposal| %>
+        <% if geocoding_comparison? %>
+          <div class="compare-by-distance mb-6">
+            <span class="label secondary float-right"><%= icon("map-pin-line") %> <%= t("away", scope: "decidim.reporting_proposals.proposals.compare.geocoding", meters: distance(1000 * @proposal.distance_from([proposal.latitude, proposal.longitude], :km))) %></span>
+            <%= card_for proposal %>
+          </div>
+        <% else %>
+          <%= card_for proposal %>
+        <% end %>
+      <% end %>
+    </div>
+  <% end %>
+
+  <div class="form__wrapper-block flex-col-reverse md:flex-row justify-between">
+    <%= link_to preview_proposal_path(@proposal), class: "button button__sm md:button__lg button__secondary ml-auto" do %>
+      <span><%= t("continue", scope: "decidim.proposals.proposals.compare") %></span>
+      <%= icon "arrow-right-line" %>
+    <% end %>
+  </div>
+<% end %>

data/app/views/decidim/reporting_proposals/admin/categories/_valuators_field.html.erb

@@ -1,7 +1,7 @@
 
 <div class="row column">
   <%= form.select :valuator_ids,
-                  find_valuators_for_select(current_participatory_space),
+                  find_valuators_for_select(current_participatory_space, current_user),
                   { help_text: t("form.valuators_help", scope: "decidim.reporting_proposals.admin.categories") },
                   { multiple: true } %>
 </div>

data/app/views/decidim/reporting_proposals/admin/proposals/_photo_form.html.erb

@@ -12,8 +12,8 @@
           <% end %>
         </div>
       <% end %>
-      <div class="row column">
-        <%= f.file_field :add_photos, multiple: true %>
+      <div class="row column mb-2">
+        <%= f.upload :add_photos, multiple: true, button_class: "button button__sm button__transparent-secondary" %>
       </div>
       <div class="actions">
         <%= f.submit t(".action"), class: "button button__sm button__secondary" %>

data/app/views/decidim/reporting_proposals/admin/proposals/_photos.html.erb

@@ -9,7 +9,10 @@
       </button>
       <div id="panel-photos">
         <%= render partial: "decidim/reporting_proposals/admin/proposals/photo_gallery" %>
-        <% if admin_allowed_to? :edit_photos, :proposals, extra_context = { proposal: proposal }, chain = [::Decidim::ReportingProposals::Admin::Permissions] %>
+        <% if admin_allowed_to? :edit_photos,
+                                :proposals,
+                                (extra_context = { proposal: proposal }),
+                                (chain = [::Decidim::ReportingProposals::Admin::Permissions]) %>
           <%= render partial: "decidim/reporting_proposals/admin/proposals/photo_form" %>
         <% end %>
       </div>

data/app/views/decidim/reporting_proposals/admin/proposals/_proposal_td_hide.html.erb

@@ -3,14 +3,6 @@
     <%= icon_link_to "delete-bin-line", decidim_admin_reporting_proposals.hide_proposal_path(id: proposal),
                      t("actions.hide", scope: "decidim.moderations"), method: :put, class: "action-icon" %>
   <% else %>
-    <%= cell("decidim/flag_modal", proposal, modal_id: "flagModal#{proposal.id}") %>
-    <button type="button" class="action-icon icon--small action-icon--show-proposal"
-            data-dialog-open="flagModal<%= proposal.id %>"
-            title="<%= t("report", scope: "decidim.proposals.admin.proposals.show") %>"
-            aria-controls="flagModal<%= proposal.id %>"
-            aria-haspopup="true"
-            tabindex="0">
-      <%= icon "flag-line", aria_hidden: true, class: "hide-button icon--small action-icon--show-proposal", role: "img", "aria-hidden": true %>
-    </button>
+   <%= cell "decidim/report_button", proposal, button_classes: "button__text-secondary", modal_id: "flagModal-#{proposal.id}" %>
   <% end %>
 <% end %>

data/app/views/decidim/reporting_proposals/proposals/_camera_button.html.erb

@@ -16,8 +16,10 @@
       <% end %>
     <% end %>
     <div class="field">
-      <%= form.file_field :add_photos, multiple: false, label: t("image", scope: "decidim.reporting_proposals.proposals.form") %>
-
+      <%= form.attachment :add_photos,
+                          multiple: false,
+                          label: t("image", scope: "decidim.reporting_proposals.proposals.form"),
+                          button_class: "button button__lg button__transparent-secondary w-full" %>
       <div class="has_no_image">
         <%= form.check_box :has_no_image %>
       </div>

data/app/views/decidim/reporting_proposals/proposals/_reporting_proposal_fields.html.erb

@@ -1,76 +1,77 @@
-<div class="form__wrapper">
-  <% if @form.categories&.any? %>
-    <div class="field hashtags__container">
-      <%= form.categories_select :category_id, @form.categories, include_blank: t("decidim.proposals.proposals.edit.select_a_category") %>
-    </div>
-  <% end %>
+<% if @form.categories&.any? %>
+  <%= form.categories_select :category_id, @form.categories, include_blank: t("decidim.proposals.proposals.edit.select_a_category") %>
+<% end %>
 
-  <%= render "decidim/reporting_proposals/proposals/camera_button", form: form %>
+<%= render "decidim/reporting_proposals/proposals/camera_button", form: form %>
 
-  <% if @form.geocoding_enabled? %>
-    <div id="address_input">
-      <div class="address-fill">
-        <%= form.geocoding_field :address, placeholder: t("decidim.proposals.proposals.placeholder.address"), required: true %>
-      </div>
-      <div class="has_no_address">
-        <%= form.check_box :has_no_address %>
-        <%= form.hidden_field :has_address, value: "1" %>
-      </div>
-      <div id="address_map" class="proposal__container">
-        <p class="help-text">
-          <%= t("instructions", scope: "decidim.proposals.proposals.dynamic_map_instructions") %> <%= t("description", scope: "decidim.proposals.proposals.dynamic_map_instructions") %>
-        </p>
-        <%= dynamic_map_for proposal_preview_data_for_map(@form.to_h) %>
-      </div>
+<% if @form.geocoding_enabled? %>
+  <div id="address_input">
+    <div class="address-fill">
+      <%= form.geocoding_field(
+            :address,
+            required: true,
+            placeholder: t("decidim.proposals.proposals.placeholder.address"),
+            data: {
+              screen_reader_announcement: t("decidim.proposals.proposals.edit_form_fields.marker_added")
+            }
+          ) %>
+    </div>
+    <div class="has_no_address">
+      <%= form.check_box :has_no_address %>
+      <%= form.hidden_field :has_address, value: "1" %>
+    </div>
+    <div id="address_map" class="proposal__container">
+      <p class="help-text">
+        <%= t("instructions", scope: "decidim.proposals.proposals.dynamic_map_instructions") %> <%= t("description", scope: "decidim.proposals.proposals.dynamic_map_instructions") %>
+      </p>
+      <%= dynamic_map_for proposal_preview_data_for_map(@form.to_h) %>
     </div>
-  <% end %>
-
-  <div class="field hashtags__container">
-    <%= form.text_field :title, class: "js-hashtags", value: form_presenter.title %>
   </div>
+<% end %>
+
+<%= form.text_field :title, class: "js-hashtags", value: form_presenter.title %>
 
-  <%= text_editor_for_proposal_body(form) %>
+<%= text_editor_for_proposal_body(form) %>
 
-  <% if @form.component_automatic_hashtags.any? %>
-    <div class="field">
-      <%= form.label :automatic_hashtags %>
-      <div class="checkboxes hashtags">
-        <% @form.component_automatic_hashtags.each do |hashtag| %>
-          <label>
-            <%= check_box_tag "", "", { checked: true }, { disabled: true } %>#<%= hashtag %>
-          </label>
-        <% end %>
-      </div>
+<% if @form.component_automatic_hashtags.any? %>
+  <div class="field">
+    <%= form.label :automatic_hashtags %>
+    <div class="checkboxes hashtags">
+      <% @form.component_automatic_hashtags.each do |hashtag| %>
+        <label>
+          <%= check_box_tag "", "", { checked: true }, { disabled: true } %>#<%= hashtag %>
+        </label>
+      <% end %>
     </div>
-  <% end %>
+  </div>
+<% end %>
 
-  <% if @form.component_suggested_hashtags.any? %>
-    <div class="field">
-      <%= form.label :suggested_hashtags, nil, for: nil %>
-      <div class="checkboxes hashtags">
-        <%= form.collection_check_boxes :suggested_hashtags, @form.component_suggested_hashtags.map { |hashtag| [hashtag.downcase, "##{hashtag}"] }, :first, :last do |option|
-          option.label { option.check_box(checked: @form.suggested_hashtag_checked?(option.value)) + option.text }
-        end %>
-      </div>
+<% if @form.component_suggested_hashtags.any? %>
+  <div class="field">
+    <%= form.label :suggested_hashtags, nil, for: nil %>
+    <div class="checkboxes hashtags">
+      <%= form.collection_check_boxes :suggested_hashtags, @form.component_suggested_hashtags.map { |hashtag| [hashtag.downcase, "##{hashtag}"] }, :first, :last do |option|
+        option.label { option.check_box(checked: @form.suggested_hashtag_checked?(option.value)) + option.text }
+      end %>
     </div>
-  <% end %>
+  </div>
+<% end %>
 
-  <% if current_component.has_subscopes? %>
-    <%= scopes_select_field form, :scope_id, root: current_component.scope %>
-  <% end %>
+<% if current_component.has_subscopes? %>
+  <%= scopes_select_field form, :scope_id, root: current_component.scope %>
+<% end %>
 
-  <% if component_settings.attachments_allowed? && !component_settings.only_photo_attachments? %>
-    <div class="attachments_container gallery__container documents_container">
-      <legend><%= t("attachment_legend", scope: "decidim.proposals.proposals.edit") %></legend>
-      <div>
-        <%= form.attachment :documents,
-                            multiple: true,
-                            label: t("decidim.proposals.proposals.edit.add_documents"),
-                            button_label: t("decidim.proposals.proposals.edit.add_documents"),
-                            button_edit_label: t("decidim.proposals.proposals.edit.edit_documents"),
-                            button_class: "button button__lg button__transparent-secondary w-full",
-                            help_i18n_scope: "decidim.forms.file_help.file" %>
-      </div>
-    </div>
-  <% end %>
-</div>
+<% if component_settings.attachments_allowed? && !component_settings.only_photo_attachments? %>
+    <%= form.attachment :documents,
+                        multiple: true,
+                        label: t("decidim.proposals.proposals.edit.add_documents"),
+                        button_label: t("decidim.proposals.proposals.edit.add_documents"),
+                        button_edit_label: t("decidim.proposals.proposals.edit.edit_documents"),
+                        button_class: "button button__lg button__transparent-secondary w-full",
+                        help_i18n_scope: "decidim.forms.file_help.file",
+                        help_text: t("attachment_legend", scope: "decidim.proposals.proposals.edit") %>
+<% end %>
+
+<% if current_organization.user_groups_enabled? && Decidim::UserGroups::ManageableUserGroups.for(current_user).verified.any? %>
+  <%= user_group_select_field form, :user_group_id %>
+<% end %>

data/bin/bundle

@@ -0,0 +1,62 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+require "rubygems"
+
+m = Module.new do
+  extend self
+
+  def invoked_as_script?
+    File.expand_path($PROGRAM_NAME) == File.expand_path(__FILE__)
+  end
+
+  def cli_arg_version
+    return unless invoked_as_script? # do not want to hijack other binstubs
+    return unless "update".start_with?(ARGV.first || " ") # must be running `bundle update`
+
+    bundler_version = nil
+    update_index = nil
+    ARGV.each_with_index do |a, i|
+      bundler_version = a if update_index && update_index.succ == i && a =~ Gem::Version::ANCHORED_VERSION_PATTERN
+      next unless a =~ /\A--bundler(?:[= ](#{Gem::Version::VERSION_PATTERN}))?\z/
+
+      bundler_version = Regexp.last_match(1) || ">= 0.a"
+      update_index = i
+    end
+    bundler_version
+  end
+
+  def gemfile
+    File.expand_path("../Gemfile", __dir__)
+  end
+
+  def lockfile
+    "#{gemfile}.lock"
+  end
+
+  def lockfile_version
+    return unless File.file?(lockfile)
+
+    lockfile_contents = File.read(lockfile)
+
+    regexp = /\n\nBUNDLED WITH\n\s{2,}(#{Gem::Version::VERSION_PATTERN})\n/
+
+    regexp.match(lockfile_contents)[1]
+  end
+
+  def bundler_version
+    @bundler_version ||= cli_arg_version || lockfile_version
+  end
+
+  def load_bundler!
+    activate_bundler(bundler_version)
+  end
+
+  def activate_bundler(bundler_version)
+    gem "bundler", bundler_version
+  end
+end
+
+m.load_bundler!
+
+load Gem.bin_path("bundler", "bundle") if m.invoked_as_script?

data/bin/rspec

@@ -0,0 +1,26 @@
+#!/usr/bin/env ruby
+# frozen_string_literal: true
+
+load File.expand_path("bundle", __dir__)
+
+require "rubygems"
+require "bundler/setup"
+
+if ARGV[0]
+  cleaned_file_path = ARGV[0].split("./").last
+  argument_parts = cleaned_file_path.split("/")
+
+  first_part = argument_parts[0]
+
+  if first_part =~ /decidim-/ && File.directory?(first_part)
+    Dir.chdir(first_part)
+
+    other_parts = argument_parts[1..-1]
+
+    new_args = [other_parts.empty? ? nil : other_parts.join("/"), *ARGV[1..-1]].compact
+
+    ARGV.replace(new_args)
+  end
+end
+
+load Gem.bin_path("rspec-core", "rspec")

data/bin/test

@@ -0,0 +1,47 @@
+#!/usr/bin/env bash
+
+version="last"
+prefix=
+if [ "$BUNDLE_GEMFILE" == "Gemfile.legacy" ]; then
+	version="legacy"
+	prefix="BUNDLE_GEMFILE=$BUNDLE_GEMFILE RBENV_VERSION=$RBENV_VERSION"
+	echo "Using legacy version (gemfile: $BUNDLE_GEMFILE, ruby: $RBENV_VERSION)"
+else
+	BUNDLE_GEMFILE="Gemfile"
+	echo "Using latest version"
+fi
+
+cd spec
+# check if directory exists
+if [ ! -d "decidim_dummy_app_$version" ]; then
+	echo "Please generate the test app first:"
+	echo -n "$prefix "
+	echo "bundle exec rake test_app && mv spec/decidim_dummy_app spec/decidim_dummy_app_$version"
+	exit 1
+fi
+# check if directory is a symlink pointing where it should
+if [ ! "decidim_dummy_app_$version" -ef "decidim_dummy_app" ]; then
+	# if it is a symlink, delete it
+	echo "creating symlink to decidim_dummy_app_$version"
+	rm decidim_dummy_app
+	ln -s decidim_dummy_app_$version decidim_dummy_app
+fi
+
+if [ "$1" == "--reset" ]; then
+	echo "Reseting the database"
+	cd decidim_dummy_app
+	if [ "$BUNDLE_GEMFILE" == "Gemfile.legacy" ]; then
+		BUNDLE_GEMFILE="../../Gemfile.legacy" RAILS_ENV=test bundle exec rake db:drop db:create db:schema:load
+	else
+		RAILS_ENV=test bundle exec rake db:drop db:create db:schema:load
+	fi
+else
+	echo "Precompiling test assets"
+	cd decidim_dummy_app
+	if [ -z "$SKIP_PRECOMPILE" ]; then
+		BUNDLE_GEMFILE="../../$BUNDLE_GEMFILE" RAILS_ENV=test bundle exec rails assets:precompile
+	fi
+	cd ../..
+	echo bundle exec rspec $@
+	bundle exec rspec $@
+fi

data/bin/test-legacy

@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+
+RBENV_VERSION=2.7.7 BUNDLE_GEMFILE=Gemfile.legacy bin/test $@

data/config/locales/ca.yml

@@ -9,6 +9,9 @@ ca:
         has_no_image: Sense imatge
   decidim:
     admin:
+      actions:
+        manage: Gestiona
+        new: Nou
       hidden_resource_mailer:
         notify_mail:
           body_1: Un administrador ha esborrat la vostra proposta perquè ha estat denunciada.
@@ -16,10 +19,6 @@ ca:
           hello: Hola,
           reason: 'Motiu: %{reason}'
           subject: La teva proposta ha estat amagada
-      templates:
-        fetch:
-          error: No s'ha trobat aquesta plantilla, potser ha estat esborrada?
-        missing_resource: "(recurs absent)"
     application:
       geocoding:
         unconfigured: La geocodificació no està configurada!
@@ -38,6 +37,14 @@ ca:
             unanswered_proposals_overdue: Quants dies després una proposta sense resposta es considera vençuda
             unanswered_proposals_overdue_help: Aquesta regla afegeix una alerta visual a la llista e propostes. Si no ho vols utilitzar, deixa aquest valor a zero.
       reporting_proposals:
+        actions:
+          amend: Esmena
+          comment: Comentar
+          create: Crear
+          endorse: Adherir-se
+          vote: Donar suport
+          vote_comment: Votar el comentari
+          withdraw: Retirar
         name: Propostes directes
         settings:
           global:
@@ -166,14 +173,8 @@ ca:
             geolocated_at: Geolocalització
           send_email_button:
             send_mail: Envia un correu electrònic a l'usuari
-        proposals_valuator_mailer:
-          notify_proposals_valuator:
-            admin_panel: panell d'administració
-            email_body: Has estat assignat com a avaluador de les propostes llistades a sota. Això significa que s'ha confiat en tu per donar-hi resposta en els propoers dies.
-            gratitude: Gràcies per la teva ajuda!
-            greeting: Hola %{name},
-            public_side: lloc públic
-            subject: Nova proposta asignada per la teva avaluació
+          show:
+            report: Denuncia
     reported_mailer:
       report:
         admin_resource: Administra el recurs
@@ -339,6 +340,7 @@ ca:
           photo_form:
             action: Afageix imatge
             add_images: Afegeix imatges
+            edit_images: Editar imatge
             gallery_legend: Afegeix imatges
             title: Fotografies
             upload_msg: Cap arxiu seleccionat
@@ -352,6 +354,14 @@ ca:
             remove_assignment: desfer assignació
             remove_assignment_confirmation: eliminar la confirmació de l'assignació
             valuators: Avaluadores
+        proposals_valuator_mailer:
+          notify_proposals_valuator:
+            admin_panel: panell d'administració
+            email_body: Has estat assignat com a avaluador de les propostes llistades a sota. Això significa que s'ha confiat en tu per donar-hi resposta en els propoers dies.
+            gratitude: Gràcies per la teva ajuda!
+            greeting: Hola %{name},
+            public_side: lloc públic
+            subject: Nova proposta asignada per la teva avaluació
         resolution_time: Temps de resolució
         time_elapsed:
           datetime:
@@ -416,25 +426,3 @@ ca:
           delete_image: Esborra la imatge
         form:
           image: Imatge/fotografia
-    templates:
-      admin:
-        proposal_answer_templates:
-          form:
-            answer_template: Plantilla de resposta
-            hint: "<strong>Suggeriment:</strong> Pots fer servir aquestes variables a qualsevol lloc a la plantilla de resposta i seran substituïdes pels valors en actiu quan es faci servir"
-            hint1: "<strong>%{organization}</strong> se substituirà pel nom de l'organització"
-            hint2: "<strong>%{name}</strong> se substituirà pel nom de l'autor"
-            hint3: "<strong>%{admin}</strong> se substituirà pel nom de l'administrador (el que està responent a la proposta)"
-            save: Desa
-            scope_for_availability_help: Noteu que només es llistaran els espais participatius que tinguin components de tipus "propostes".
-            template_title: Informació de la plantilla
-          index:
-            confirm_delete: Està segur que vol suprimir aquesta plantilla?
-            global_scope: Global (disponible a tot arreu)
-            internal_state: Estat intern
-            scope_for_availability: Àmbit
-            title: Respostes a la proposta
-          template_chooser:
-            select_template: Selecciona una plantilla de resposta
-      template_types:
-        proposal_answer_templates: Respostes a la proposta

data/config/locales/de.yml

@@ -7,10 +7,11 @@ de:
       proposal:
         has_no_address: Adresse unbekannt
         has_no_image: Kein Foto vorhanden
-      template:
-        scope_for_availability: Verfügbarkeit der Komponente einschränken
   decidim:
     admin:
+      actions:
+        manage: Verwalten
+        new: Neu
       hidden_resource_mailer:
         notify_mail:
           body_1: Ein Administrator hat Ihre Meldung entfernt, weil sie gemeldet wurde.
@@ -18,10 +19,6 @@ de:
           hello: Guten Tag,
           reason: 'Grund: %{reason}'
           subject: Ihre Meldung wurde ausgeblendet
-      templates:
-        fetch:
-          error: Diese Vorlage kann nicht gefunden werden, vielleicht wurde sie gelöscht?
-        missing_resource: "(fehlende Ressource)"
     application:
       geocoding:
         unconfigured: Geocoding ist nicht konfiguriert!
@@ -40,6 +37,14 @@ de:
             unanswered_proposals_overdue: Nach wie vielen Tagen gilt eine nicht beantwortete Meldung als überfällig
             unanswered_proposals_overdue_help: Falls keine zeitlichen Hinweise angezeigt werden sollen, wähle hier 0.
       reporting_proposals:
+        actions:
+          amend: Änderungsvorschlag
+          comment: Kommentieren
+          create: Erstellen
+          endorse: Unterstützung
+          vote: Abstimmung
+          vote_comment: Kommentar bewerten
+          withdraw: Zurückziehen
         name: Meldungen
         settings:
           global:
@@ -168,14 +173,8 @@ de:
             geolocated_at: Hier geolokalisiert
           send_email_button:
             send_mail: Den Meldungslink per E-Mail weiterleiten
-        proposals_valuator_mailer:
-          notify_proposals_valuator:
-            admin_panel: Admin Panel
-            email_body: Du bist für die hier aufgelisteten Meldungen als Experte / Expertin zugeteilt worden. Danke für eine zeitnahe Prüfung der Statthaftigkeit und Bearbeitung der Meldung.
-            gratitude: Vielen Dank!
-            greeting: Hallo %{name}
-            public_side: User-Ansicht
-            subject: Dir wurden neue Meldungen zugewiesen
+          show:
+            report: Bericht
     reported_mailer:
       report:
         admin_resource: Diese Ressource moderieren
@@ -341,6 +340,7 @@ de:
           photo_form:
             action: Bild hinzufügen
             add_images: Bilder hinzufügen
+            edit_images: Bilder hinzufügen
             gallery_legend: Bilder hinzufügen
             title: Bilder
             upload_msg: Keine Dateien ausgewählt
@@ -354,6 +354,14 @@ de:
             remove_assignment: Zuweisung entfernen
             remove_assignment_confirmation: Zuweisung wurde entfernt
             valuators: Expert/innen
+        proposals_valuator_mailer:
+          notify_proposals_valuator:
+            admin_panel: admin panel
+            email_body: Du bist für die hier aufgelisteten Meldungen als Experte / Expertin zugeteilt worden. Danke für eine zeitnahe Prüfung der Statthaftigkeit und Bearbeitung der Meldung.
+            gratitude: Vielen Dank!
+            greeting: Hallo %{name}
+            public_side: User-Ansicht
+            subject: Dir wurden neue Meldungen zugewiesen
         resolution_time: Bearbeitungszeit
         time_elapsed:
           datetime:
@@ -418,25 +426,3 @@ de:
           delete_image: Bild löschen
         form:
           image: Foto
-    templates:
-      admin:
-        proposal_answer_templates:
-          form:
-            answer_template: Standardantworten
-            hint: "<strong>Hinweis:</strong> Diese Platzhalter kannst du überall in den Standortantworten verwenden. Sie werden dann durch die entsprechenden Inhalte ersetzt"
-            hint1: "<strong>%{organization}</strong> wird durch den Namen der Organisation ersetzt"
-            hint2: "<strong>%{name}</strong> wird durch den Namen des Autors ersetzt"
-            hint3: "<strong>%{admin}</strong> wird durch den Namen der Person ersetzt, die den Vorschlag beantwortet"
-            save: Speichern
-            scope_for_availability_help: Beachte, dass nur Prozesse mit Komponenten des Typs "Vorschlag" aufgelistet werden.
-            template_title: Titel der Vorlage
-          index:
-            confirm_delete: Möchten Sie diese Vorlage wirklich löschen?
-            global_scope: Global (überall verfügbar)
-            internal_state: Interner Status
-            scope_for_availability: Bereich
-            title: Antworten für Vorschläge / Meldungen
-          template_chooser:
-            select_template: Wähle eine Vorlage
-      template_types:
-        proposal_answer_templates: Antworten für Vorschläge / Meldungen