X-Git-Url: http://git.polytechnique.org/?a=blobdiff_plain;ds=sidebyside;f=configs%2Fplatal.ini;h=4fcbe4206d2a701f27e674f1a0d697c1665fc117;hb=d6c91d502586d5f56faae7a39dc18e3ed26395f6;hp=a0cfbd1a7add6786dbd655616687a9a27cad2c70;hpb=dba46c5cd9a8de4e7d8f96b05575b47dc0c913bf;p=platal.git

diff --git a/configs/platal.ini b/configs/platal.ini
index a0cfbd1..4fcbe42 100644
--- a/configs/platal.ini
+++ b/configs/platal.ini
@@ -198,6 +198,13 @@ gmaps_key = ""
 ; URL of geocoding webservice
 gmaps_url = "http://maps.google.com/maps/geo"
 
+; $globals->geocoder->gmaps_hl
+; Default output language.
+gmaps_hl = "fr"
+
+; $globals->geocoder->gmaps_gl
+; Default location preference.
+gmaps_gl = "fr"
 
 ; The lists section contains parameters used to interact with mailman.
 [Lists]
@@ -381,3 +388,10 @@ auth_baseurl = ""
 ; Domain address where the aliases containing the list of (non-)subscribers
 ; of an event are created.
 evts_domain  = ""
+
+; The merge section contains parameters about the merge's state.
+[Merge]
+
+; $globals->merge->state
+; Pending before the merge, done afterwards.
+state = "pending"