Compare commits

...

11 Commits

Author SHA1 Message Date
Timo Furrer cc698817b4 release: 0.5.0 2018-05-26 15:19:57 +02:00
Timo Furrer 9964e9305e Merge pull request #154 from alxwrd/support-locales
Allow slang methods to change locale
2018-05-26 15:16:17 +02:00
Alex Ward d87236a30d update authors 2018-05-26 11:19:57 +01:00
Alex Ward d44a1dd2f6 add tracer tests for slang_ locales 2018-05-26 11:19:36 +01:00
Timo Furrer ed5d72b34c Merge pull request #155 from DavidMuller/patch-1
Add Example of Creating a MayaDT Using a Unix Time
2018-05-22 21:38:21 +02:00
David Muller 9c1e94f956 Add example that instantiates MayaDT w/ unix time 2018-05-22 10:45:01 -07:00
Alex Ward 6755968f69 remove unused calendar import 2018-05-22 09:57:32 +01:00
Alex Ward 3760af2c41 use pendulum and dateparser for slang_date 2018-05-21 22:37:31 +01:00
Alex Ward df09625e74 fix failing test 2018-05-15 22:56:28 +01:00
Alex Ward 2d848bd62a typo fix 2018-05-15 22:55:07 +01:00
Alex Ward a99cddf76f allow changing the locale for slang_time 2018-05-15 22:27:16 +01:00
5 changed files with 60 additions and 10 deletions
+1
View File
@@ -24,3 +24,4 @@ In chronological order:
- Evan Mattiza <emattiza@gmail.com> (`@emattiza <https://github.com/emattiza>`_)
- Dima Spivak <dima@spivak.ch> (`@dimaspivak <https://github.com/dimaspivak>`_)
- Tom Barron <tusculum@gmail.com> (`@dtbarron <https://github.com/tbarron>`_)
- Alex Ward <alxwrd@gmail.com> (`@alxwrd <https://github.com/alxwrd>`_)
+4
View File
@@ -77,6 +77,10 @@ Behold, datetimes for humans!
>>> m = maya.MayaDT.from_struct(time.gmtime())
>>> print(m)
Wed, 20 Sep 2017 17:24:32 GMT
>>> m = maya.MayaDT(time.time())
>>> print(m)
Wed, 20 Sep 2017 17:24:32 GMT
>>> rand_day.day
7
+1 -1
View File
@@ -1 +1 @@
__version__ = '0.4.3'
__version__ = '0.5.0'
+43 -8
View File
@@ -14,6 +14,7 @@ import pendulum
import snaptime
from tzlocal import get_localzone
from dateutil.relativedelta import relativedelta
from dateparser.languages.loader import default_loader
from .compat import cmp, comparable
@@ -331,15 +332,39 @@ class MayaDT(object):
# Human Slang Extras
# ------------------
def slang_date(self):
""""Returns human slang representation of date."""
dt = self.datetime(naive=True, to_timezone=self.local_timezone)
return humanize.naturaldate(dt)
def slang_date(self, locale="en"):
""""Returns human slang representation of date.
def slang_time(self):
""""Returns human slang representation of time."""
dt = self.datetime(naive=True, to_timezone=self.local_timezone)
return humanize.naturaltime(dt)
Keyword Arguments:
locale -- locale to translate to, e.g. 'fr' for french.
(default: 'en' - English)
"""
dt = pendulum.instance(self.datetime())
try:
return _translate(dt, locale)
except KeyError:
pass
dt.set_formatter("alternative")
delta = humanize.time.abs_timedelta(
timedelta(seconds=(self.epoch - now().epoch)))
format_string = "DD MMM"
if delta.days >= 365:
format_string += " YYYY"
return dt.format(format_string, locale=locale).title()
def slang_time(self, locale="en"):
""""Returns human slang representation of time.
Keyword Arguments:
locale -- locale to translate to, e.g. 'fr' for french.
(default: 'en' - English)
"""
dt = self.datetime()
return pendulum.instance(dt).diff_for_humans(locale=locale)
def utc_offset(time_struct=None):
@@ -759,6 +784,16 @@ def _seconds_or_timedelta(duration):
return dt_timedelta
def _translate(dt, target_locale):
en = default_loader.get_locale("en")
target = default_loader.get_locale(target_locale)
naturaldate = humanize.naturaldate(dt)
base = en.translate(naturaldate, settings=dateparser.conf.settings)
return target.info["relative-type"][base][-1]
def intervals(start, end, interval):
"""
Yields MayaDT objects between the start and end MayaDTs given,
+11 -1
View File
@@ -158,9 +158,19 @@ def test_slang_date():
assert d.slang_date() == 'tomorrow'
def test_slang_date_locale():
d = maya.when('tomorrow')
assert d.slang_date(locale='fr') == 'demain'
def test_slang_time():
d = maya.when('1 hour ago')
assert d.slang_time() == 'an hour ago'
assert d.slang_time() == '1 hour ago'
def test_slang_time_locale():
d = maya.when('1 hour ago')
assert d.slang_time(locale='de') == 'vor 1 Stunde'
@pytest.mark.parametrize("string,kwds,expected", [