Merge branch 'preprod' into 'master'

Finish updating the values

See merge request !124

app/controller/admin.php

@@ -869,7 +869,7 @@ class Admin extends Controller
             $db->query(
                 "DELETE FROM adresses
                 WHERE id = $id"
-        );
+            );
         } else {
             $result = $db->query("SELECT user_id FROM adresses WHERE id = $id");
             $result = $result->fetch(\PDO::FETCH_ASSOC);

app/controller/campaign.php

@@ -34,7 +34,7 @@ class Campaign extends Controller
             FROM dons
             WHERE status IN (1, 4, 102)
                 AND datec > '".CAMPAIGN_START_DATE."'"
-            );
+        );
         $total_confirmed = intval($result->fetchColumn());
         $f3->set('total_confirmed', $total_confirmed);
         // Now, provisional. All reccuring pledge who have a datec in the last month (still active)

app/controller/cron.php

@@ -108,15 +108,15 @@ class Cron extends Controller
                     str_replace(
                         "%%DECIMALES%%",
                         $decimales,
-                    str_replace(
+                        str_replace(
                         "%%NOM%%",
                         $pdf['nom'],
-                    str_replace(
+                        str_replace(
                         "%%MILLIER%%",
                         $pdf['decimale'],
-                    $template
-                    )
-                    )
+                        $template
+                        )
+                        )
                     )
                 );
 

app/view/campaign/home.html

@@ -46,13 +46,13 @@
 								<div class="modal-row">
 									<div class="radio-row"> 
 										<input type="radio" name="amount" id="amount1" value="11">
-										<label for="amount1" class="text-center">10€ </label>
+										<label for="amount1" class="text-center">11€ </label>
 										<input type="radio" name="amount" id="amount2" value="42">
-										<label for="amount2" class="text-center">30€</label>
+										<label for="amount2" class="text-center">42€</label>
 										<input type="radio" name="amount" id="amount3" value="64" checked>
-										<label for="amount3" class="text-center">50€</label>
+										<label for="amount3" class="text-center">64€</label>
 										<input type="radio" name="amount" id="amount4" value="128">
-										<label for="amount4" class="text-center">100€</label>
+										<label for="amount4" class="text-center">128€</label>
 										<input type="radio" name="amount" id="amount5" value="314">
 										<label for="amount5" class="text-center">314€</label>
 									</div>

locales/en_US/LC_MESSAGES/messages.po

@@ -830,8 +830,12 @@ msgstr ""
 "to protect our financial freedom. Our financial regulations document defines "
 "how:<br />As for companies, the following rules applies:"
 
+<<<<<<< Updated upstream
 #: app/view/campaign/faq.html:234
 #, c-format
+=======
+#: app/view/campaign/faq.html:235
+>>>>>>> Stashed changes
 msgid ""
 "La part du budget annuel de LQdN apportée par des entreprises donnant "
 "chacune 1 000 euros ou plus une année donnée ne peut dépasser 20% du budget "
@@ -873,7 +877,11 @@ msgstr ""
 msgid "Qui finance La Quadrature du Net&nbsp;?"
 msgstr "Who's financing La Quadrature du Net?"
 
+<<<<<<< Updated upstream
 #: app/view/campaign/faq.html:252
+=======
+#: app/view/campaign/faq.html:253
+>>>>>>> Stashed changes
 msgid ""
 "La Quadrature du Net est financée à 70 % par des dons individuels : vos "
 "dons !  Nous acceptons aussi les dons d'entreprise, mais tous les dons "