*Correctly* handle first day of the month in French

CVS version numbers

english/template/debian/ctime.wml: 1.116 -> 1.117

1 files changed, 21 insertions, 1 deletions

diff --git a/english/template/debian/ctime.wml b/english/template/debian/ctime.wml
index 9fea84df9cd..54ffd84ae21 100644
--- a/english/template/debian/ctime.wml
+++ b/english/template/debian/ctime.wml
@@ -209,7 +209,7 @@ sub contractcatalan {
 sub frenchsuffix {
         my $mday = shift;
 
-        return '<sup>er</sup>' if $mday % 10 == 1 && $mday != 11 && $mday != 31;
+        return '<sup>er</sup>' if $mday == 1;
 }
 
 
@@ -285,6 +285,13 @@ sub spokendate_noyear {
 		my $date = sprintf("%d de %s", $mday, $mon_str);
 		return &contractcatalan($date);
 	}
+        elsif ($CUR_ISO_LANG eq "fr")
+        {
+                # Special handling of French: suffix for the first date of month
+                # with "^er"
+
+                return sprintf("%d%s %s", $mday, &frenchsuffix($mday), $mon_str);
+        }
 	# Add any other special cases here as elsif cases
 	else
 	{
@@ -341,6 +348,19 @@ sub daterange {
 
 		return &contractcatalan($str);
 	}
+        elsif ($CUR_ISO_LANG eq "fr")
+        {
+                # Special handling of French: suffix for the first date of month
+                # with "^er"
+
+                return sprintf("%d%s-%d %s", $sday, &frenchsuffix($sday),
+				$eday, $smon_str)
+			if $samemonth;
+                return sprintf("%d%s %s-%d%s %s",
+                               $sday, &frenchsuffix($sday), $smon_str,
+                               $eday, &frenchsuffix($eday), $emon_str)
+        }
+
 	# Add any other special cases here as elsif cases
 	else
 	{