Merge branch 'develop' into staging

config/locales/models/dossier/fr.yml

@@ -10,11 +10,11 @@ fr:
         state:
           draft: "Brouillon"
           initiated: "Nouveau"
-          replied: "Répondu"
+          replied: "En construction"
-          updated: "Mis à jour"
+          updated: "En construction"
           validated: "Figé"
-          submitted: "Déposé"
+          submitted: "Déposé / À réceptionner"
-          received: "Reçu"
+          received: "En instruction"
           closed: "Accepté"
           refused: "Refusé"
           without_continuation: "Sans suite"

spec/decorators/dossier_decorator_spec.rb

@@ -29,12 +29,12 @@ describe DossierDecorator do
 
     it 'replied is repondu' do
       dossier.replied!
-      expect(subject).to eq('Répondu')
+      expect(subject).to eq('En construction')
     end
 
     it 'updated is mis à jour' do
       dossier.updated!
-      expect(subject).to eq('Mis à jour')
+      expect(subject).to eq('En construction')
     end
 
     it 'validated is valide' do
@@ -44,7 +44,7 @@ describe DossierDecorator do
 
     it 'submitted is dépose' do
       dossier.submitted!
-      expect(subject).to eq('Déposé')
+      expect(subject).to eq('Déposé / À réceptionner')
     end
 
     it 'closed is traité' do
@@ -54,7 +54,7 @@ describe DossierDecorator do
 
     it 'received is reçu' do
       dossier.received!
-      expect(subject).to eq('Reçu')
+      expect(subject).to eq('En instruction')
     end
 
     it 'without_continuation is traité' do

spec/facades/admin_procedures_show_facades_spec.rb

@@ -29,7 +29,7 @@ describe AdminProceduresShowFacades do
   describe '.dossiers_for_pie_highchart' do
     subject { super().dossiers_for_pie_highchart }
 
-    it { expect(subject).to eq({'Nouveau' => 1, 'Figé' => 2, "Mis à jour"=>1}) }
+    it { expect(subject).to eq({'Nouveau' => 1, 'Figé' => 2, "En construction"=>1}) }
   end
 
   describe '.dossiers_archived_by_state_total' do

spec/views/layouts/left_panels/_left_panel_backoffice_dossierscontroller_show_spec.rb

@@ -45,7 +45,7 @@ describe 'layouts/left_panels/_left_panel_backoffice_dossierscontroller_show.htm
         render
       end
 
-      it { expect(rendered).to have_content('Répondu') }
+      it { expect(rendered).to have_content('En construction') }
 
       it 'button Déclarer complet is present' do
         expect(rendered).to have_css('.action')
@@ -60,7 +60,7 @@ describe 'layouts/left_panels/_left_panel_backoffice_dossierscontroller_show.htm
         render
       end
 
-      it { expect(rendered).to have_content('Mis à jour') }
+      it { expect(rendered).to have_content('En construction') }
 
       it 'button Déclarer complet is present' do
         expect(rendered).to have_css('.action')
@@ -90,7 +90,7 @@ describe 'layouts/left_panels/_left_panel_backoffice_dossierscontroller_show.htm
         render
       end
 
-      it { expect(rendered).to have_content('Déposé') }
+      it { expect(rendered).to have_content('Déposé / À réceptionner') }
 
       it 'button Accuser réception is present' do
         expect(rendered).to have_css('.action')
@@ -109,7 +109,7 @@ describe 'layouts/left_panels/_left_panel_backoffice_dossierscontroller_show.htm
         render
       end
 
-      it { expect(rendered).to have_content('Reçu') }
+      it { expect(rendered).to have_content('En instruction') }
 
       it 'button accepter / refuser / classer sans suite are present' do
         expect(rendered).to have_css('form[data-toggle="tooltip"][title="Accepter"]')

spec/views/layouts/left_panels/_left_panel_users_recapitulatifcontroller_show_spec.rb

@@ -27,7 +27,7 @@ describe 'layouts/left_panels/_left_panel_users_recapitulatifcontroller_show.htm
         render
       end
 
-      it { expect(rendered).to have_content('Répondu') }
+      it { expect(rendered).to have_content('En construction') }
     end
 
     context 'when dossier state is updated' do
@@ -37,7 +37,7 @@ describe 'layouts/left_panels/_left_panel_users_recapitulatifcontroller_show.htm
         render
       end
 
-      it { expect(rendered).to have_content('Mis à jour') }
+      it { expect(rendered).to have_content('En construction') }
     end
 
     context 'when dossier state is validated' do
@@ -69,7 +69,7 @@ describe 'layouts/left_panels/_left_panel_users_recapitulatifcontroller_show.htm
         render
       end
 
-      it { expect(rendered).to have_content('Déposé') }
+      it { expect(rendered).to have_content('Déposé / À réceptionner') }
 
       it 'button Editer mon dossier n\'est plus present' do
         expect(rendered).not_to have_css('#maj_infos')