From f50f25a2846d5ac3f0021aa781df4d656a562ea1 Mon Sep 17 00:00:00 2001
From: Mael <mael.thomas@data.gouv.fr>
Date: Thu, 13 Sep 2018 17:29:14 +0200
Subject: [PATCH 1/2] :bug: Passer la commune plantait l'application

---
 .../components/conversation/FormDecorator.js  | 58 +++++++++++--------
 1 file changed, 33 insertions(+), 25 deletions(-)

diff --git a/source/components/conversation/FormDecorator.js b/source/components/conversation/FormDecorator.js
index c50b2fe8c..1f6cb3362 100644
--- a/source/components/conversation/FormDecorator.js
+++ b/source/components/conversation/FormDecorator.js
@@ -62,32 +62,40 @@ export var FormDecorator = formType => RenderField =>
 
 			return (
 				<div className={classNames('step', formType)}>
-						<div className="unfoldedHeader">
-							<div className="step-question">
-								<h1> {this.props.question} {!inversion && <Explicable dottedName={fieldName}/>}</h1>
-								<div
-									className="step-subquestion"
-									dangerouslySetInnerHTML={{ __html: subquestion }}
-									/>
-							</div>
+					<div className="unfoldedHeader">
+						<div className="step-question">
+							<h1>
+								{' '}
+								{this.props.question}{' '}
+								{!inversion && <Explicable dottedName={fieldName} />}
+							</h1>
+							<div
+								className="step-subquestion"
+								dangerouslySetInnerHTML={{ __html: subquestion }}
+							/>
 						</div>
-						{defaultValue != null && (
-							<IgnoreStepButton
-								action={() => {
-									setFormValue(fieldName, '' + defaultValue)
-									submit('ignore')
-								}}
-							/>
-						)}
-						<fieldset>
-
-							<Field
-								component={RenderField}
-								name={fieldName}
-								{...stepProps}
-								themeColours={themeColours}
-							/>
-						</fieldset>
+					</div>
+					{defaultValue != null && (
+						<IgnoreStepButton
+							action={() => {
+								setFormValue(
+									fieldName,
+									typeof defaultValue == 'object'
+										? JSON.stringify(defaultValue)
+										: '' + defaultValue
+								)
+								submit('ignore')
+							}}
+						/>
+					)}
+					<fieldset>
+						<Field
+							component={RenderField}
+							name={fieldName}
+							{...stepProps}
+							themeColours={themeColours}
+						/>
+					</fieldset>
 				</div>
 			)
 		}

From d8e2462a4defc3effb1686afb252ea7a62fbeb5d Mon Sep 17 00:00:00 2001
From: Mael <mael.thomas@data.gouv.fr>
Date: Thu, 13 Sep 2018 17:47:47 +0200
Subject: [PATCH 2/2] :alien: Traduction de la question de localisation

---
 source/règles/externalized.yaml | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/source/règles/externalized.yaml b/source/règles/externalized.yaml
index e88d93655..7682a28e3 100644
--- a/source/règles/externalized.yaml
+++ b/source/règles/externalized.yaml
@@ -855,9 +855,7 @@ entreprise . association non lucrative:
     calculées à l'échelle de l'établissement et sont fonction de règlementations
     locales.
   suggestions.fr: utilisation d'une API
-établissement . commune:
-  titre.en: City of the establishment
-  titre.fr: Commune de l'établissement
+établissement . localisation:
   question.en: In which city is the establishment located?
   question.fr: Dans quelle commune l'établissement est-il implanté ?
   description.en: |-