From e1f66cac33fda3c7edb9d870fdc7112ea39aec54 Mon Sep 17 00:00:00 2001
From: Kazhnuz <antoine@sortilege.net>
Date: Fri, 9 Nov 2018 11:08:56 +0100
Subject: [PATCH] romme-calendar: rework how works formatted string date from
 gregorian

---
 exemple.php        |  4 ++--
 romme-calendar.php | 42 ++++++++++++++++--------------------------
 2 files changed, 18 insertions(+), 28 deletions(-)

diff --git a/exemple.php b/exemple.php
index ea0852c..ae0a1ba 100644
--- a/exemple.php
+++ b/exemple.php
@@ -61,8 +61,8 @@ $testJulianday  = gregoriantojd($testMois, $testJour, $testAnnee);
       <strong>romme_getFormattedString :</strong> <?php echo romme_getFormattedString( jdtoromme( $testJulianday ), false );?> <br />
       <strong>romme_getFormattedStringComplete :</strong> <?php echo romme_getFormattedStringComplete( jdtoromme( $testJulianday ) );?> <br />
       
-      <strong>gregorian2FrenchDateString :</strong> <?php echo gregoriantoromme_completeString($testMois, $testJour, $testAnnee);?><br />
-      <strong>gregorian2FrenchDateStringShort :</strong> <?php echo gregoriantoromme_simplerString($testMois, $testJour, $testAnnee);?><br />
+      <strong>gregoriantoromme_getFormattedString :</strong> <?php echo gregoriantoromme_getFormattedString($testMois, $testJour, $testAnnee, false);?><br />
+      <strong>gregoriantoromme_getFormattedStringComplete :</strong> <?php echo gregoriantoromme_getFormattedStringComplete($testMois, $testJour, $testAnnee);?><br />
       
     </p>
   </body>
diff --git a/romme-calendar.php b/romme-calendar.php
index 17f40e9..406cb0d 100644
--- a/romme-calendar.php
+++ b/romme-calendar.php
@@ -354,7 +354,7 @@ function romme_getComplementaryDayName($romme_date_string) {
  */
 
 function romme_getFormattedString($romme_date_string, $showDecadeDayName) {
-  // Convert a romme date string to a shorter romme date string
+  // Convert a romme date string to a formated romme date
   
   // Start by getting the romme array
   $dateArray = romme_getArray($romme_date_string);
@@ -369,7 +369,7 @@ function romme_getFormattedString($romme_date_string, $showDecadeDayName) {
 }
 
 function romme_getFormattedStringComplete($romme_date_string) {
-  // Convert a romme date string to a complete romme date string
+  // Convert a romme date string to a formated complete romme date
 
   // Start by getting the romme array
   $dateArray = romme_getArray($romme_date_string);
@@ -385,37 +385,27 @@ function romme_getFormattedStringComplete($romme_date_string) {
   return $dayMonthString . ", " . $yearString . "<br /><em>" . $saintString . "</em>";
 }
 
-/* 4.2. Getting it from the gregorian date
+/* 4.2. Getting them from the gregorian date
 
  */
 
-function gregoriantoromme_completeString($m,$d,$y) {
-  // Convert a gregorian date to a complete romme date string
+function gregoriantoromme_getFormattedString($m,$d,$y, $showDecadeDayName) {
+  // Convert a gregorian date to a formatted romme date
 
-  // Start by getting the romme array from the gregorian date
-  $dateArray = gregoriantoromme_getArray($m,$d,$y);
+  // Start by getting the romme date string from the gregorian date
+  $romme_date_string = gregoriantoromme($m,$d,$y);
   
-  // Get the month and day names
-  $dayMonthString = repcal_getDayMonthNames($dateArray[0], $dateArray[1], true);
-  
-  $saintString = repcal_getComplementaryDayName($dateArray[0],$dateArray[1]);
-
-  // Create the string for the year
-  $yearString = "an " . $dateArray[2];
-
-  return $dayMonthString . ", " . $yearString . "<br /><em>" . $saintString . "</em>";
+  // return the convertion of the romme date string to a formatted string
+  return romme_getFormattedString($romme_date_string, $showDecadeDayName);
 }
 
-function gregoriantoromme_simplerString($m,$d,$y) {
-  // Convert a gregorian date to a shorter romme date string
-  $dateArray = gregoriantoromme_getArray($m,$d,$y);
-  
-  // Get the month and day names
-  $dayMonthString = repcal_getEpiphany($dateArray[0], $dateArray[1], false);
-  
-  // Create the string for the year
-  $yearString = "an " . $dateArray[2];
+function gregoriantoromme_getFormattedStringComplete($m,$d,$y) {
+  // Convert a gregorian date to a complete romme formatted string
 
-  return $dayMonthString . ", " . $yearString;
+  // Start by getting the romme date string from the gregorian date
+  $romme_date_string = gregoriantoromme($m,$d,$y);
+  
+  // return the convertion of the romme date string to a formatted string
+  return romme_getFormattedStringComplete($romme_date_string);
 }
 ?>