mistakes on context
svn: r11715
This commit is contained in:
parent
d2b481b1a3
commit
d1918cc259
@ -28,7 +28,7 @@
|
|||||||
# Python modules
|
# Python modules
|
||||||
#
|
#
|
||||||
#------------------------------------------------------------------------
|
#------------------------------------------------------------------------
|
||||||
from TransUtils import sgettext
|
from TransUtils import sgettext as _
|
||||||
from gettext import ngettext as _s
|
from gettext import ngettext as _s
|
||||||
|
|
||||||
#------------------------------------------------------------------------
|
#------------------------------------------------------------------------
|
||||||
@ -306,7 +306,7 @@ class Span:
|
|||||||
#v = self.date1.sortval - self.date2.sortval
|
#v = self.date1.sortval - self.date2.sortval
|
||||||
#self.sort = (v, -Span.ABOUT)
|
#self.sort = (v, -Span.ABOUT)
|
||||||
#self.minmax = (v - Span.ABOUT, v + Span.ABOUT)
|
#self.minmax = (v - Span.ABOUT, v + Span.ABOUT)
|
||||||
self.repr = _("about|age") + " " + self._format(self._diff(self.date1, self.date2))
|
self.repr = _("age|about") + " " + self._format(self._diff(self.date1, self.date2))
|
||||||
elif (self.date2.get_modifier() == Date.MOD_RANGE or
|
elif (self.date2.get_modifier() == Date.MOD_RANGE or
|
||||||
self.date2.get_modifier() == Date.MOD_SPAN):
|
self.date2.get_modifier() == Date.MOD_SPAN):
|
||||||
start, stop = self.date2.get_start_stop_range()
|
start, stop = self.date2.get_start_stop_range()
|
||||||
@ -338,7 +338,7 @@ class Span:
|
|||||||
#v = self.date1.sortval - self.date2.sortval
|
#v = self.date1.sortval - self.date2.sortval
|
||||||
#self.sort = (v, -Span.ABOUT)
|
#self.sort = (v, -Span.ABOUT)
|
||||||
#self.minmax = (v - Span.ABOUT, v + Span.ABOUT)
|
#self.minmax = (v - Span.ABOUT, v + Span.ABOUT)
|
||||||
self.repr = _("about|age") + " " + self._format(self._diff(self.date1, self.date2))
|
self.repr = _("age|about") + " " + self._format(self._diff(self.date1, self.date2))
|
||||||
elif (self.date2.get_modifier() == Date.MOD_RANGE or
|
elif (self.date2.get_modifier() == Date.MOD_RANGE or
|
||||||
self.date2.get_modifier() == Date.MOD_SPAN):
|
self.date2.get_modifier() == Date.MOD_SPAN):
|
||||||
#v = self.date1.sortval - self.date2.sortval
|
#v = self.date1.sortval - self.date2.sortval
|
||||||
@ -377,7 +377,7 @@ class Span:
|
|||||||
#v = self.date1.sortval - self.date2.sortval
|
#v = self.date1.sortval - self.date2.sortval
|
||||||
#self.sort = (v, -Span.ABOUT)
|
#self.sort = (v, -Span.ABOUT)
|
||||||
#self.minmax = (v - Span.ABOUT, v + Span.ABOUT)
|
#self.minmax = (v - Span.ABOUT, v + Span.ABOUT)
|
||||||
self.repr = _("about|age") + " " + self._format(self._diff(self.date1, self.date2))
|
self.repr = _("age|about") + " " + self._format(self._diff(self.date1, self.date2))
|
||||||
elif self.date2.get_modifier() == Date.MOD_BEFORE:
|
elif self.date2.get_modifier() == Date.MOD_BEFORE:
|
||||||
#v = self.date1.sortval - self.date2.sortval
|
#v = self.date1.sortval - self.date2.sortval
|
||||||
#self.sort = (v, -Span.BEFORE)
|
#self.sort = (v, -Span.BEFORE)
|
||||||
@ -392,13 +392,13 @@ class Span:
|
|||||||
#v = self.date1.sortval - self.date2.sortval
|
#v = self.date1.sortval - self.date2.sortval
|
||||||
#self.sort = (v, -Span.ABOUT)
|
#self.sort = (v, -Span.ABOUT)
|
||||||
#self.minmax = (v - Span.ABOUT, v + Span.ABOUT)
|
#self.minmax = (v - Span.ABOUT, v + Span.ABOUT)
|
||||||
self.repr = _("about|age") + " " + self._format(self._diff(self.date1, self.date2))
|
self.repr = _("age|about") + " " + self._format(self._diff(self.date1, self.date2))
|
||||||
elif (self.date2.get_modifier() == Date.MOD_RANGE or
|
elif (self.date2.get_modifier() == Date.MOD_RANGE or
|
||||||
self.date2.get_modifier() == Date.MOD_SPAN):
|
self.date2.get_modifier() == Date.MOD_SPAN):
|
||||||
#v = self.date1.sortval - self.date2.sortval
|
#v = self.date1.sortval - self.date2.sortval
|
||||||
#self.sort = (v, -Span.ABOUT)
|
#self.sort = (v, -Span.ABOUT)
|
||||||
#self.minmax = (v - Span.ABOUT, v + Span.ABOUT)
|
#self.minmax = (v - Span.ABOUT, v + Span.ABOUT)
|
||||||
self.repr = _("about|age") + " " + self._format(self._diff(self.date1, self.date2))
|
self.repr = _("age|about") + " " + self._format(self._diff(self.date1, self.date2))
|
||||||
elif (self.date1.get_modifier() == Date.MOD_RANGE or
|
elif (self.date1.get_modifier() == Date.MOD_RANGE or
|
||||||
self.date1.get_modifier() == Date.MOD_SPAN): # SPAN----------------------------
|
self.date1.get_modifier() == Date.MOD_SPAN): # SPAN----------------------------
|
||||||
if self.date2.get_modifier() == Date.MOD_NONE:
|
if self.date2.get_modifier() == Date.MOD_NONE:
|
||||||
@ -425,7 +425,7 @@ class Span:
|
|||||||
#v = self.date1.sortval - self.date2.sortval
|
#v = self.date1.sortval - self.date2.sortval
|
||||||
#self.sort = (v, -Span.ABOUT)
|
#self.sort = (v, -Span.ABOUT)
|
||||||
#self.minmax = (v - Span.ABOUT, v + Span.ABOUT)
|
#self.minmax = (v - Span.ABOUT, v + Span.ABOUT)
|
||||||
self.repr = _("about|age") + " " + self._format(self._diff(self.date1, self.date2))
|
self.repr = _("age|about") + " " + self._format(self._diff(self.date1, self.date2))
|
||||||
elif (self.date2.get_modifier() == Date.MOD_RANGE or
|
elif (self.date2.get_modifier() == Date.MOD_RANGE or
|
||||||
self.date2.get_modifier() == Date.MOD_SPAN):
|
self.date2.get_modifier() == Date.MOD_SPAN):
|
||||||
start1, stop1 = self.date1.get_start_stop_range()
|
start1, stop1 = self.date1.get_start_stop_range()
|
||||||
|
Loading…
Reference in New Issue
Block a user