[Hejes-devel] [1441] keltezes.py: AkH11 & 12 refs
hejes-devel at nytud.hu
hejes-devel at nytud.hu
Tue Sep 1 11:39:39 CEST 2015
Revision: 1441
Author: ludanyizs
Date: 2015-09-01 11:39:39 +0200 (Tue, 01 Sep 2015)
Log Message:
-----------
keltezes.py: AkH11 & 12 refs
Modified Paths:
--------------
trunk/web2py/applications/helyesiras_webdev/modules/keltezes.py
Modified: trunk/web2py/applications/helyesiras_webdev/modules/keltezes.py
===================================================================
--- trunk/web2py/applications/helyesiras_webdev/modules/keltezes.py 2015-08-31 16:32:03 UTC (rev 1440)
+++ trunk/web2py/applications/helyesiras_webdev/modules/keltezes.py 2015-09-01 09:39:39 UTC (rev 1441)
@@ -30,52 +30,53 @@
def output1(year, month, day):
out = []
for i in listOfMonths[int(month)-1]:
- out.append([year + ". " + i + " " + day + ".", "293"])
+ out.append([year + ". " + i + " " + day + ".", ["AkH11-293", "AkH12-295"]])
if len(month) == 1: month = '0'+month
if len(day) == 1: day = '0'+day
- out.append([year + ". " + month + ". " + day + ".", "293"])
+ out.append([year + ". " + month + ". " + day + ".", ["AkH11-293", "AkH12-295"]])
if len(year) < 4: year = ((4 - len(year)) * '0') + year
- out.append([year + "-" + month + "-" + day, "293"])
+ out.append([year + "-" + month + "-" + day, ["AkH11-293", "AkH12-295"]])
return out
#~ kimenet 2:
def output2(year, month, day):
out = []
-
#~ 2011. november 23-a/23-án/23-áig/23. óta/23-a óta/23-tól/23-ától:
if int(day) in [2,3,6,8,13,16,18,20,23,26,28,30]:
- out.append([year + ". " + listOfMonths[int(month)-1][0] + " " + day + "-a", "296"])
- out.append([year + ". " + listOfMonths[int(month)-1][0] + " " + day + "-án", "296"])
- out.append([year + ". " + listOfMonths[int(month)-1][0] + " " + day + "-i", "296"])
- out.append([year + ". " + listOfMonths[int(month)-1][0] + " " + day + "-ai", "296"])
- out.append([year + ". " + listOfMonths[int(month)-1][0] + " " + day + "-ig", "296"])
- out.append([year + ". " + listOfMonths[int(month)-1][0] + " " + day + "-áig", "296"])
- out.append([year + ". " + listOfMonths[int(month)-1][0] + " " + day + ". óta", "297"])
- out.append([year + ". " + listOfMonths[int(month)-1][0] + " " + day + "-a óta", "297"])
- out.append([year + ". " + listOfMonths[int(month)-1][0] + " " + day + "-tól", "296"])
- out.append([year + ". " + listOfMonths[int(month)-1][0] + " " + day + "-ától", "296"])
+ out.append([year + ". " + listOfMonths[int(month)-1][0] + " " + day + "-a", ["AkH11-296", "AkH12-298"]])
+ out.append([year + ". " + listOfMonths[int(month)-1][0] + " " + day + "-án", ["AkH11-296", "AkH12-298"]])
+ out.append([year + ". " + listOfMonths[int(month)-1][0] + " " + day + "-i", ["AkH11-296", "AkH12-298"]])
+ out.append([year + ". " + listOfMonths[int(month)-1][0] + " " + day + "-ai", ["AkH11-296", "AkH12-298"]])
+ out.append([year + ". " + listOfMonths[int(month)-1][0] + " " + day + "-ig", ["AkH11-296", "AkH12-298"]])
+ out.append([year + ". " + listOfMonths[int(month)-1][0] + " " + day + "-áig", ["AkH11-296", "AkH12-298"]])
+ out.append([year + ". " + listOfMonths[int(month)-1][0] + " " + day + ". óta", ["AkH11-297", "AkH12-299"]])
+ out.append([year + ". " + listOfMonths[int(month)-1][0] + " " + day + "-a óta", ["AkH11-297", "AkH12-299"]])
+ out.append([year + ". " + listOfMonths[int(month)-1][0] + " " + day + "-tól", ["AkH11-296", "AkH12-298"]])
+ out.append([year + ". " + listOfMonths[int(month)-1][0] + " " + day + "-ától", ["AkH11-296", "AkH12-298"]])
elif int(day) in [4,5,7,9,10,11,12,14,15,17,19,21,22,24,25,27,29,31]:
- out.append([year + ". " + listOfMonths[int(month)-1][0] + " " + day + "-e", "296"])
- out.append([year + ". " + listOfMonths[int(month)-1][0] + " " + day + "-én", "296"])
- out.append([year + ". " + listOfMonths[int(month)-1][0] + " " + day + "-i", "296"])
- out.append([year + ". " + listOfMonths[int(month)-1][0] + " " + day + "-ei", "296"])
- out.append([year + ". " + listOfMonths[int(month)-1][0] + " " + day + "-ig", "296"])
- out.append([year + ". " + listOfMonths[int(month)-1][0] + " " + day + "-éig", "296"])
- out.append([year + ". " + listOfMonths[int(month)-1][0] + " " + day + ". óta", "297"])
- out.append([year + ". " + listOfMonths[int(month)-1][0] + " " + day + "-e óta", "297"])
- out.append([year + ". " + listOfMonths[int(month)-1][0] + " " + day + "-től", "296"])
- out.append([year + ". " + listOfMonths[int(month)-1][0] + " " + day + "-étől", "296"])
+ out.append([year + ". " + listOfMonths[int(month)-1][0] + " " + day + "-e", ["AkH11-296", "AkH12-298"]])
+ out.append([year + ". " + listOfMonths[int(month)-1][0] + " " + day + "-én", ["AkH11-296", "AkH12-298"]])
+ out.append([year + ". " + listOfMonths[int(month)-1][0] + " " + day + "-i", ["AkH11-296", "AkH12-298"]])
+ out.append([year + ". " + listOfMonths[int(month)-1][0] + " " + day + "-ei", ["AkH11-296", "AkH12-298"]])
+ out.append([year + ". " + listOfMonths[int(month)-1][0] + " " + day + "-ig", ["AkH11-296", "AkH12-298"]])
+ out.append([year + ". " + listOfMonths[int(month)-1][0] + " " + day + "-éig", ["AkH11-296", "AkH12-298"]])
+ out.append([year + ". " + listOfMonths[int(month)-1][0] + " " + day + ". óta", ["AkH11-297", "AkH12-299"]])
+ out.append([year + ". " + listOfMonths[int(month)-1][0] + " " + day + "-e óta", ["AkH11-297", "AkH12-299"]])
+ out.append([year + ". " + listOfMonths[int(month)-1][0] + " " + day + "-től", ["AkH11-296", "AkH12-298"]])
+ out.append([year + ". " + listOfMonths[int(month)-1][0] + " " + day + "-étől", ["AkH11-296", "AkH12-298"]])
else: # elseje
- out.append([year + ". " + listOfMonths[int(month)-1][0] + " " + day + "-je", "296"])
- out.append([year + ". " + listOfMonths[int(month)-1][0] + " " + day + "-jén", "296"])
- out.append([year + ". " + listOfMonths[int(month)-1][0] + " " + day + "-ji", "296"])
- out.append([year + ". " + listOfMonths[int(month)-1][0] + " " + day + "-jei", "296"])
- #~ out.append([year + ". " + listOfMonths[int(month)-1][0] + " " + day + "-ig", "296"])
- out.append([year + ". " + listOfMonths[int(month)-1][0] + " " + day + "-jéig", "296"])
- out.append([year + ". " + listOfMonths[int(month)-1][0] + " " + day + ". óta", "297"])
- out.append([year + ". " + listOfMonths[int(month)-1][0] + " " + day + "-je óta", "297"])
- #~ out.append([year + ". " + listOfMonths[int(month)-1][0] + " " + day + "-től", "296"])
- out.append([year + ". " + listOfMonths[int(month)-1][0] + " " + day + "-jétől", "296"])
+ out.append([year + ". " + listOfMonths[int(month)-1][0] + " " + day + "-je", ["AkH11-296", "AkH12-298"]])
+ out.append([year + ". " + listOfMonths[int(month)-1][0] + " " + day + "-jén", ["AkH11-296", "AkH12-298"]])
+ out.append([year + ". " + listOfMonths[int(month)-1][0] + " " + day + "-én", ["AkH12-298"]])
+ out.append([year + ". " + listOfMonths[int(month)-1][0] + " " + day + "-ji", ["AkH11-296", "AkH12-298"]])
+ out.append([year + ". " + listOfMonths[int(month)-1][0] + " " + day + "-jei", ["AkH11-296", "AkH12-298"]])
+ out.append([year + ". " + listOfMonths[int(month)-1][0] + " " + day + "-i", ["AkH12-298"]])
+ out.append([year + ". " + listOfMonths[int(month)-1][0] + " " + day + "-jéig", ["AkH11-296", "AkH12-298"]])
+ out.append([year + ". " + listOfMonths[int(month)-1][0] + " " + day + "-ig", ["AkH12-298"]])
+ out.append([year + ". " + listOfMonths[int(month)-1][0] + " " + day + ". óta", ["AkH11-297", "AkH12-299"]])
+ out.append([year + ". " + listOfMonths[int(month)-1][0] + " " + day + "-je óta", ["AkH11-297", "AkH12-299"]])
+ #~ out.append([year + ". " + listOfMonths[int(month)-1][0] + " " + day + "-től", ["AkH11-296", "AkH12-298"]])
+ out.append([year + ". " + listOfMonths[int(month)-1][0] + " " + day + "-jétől", ["AkH11-296", "AkH12-298"]])
#~ 2012. november 11–12.
if (
@@ -83,57 +84,59 @@
(int(day) == 30 and int(month) in [4,6,9,11]) or
(int(day) == 29 and int(month) == 2)
):
- out.append([year + ". " + listOfMonths[int(month)-1][0] + " " + str(int(day) -1) + "–" + day + ".", '263'])
+ out.append([year + ". " + listOfMonths[int(month)-1][0] + " " + str(int(day) -1) + "–" + day + ".", ['AkH11-263', 'AkH12-264']])
else:
- out.append([year + ". " + listOfMonths[int(month)-1][0] + " " + day + "–" + str(int(day)+1) + ".", '263'])
+ out.append([year + ". " + listOfMonths[int(month)-1][0] + " " + day + "–" + str(int(day)+1) + ".", ['AkH11-263', 'AkH12-264']])
#~ 2011. novemberi:
- out.append([year + ". " + listOfMonths[int(month)-1][0] + "i", "294"])
+ out.append([year + ". " + listOfMonths[int(month)-1][0] + "i", ["AkH11-294", "AkH12-296"]])
#~ 2011. novemberben/novemberébeni/novemberének végén:
if int(month) in [3,4,5,6,7,8]:
- out.append([year + ". " + listOfMonths[int(month)-1][0] + "ban", "294"])
- out.append([year + " " + listOfMonths[int(month)-1][0] + "ában", "295"])
+ out.append([year + ". " + listOfMonths[int(month)-1][0] + "ban", ["AkH11-294", "AkH12-296"]])
+ out.append([year + " " + listOfMonths[int(month)-1][0] + "ában", ["AkH11-295", "AkH12-297"]])
if int(day) < 10:
- out.append([year + ". " + listOfMonths[int(month)-1][0] + " eleje", "294"])
- out.append([year + " " + listOfMonths[int(month)-1][0] + "ának eleje", "295"])
+ out.append([year + ". " + listOfMonths[int(month)-1][0] + " eleje", ["AkH11-294", "AkH12-296"]])
+ out.append([year + " " + listOfMonths[int(month)-1][0] + "ának eleje", ["AkH11-295", "AkH12-297"]])
elif int(day) > 20:
- out.append([year + ". " + listOfMonths[int(month)-1][0] + " vége", "294"])
- out.append([year + " " + listOfMonths[int(month)-1][0] + "ának vége", "295"])
+ out.append([year + ". " + listOfMonths[int(month)-1][0] + " vége", ["AkH11-294", "AkH12-296"]])
+ out.append([year + " " + listOfMonths[int(month)-1][0] + "ának vége", ["AkH11-295", "AkH12-297"]])
else:
- out.append([year + ". " + listOfMonths[int(month)-1][0] + " közepe", "294"])
- out.append([year + " " + listOfMonths[int(month)-1][0] + "ának közepe", "295"])
+ out.append([year + ". " + listOfMonths[int(month)-1][0] + " közepe", ["AkH11-294", "AkH12-296"]])
+ out.append([year + " " + listOfMonths[int(month)-1][0] + "ának közepe", ["AkH11-295", "AkH12-297"]])
+
elif int(month) in [9,10,11,12]:
- out.append([year + ". " + listOfMonths[int(month)-1][0] + "ben", "294"])
- out.append([year + " " + listOfMonths[int(month)-1][0] + "ében", "295"])
+ out.append([year + ". " + listOfMonths[int(month)-1][0] + "ben", ["AkH11-294", "AkH12-296"]])
+ out.append([year + " " + listOfMonths[int(month)-1][0] + "ében", ["AkH11-295", "AkH12-297"]])
+
if int(day) < 10:
- out.append([year + ". " + listOfMonths[int(month)-1][0] + " eleje", "294"])
- out.append([year + " " + listOfMonths[int(month)-1][0] + "ének eleje", "295"])
+ out.append([year + ". " + listOfMonths[int(month)-1][0] + " eleje", ["AkH11-294", "AkH12-296"]])
+ out.append([year + " " + listOfMonths[int(month)-1][0] + "ének eleje", ["AkH11-295", "AkH12-297"]])
elif int(day) > 20:
- out.append([year + ". " + listOfMonths[int(month)-1][0] + " vége", "294"])
- out.append([year + " " + listOfMonths[int(month)-1][0] + "ének vége", "295"])
+ out.append([year + ". " + listOfMonths[int(month)-1][0] + " vége", ["AkH11-294", "AkH12-296"]])
+ out.append([year + " " + listOfMonths[int(month)-1][0] + "ének vége", ["AkH11-295", "AkH12-297"]])
else:
- out.append([year + ". " + listOfMonths[int(month)-1][0] + " közepe", "294"])
- out.append([year + " " + listOfMonths[int(month)-1][0] + "ének közepe", "295"])
+ out.append([year + ". " + listOfMonths[int(month)-1][0] + " közepe", ["AkH11-294", "AkH12-296"]])
+ out.append([year + " " + listOfMonths[int(month)-1][0] + "ének közepe", ["AkH11-295", "AkH12-297"]])
else:
- out.append([year + ". " + listOfMonths[int(month)-1][0] + "ban", "294"])
- out.append([year + " " + listOfMonths[int(month)-1][0] + "jában", "295"])
+ out.append([year + ". " + listOfMonths[int(month)-1][0] + "ban", ["AkH11-294", "AkH12-296"]])
+ out.append([year + " " + listOfMonths[int(month)-1][0] + "jában", ["AkH11-295", "AkH12-297"]])
if int(day) < 10:
- out.append([year + ". " + listOfMonths[int(month)-1][0] + " eleje", "294"])
- out.append([year + " " + listOfMonths[int(month)-1][0] + "jának eleje", "295"])
+ out.append([year + ". " + listOfMonths[int(month)-1][0] + " eleje", ["AkH11-294", "AkH12-296"]])
+ out.append([year + " " + listOfMonths[int(month)-1][0] + "jának eleje", ["AkH11-295", "AkH12-297"]])
elif int(day) > 20:
- out.append([year + ". " + listOfMonths[int(month)-1][0] + " vége", "294"])
- out.append([year + " " + listOfMonths[int(month)-1][0] + "jának vége", "295"])
+ out.append([year + ". " + listOfMonths[int(month)-1][0] + " vége", ["AkH11-294", "AkH12-296"]])
+ out.append([year + " " + listOfMonths[int(month)-1][0] + "jának vége", ["AkH11-295", "AkH12-297"]])
else:
- out.append([year + ". " + listOfMonths[int(month)-1][0] + " közepe", "294"])
- out.append([year + " " + listOfMonths[int(month)-1][0] + "jának közepe", "295"])
+ out.append([year + ". " + listOfMonths[int(month)-1][0] + " közepe", ["AkH11-294", "AkH12-296"]])
+ out.append([year + " " + listOfMonths[int(month)-1][0] + "jának közepe", ["AkH11-295", "AkH12-297"]])
#~ 1584. évi, 1584 folyamán, óta, 1584-ben
- out.append([year + '. évi', '294'])
- out.append([year + ' óta', '295'])
- out.append([year + ' folyamán', '295'])
- if YEAR_bAn.match(year): out.append([year + '-ban', '296'])
- else: out.append([year + '-ben', '296'])
+ out.append([year + '. évi', ['AkH11-294', 'AkH12-296']])
+ out.append([year + ' óta', ['AkH11-295', 'AkH12-297']])
+ out.append([year + ' folyamán', ['AkH11-295', 'AkH12-297']])
+ if YEAR_bAn.match(year): out.append([year + '-ban', ['AkH11-296', 'AkH12-298']])
+ else: out.append([year + '-ben', ['AkH11-296', 'AkH12-298']])
return out
@@ -169,8 +172,8 @@
else:
print "\nkimenet1:"
for i in o[0]:
- print i[0] + ", " + i[1]
+ print i[0] + ", " + ', '.join(i[1])
print "\nkimenet2:"
for i in o[1]:
- print i[0] + ", " + i[1]
+ print i[0] + ", " + ', '.join(i[1])
print('')
More information about the Hejes-devel
mailing list