Mercurial > p > roundup > code

comparison roundup/date.py @ 2416:74b63b1beff1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
fixes
author Richard Jones <richard@users.sourceforge.net>
date Wed, 09 Jun 2004 06:13:52 +0000
parents 3953092900dd
children 92510df07670
comparison
equal deleted inserted replaced
2415:9c1868d05047 2416:74b63b1beff1
13 # BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS 13 # BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS
14 # FOR A PARTICULAR PURPOSE. THE CODE PROVIDED HEREUNDER IS ON AN "AS IS" 14 # FOR A PARTICULAR PURPOSE. THE CODE PROVIDED HEREUNDER IS ON AN "AS IS"
15 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE, 15 # BASIS, AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
16 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. 16 # SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
17 # 17 #
18 # $Id: date.py,v 1.72 2004-06-08 05:37:36 richard Exp $ 18 # $Id: date.py,v 1.73 2004-06-09 06:13:52 richard Exp $
19 19
20 """Date, time and time interval handling. 20 """Date, time and time interval handling.
21 """ 21 """
22 __docformat__ = 'restructuredtext' 22 __docformat__ = 'restructuredtext'
23 23
660 _quarters = self.minute / 15 660 _quarters = self.minute / 15
661 if self.year: 661 if self.year:
662 s = self.ngettext("%(number)s year", "%(number)s years", 662 s = self.ngettext("%(number)s year", "%(number)s years",
663 self.year) % {'number': self.year} 663 self.year) % {'number': self.year}
664 elif self.month or self.day > 28: 664 elif self.month or self.day > 28:
665 _months = int(((self.month * 30) + self.day) / 30) 665 _months = max(1, int(((self.month * 30) + self.day) / 30))
666 s = self.ngettext("%(number)s month", "%(number)s months", 666 s = self.ngettext("%(number)s month", "%(number)s months",
667 _months) % {'number': _months} 667 _months) % {'number': _months}
668 elif self.day > 7: 668 elif self.day > 7:
669 _weeks = int(self.day / 7) 669 _weeks = int(self.day / 7)
670 s = self.ngettext("%(number)s week", "%(number)s weeks", 670 s = self.ngettext("%(number)s week", "%(number)s weeks",
687 s = self._('an hour') 687 s = self._('an hour')
688 elif _quarters == 2: 688 elif _quarters == 2:
689 s = self._('1 1/2 hours') 689 s = self._('1 1/2 hours')
690 else: 690 else:
691 s = self.ngettext('1 %(number)s/4 hours', 691 s = self.ngettext('1 %(number)s/4 hours',
692 '1 %(number)s/4 hours', _quarters) % {'number': _quarters} 692 '1 %(number)s/4 hours', _quarters)%{'number': _quarters}
693 elif self.minute < 1: 693 elif self.minute < 1:
694 if self.sign > 0: 694 if self.sign > 0:
695 return self._('in a moment') 695 return self._('in a moment')
696 else: 696 else:
697 return self._('just now') 697 return self._('just now')
703 s = self.ngettext('%(number)s minute', '%(number)s minutes', 703 s = self.ngettext('%(number)s minute', '%(number)s minutes',
704 self.minute) % {'number': self.minute} 704 self.minute) % {'number': self.minute}
705 elif _quarters == 2: 705 elif _quarters == 2:
706 s = self._('1/2 an hour') 706 s = self._('1/2 an hour')
707 else: 707 else:
708 s = self.ngettext('%(number)s/4 hours', '%(number)s/4 hours', 708 s = self.ngettext('%(number)s/4 hour', '%(number)s/4 hours',
709 _quarters) % {'number': _quarters} 709 _quarters) % {'number': _quarters}
710 # XXX this is internationally broken 710 # XXX this is internationally broken
711 if self.sign < 0: 711 if self.sign < 0:
712 s = self._('%s ago') % s 712 s = self._('%s ago') % s
713 else: 713 else:
Roundup Issue Tracker: http://roundup-tracker.org/