[Hejes-devel] [976] bugfix: blog: showed time as 10:0

[hejes-devel at nytud.hu]

Revision: 976
Author:   root
Date:     2013-10-08 17:10:31 +0200 (Tue, 08 Oct 2013)
Log Message:
-----------
bugfix: blog: showed time as 10:0

Modified Paths:
--------------
    trunk/web2py/applications/helyesiras_webdev/databases/storage.sqlite
    trunk/web2py/applications/helyesiras_webdev/modules/util.py
    trunk/web2py/applications/helyesiras_webdev/progress.log

Modified: trunk/web2py/applications/helyesiras_webdev/databases/storage.sqlite
===================================================================
(Binary files differ)

Modified: trunk/web2py/applications/helyesiras_webdev/modules/util.py
===================================================================
--- trunk/web2py/applications/helyesiras_webdev/modules/util.py	2013-10-08 15:00:10 UTC (rev 975)
+++ trunk/web2py/applications/helyesiras_webdev/modules/util.py	2013-10-08 15:10:31 UTC (rev 976)
@@ -52,7 +52,7 @@
      e.g. datetime.datetime(2013, 7, 30, 16, 42, 29) => u"2013. július 30. 16:42"
   """
   hn = [u'január', u'február', u'március', u'április', u'május', u'június', u'július', u'augusztus', u'szeptember', u'október', u'november', u'december']
-  return u'{0}. {1} {2}. {3}:{4}'.format(d.year, hn[d.month-1], d.day, d.hour, d.minute)
+  return u'{0}. {1} {2}. {3}:{4}'.format(d.year, hn[d.month-1], d.day, d.hour if d.hour != 0 else '00', d.minute if d.minute != 0 else '00')
   
 
 def list_image_files(path):
@@ -61,5 +61,3 @@
   from os import listdir
   from re import match
   return sorted([x for x in listdir(path) if isfile(path+'/'+x) and match('.*\.[jpg|jpeg|png|gif|bmp|tif]', x)])
-
-

Modified: trunk/web2py/applications/helyesiras_webdev/progress.log
===================================================================
--- trunk/web2py/applications/helyesiras_webdev/progress.log	2013-10-08 15:00:10 UTC (rev 975)
+++ trunk/web2py/applications/helyesiras_webdev/progress.log	2013-10-08 15:10:31 UTC (rev 976)
@@ -941,3 +941,4 @@
 [2013-10-08 16:46:41] EDIT helyesiras_webdev/views/blog/index.html: 0
 [2013-10-08 16:46:47] EDIT helyesiras_webdev/views/blog/show.html: 0
 [2013-10-08 16:51:06] EDIT helyesiras_webdev/static/css/main.css: 0
+[2013-10-08 17:06:59] EDIT helyesiras_webdev/modules/util.py: 0