Merge pull request #149 from OpenSourcePolitics/develop

Fix currency settings

config/i18n-tasks.yml

@@ -322,5 +322,9 @@ ignore_unused:
   - decidim.assemblies.show.future_assembly_participatory_processes_mini
   - decidim.assemblies.show.past_assembly_participatory_processes
   - decidim.assemblies.show.past_assembly_participatory_processes_mini
+  - activemodel.attributes.user.additional_tos
+  - activemodel.attributes.user.living_area
+  - activemodel.attributes.user.month
+  - activemodel.attributes.user.year
 
 

config/locales/en.yml

@@ -66,6 +66,11 @@ en:
         email: Email
         name: Name
         role: Role
+      user:
+        additional_tos: Additional Terms of use
+        living_area: Living area
+        month: Month
+        year: Year
     errors:
       models:
         participatory_process:

config/locales/fr.yml

@@ -66,6 +66,11 @@ fr:
         email: Email
         name: Nom
         role: Rôle
+      user:
+        additional_tos: Traitement des données
+        living_area: Lieu de résidence
+        month: Mois de naissance
+        year: Année de naissance
     errors:
       models:
         participatory_process:

config/secrets.yml

@@ -13,6 +13,7 @@
 default: &default
   asset_host: <%= ENV["ASSET_HOST"] %>
   decidim:
+    currency: <%= ENV["CURRENCY"] || "€" %>
     rack_attack:
       enabled: <%= ENV["ENABLE_RACK_ATTACK"] %>
       fail2ban:

spec/lib/tasks/decidim_app/k8s/dump_db_tasks_spec.rb

@@ -8,7 +8,7 @@
   end
 
   it "invokes the configuration exporter" do
-    expect(DecidimApp::K8s::ConfigurationExporter).to receive(:dump_db).and_return(true)
+    expect(DecidimApp::K8s::ConfigurationExporter).to receive(:dump_db).at_least(:once).and_return(true)
 
     task.execute
   end