decidim-proposals 0.29.1 → 0.29.3

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

@@ -63,6 +63,7 @@ module Decidim
           "created_at",
           "updated_at",
           "state",
+          "decidim_proposals_proposal_state_id",
           "state_published_at",
           "answer",
           "answered_at",
@@ -117,7 +118,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/import_proposals_mailer/notify_failure.html.erb

@@ -0,0 +1 @@
+<p><%= t(".body", origin_component_name: translated_attribute(@origin_component.name), target_component_name: translated_attribute(@target_component.name)) %></p>

data/app/views/decidim/proposals/admin/import_proposals_mailer/notify_success.html.erb

@@ -0,0 +1,2 @@
+<p><%= t(".body", origin_component_name: translated_attribute(@origin_component.name), target_component_name: translated_attribute(@target_component.name)) %></p>
+<p><%= t(".added_proposals", count: @count) %></p>

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

@@ -20,7 +20,7 @@
         </div>
       <% end %>
       <% if @form.component_suggested_hashtags.any? %>
-        <div>
+        <div class="row column">
           <%= form.label :suggested_hashtags %>
           <div class="hashtags">
             <%= form.collection_check_boxes :suggested_hashtags, @form.component_suggested_hashtags.map { |hashtag| [hashtag.downcase, "##{hashtag}"] }, :first, :last do |option|

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/show.html.erb

@@ -53,20 +53,20 @@
 
         <% presented_endorsers = endorsers_presenters_for(proposal) %>
         <% if presented_endorsers.any? %>
-          <%= render partial: "endorsers", locals: { presented_endorsers:, proposal: } %>
+          <%= render partial: "decidim/proposals/admin/proposals/endorsers", locals: { presented_endorsers:, proposal: } %>
         <% end %>
 
         <% if proposal.documents.any? %>
-          <%= render partial: "documents", locals: { proposal: } %>
+          <%= render partial: "decidim/proposals/admin/proposals/documents", locals: { proposal: } %>
         <% end %>
 
         <% if proposal.photos.any? %>
-          <%= render partial: "photos", locals: { proposal: } %>
+          <%= render partial: "decidim/proposals/admin/proposals/photos", locals: { proposal: } %>
         <% end %>
 
         <% proposal_meetings = proposal.linked_resources(:meetings, "proposals_from_meeting") %>
         <% if proposal_meetings.any? %>
-          <%= render partial: "meetings", locals: { proposal_meetings: } %>
+          <%= render partial: "decidim/proposals/admin/proposals/meetings", locals: { proposal_meetings: } %>
         <% end %>
 
         <% if allowed_to?(:create, :proposal_note, proposal: proposal) %>

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/_proposals.html.erb

@@ -8,7 +8,7 @@
   <%= cell("decidim/announcement", params[:filter].present? ? t(".empty_filters") : t(".empty")) %>
 <% else %>
   <div class="flex items-center justify-between">
-    <h2 class="h5 md:h3 decorator"><%= t("count", scope: "decidim.proposals.proposals.index", count: @proposals.total_count) %></h2>
+    <h2 class="h5 md:h3 decorator" aria-live="polite" aria-atomic="true"><%= t("count", scope: "decidim.proposals.proposals.index", count: @proposals.total_count) %></h2>
     <div class="view-layout__links flex view_mode__links">
       <%= toggle_view_mode_link(@view_mode, "list", t("list_mode", scope: "decidim.proposals.proposals.index"), params) %>
       <%= toggle_view_mode_link(@view_mode, "grid", t("grid_mode", scope: "decidim.proposals.proposals.index"), params) %>

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

@@ -1,4 +1,11 @@
-<% add_decidim_page_title(t("name", scope: "decidim.components.proposals")) %>
+<% add_decidim_meta_tags(
+  description: translated_attribute(current_participatory_space.short_description),
+  title: t("decidim.components.pagination.page_title",
+           component_name:,
+           current_page: @proposals.current_page,
+           total_pages: @proposals.total_pages ),
+  url: proposals_url,
+  resource: current_component) %>
 
 <% append_stylesheet_pack_tag "decidim_proposals", media: "all" %>
 <% append_javascript_pack_tag "decidim_proposals" %>
@@ -31,7 +38,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

@@ -12,6 +12,8 @@ ar:
         state: حالة
         title: عنوان
         user_group_id: إنشاء مسودة تعاونية كـ
+      import_participatory_text:
+        document: مستند
       proposal:
         address: عنوان
         answer: إجابة
@@ -21,6 +23,8 @@ ar:
         category_id: الفئة
         decidim_scope_id: النطاق
         has_address: لديه عنوان
+        latitude: خط العرض
+        longitude: خط الطول
         scope_id: نطاق
         state: حالة
         suggested_hashtags: الهاشتاج المقترحة
@@ -33,6 +37,8 @@ ar:
         execution_period: فترة التنفيذ
       proposals_copy:
         origin_component_id: مكون لنسخ المقترحات من
+      proposals_file_import:
+        file: ملف
       proposals_import:
         import_proposals: مقترحات الاستيراد
         keep_answers: الاحتفاظ بالحالة والإجابات
@@ -262,12 +268,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:
@@ -314,9 +318,10 @@ ar:
         title: اقتراحات
       votes:
         object: أصوات
+        title: الأصوات
     participatory_spaces:
       highlighted_proposals:
-        see_all: شاهد الكل (%{count})
+        see_all: شاهد الكل
     proposals:
       actions:
         answer_proposal: الرد على المُقتَرَح
@@ -422,7 +427,6 @@ ar:
           index:
             actions: أفعال
             assign_to_valuator: أسنِده إلى مُقيِّم
-            assign_to_valuator_button: تعيين
             cancel: إلغاء
             change_category: تغيير الفئة
             change_scope: تغيير النطاق
@@ -436,7 +440,6 @@ ar:
             split_button: انشق، مزق
             title: اقتراحات
             unassign_from_valuator: إلغاء الإسناد مِن المُقيِّم
-            unassign_from_valuator_button: إلغاء الإسناد
             update: تحديث
             update_scope_button: تحديث النطاق
           new:
@@ -687,7 +690,6 @@ ar:
           text_banner: أنت تتطلع على قائمة الاقتراحات المسحوبة من قبل مؤلفيها. %{go_back_link}.
         new:
           send: استمر
-          title: إنشاء اقتراحك
         orders:
           label: 'ترتيب المقترحات حسب:'
           most_commented: الأكثر تعليقًا عليها

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:
@@ -376,7 +374,6 @@ bg:
         title: Гласове
     participatory_spaces:
       highlighted_proposals:
-        last: Позледни предложения
         see_all: Виж всички предложения
     proposals:
       actions:
@@ -514,7 +511,6 @@ bg:
           index:
             actions: Активности
             assign_to_valuator: Възлагане на оценител
-            assign_to_valuator_button: Възлагане
             cancel: Отказ
             change_category: Промяна на категория
             change_scope: Промяна на обхвата
@@ -530,7 +526,6 @@ bg:
             statuses: Статуси
             title: Предложения
             unassign_from_valuator: Отнемане възложеното на оценителя
-            unassign_from_valuator_button: Отнемане на възложеното
             update: Актуализация
             update_scope_button: Актуализиране на обхвата
           new:
@@ -571,7 +566,6 @@ bg:
         proposals_imports:
           create:
             invalid: Възникна проблем при импортирането на предложенията.
-            success: "%{number} предложения бяха импортирани успешно."
           new:
             create: Импортиране на предложения
             no_components: Няма други компоненти на предложения в това пространство за участие, от които да се импортират предложенията.
@@ -660,7 +654,7 @@ bg:
           open: Отворен
           published: Публикувано
           related_to: Свързано с
-          scope: Обхват
+          scope: Сфера
           search: Търсене
           state: Статус
           withdrawn: Оттеглено
@@ -746,7 +740,7 @@ bg:
             official_proposal: Официално предложение
             published_answer: Публикуван отговор
             published_at: Публикувано на
-            scope: Обхват
+            scope: Сфера
             state: Статус
             title: Заглавие
             valuator: Оценител
@@ -810,7 +804,6 @@ bg:
           text_banner: Разглеждате списъка с предложения, оттеглени от своите автори. %{go_back_link}.
         new:
           send: Продължи
-          title: Създайте Ваше предложение
         orders:
           label: 'Подреждане на предложенията по:'
           most_commented: Най-коментирани

data/config/locales/bn-BD.yml

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

data/config/locales/bs-BA.yml

@@ -0,0 +1,98 @@
+---
+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
+            change_scope: Promeni opseg
+            publish_answers: Objavi odgovore
+            unassign_from_valuator: Oduzmi od procenjivača
+            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.