chiark / gitweb /
fixing ordinal number for 11,12,13
authornaath <naath@chiark.greenend.org.uk>
Sun, 30 Mar 2014 12:38:25 +0000 (13:38 +0100)
committernaath <naath@chiark.greenend.org.uk>
Sun, 30 Mar 2014 12:38:25 +0000 (13:38 +0100)
familyTree/askQuestion.py
familyTree/printPerson.py

index 7bb39cdf920c49989d56d4cb0a9c6560aad17152..70185030007dc948a29a9ea04122e5eb9e8bb9dc 100755 (executable)
@@ -81,15 +81,15 @@ def print_tagged_name(relationship,row,newLine):
 
 
 def ordinal_numbers(number):
-       out = str(number)
-       if number==1:
-               out = out +'st'
-       elif number==2:
-               out = out +'nd'
-       elif number==3:
-               out = out +'rd'
+       number = int(number)
+       if number % 10==1 and number/10 % 10 !=1:
+               out = str(number) +'st'
+       elif number % 10==2 and number/10 % 10 !=1:
+               out = str(number) +'nd'
+       elif number % 10==3 and number/10 % 10 !=1:
+               out = str(number) +'rd'
        else:
-               out = out +'th'
+               out = str(number) +'th'
        return out
 
 def list_territories(newLine):
index f5f1228817eb83ed0a2ce46f1e7e7c3cb38123d2..d2d229074a28ce23487894b4345086b63cf2ad36 100755 (executable)
@@ -15,4 +15,6 @@ else:
 
 
 print o
+
+
 askQuestion.close(conn)