From c655ee53470f9232a949e0d37973f5dd73685d64 Mon Sep 17 00:00:00 2001
From: Kazhnuz <antoine@sortilege.net>
Date: Wed, 7 Nov 2018 16:34:43 +0100
Subject: [PATCH] republicandate: invert sansculottide day+month string and
 epiphany

It make the string easier to use, as the day+month string helps more the user to see where he is in the romme year now.
---
 exemple.php        | 2 +-
 republicandate.php | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/exemple.php b/exemple.php
index 4d05156..c2ac5b4 100644
--- a/exemple.php
+++ b/exemple.php
@@ -35,7 +35,7 @@ $testJulianday  = gregoriantojd($testMois, $testJour, $testAnnee);
     <h2>Test des différentes fonctions</h2>
     <p>
       <strong>jdtoromme :</strong> <?php echo jdtoromme( $testJulianday );?> <br />
-      <strong>gregoriantoromme :</strong> <?php echo gregoriantoromme($testMois, date('j'), date('Y'));?><br />
+      <strong>gregoriantoromme :</strong> <?php echo gregoriantoromme($testMois, $testJour, $testAnnee);?><br />
       <strong>gregorian2FrenchDateString :</strong> <?php echo gregorian2FrenchDateString($testMois, $testJour, $testAnnee);?><br />
       <strong>gregorian2FrenchDateStringShort :</strong> <?php echo gregorian2FrenchDateStringShort($testMois, $testJour, $testAnnee);?><br />
       
diff --git a/republicandate.php b/republicandate.php
index 95ca7fa..0c56f13 100644
--- a/republicandate.php
+++ b/republicandate.php
@@ -217,8 +217,8 @@ function gregorian2FrenchDateString($m,$d,$y) {
 
   // If you are in a complentary day, show it the right way
   if ($dateArray[0]==13) {
-    $dayMonthString = FrenchSansCullotidesNames($dateArray[1]) . ", ";
-    $saintString = FrenchOrdinalNumber($dateArray[1]);
+    $dayMonthString = FrenchOrdinalNumber($dateArray[1]) . ", ";
+    $saintString    = FrenchSansCullotidesNames($dateArray[1]);
   } else {
     $dayMonthString = $dayname . ", " . $dateArray[1] . " " . $monthname . ", ";
     $saintString = FrenchSaintNames($dateArray[0],$dateArray[1]);
@@ -240,8 +240,8 @@ function gregorian2FrenchDateStringShort($m,$d,$y) {
 
   // If you are in a complentary day, show it the right way
   if ($dateArray[0]==13) {
-    $dayMonthString = FrenchSansCullotidesNames($dateArray[1]) . ", ";
-    $saintString = FrenchOrdinalNumber($dateArray[1]);
+    $dayMonthString = FrenchOrdinalNumber($dateArray[1]) . ", ";
+    $saintString    = FrenchSansCullotidesNames($dateArray[1]);
   } else {
     $dayMonthString = $dateArray[1] . " " . $monthname . ", ";
     $saintString = FrenchSaintNames($dateArray[0],$dateArray[1]);