From 2846e90570d565f4121700c87238ed11a84d06b2 Mon Sep 17 00:00:00 2001
From: Inso <insomniak.fr@gmail.com>
Date: Wed, 13 Jan 2016 21:28:18 +0100
Subject: [PATCH] Fix display, remove hour
---
src/sakia/core/money/relative_to_past.py | 8 +++----
.../unit/core/money/test_relative_to_past.py | 24 +++++++++----------
2 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/src/sakia/core/money/relative_to_past.py b/src/sakia/core/money/relative_to_past.py
index 471d77da..8fdae53c 100644
--- a/src/sakia/core/money/relative_to_past.py
+++ b/src/sakia/core/money/relative_to_past.py
@@ -61,8 +61,8 @@ class RelativeToPast(BaseReferential):
prefix,
QLocale.toString(
QLocale(),
- QDateTime.fromTime_t(block['medianTime']),
- QLocale.dateTimeFormat(QLocale(), QLocale.ShortFormat)
+ QDateTime.fromTime_t(block['medianTime']).date(),
+ QLocale.dateFormat(QLocale(), QLocale.ShortFormat)
),
self.community.short_currency if units else "")
else:
@@ -83,8 +83,8 @@ class RelativeToPast(BaseReferential):
prefix,
QLocale.toString(
QLocale(),
- QDateTime.fromTime_t(block['medianTime']),
- QLocale.dateTimeFormat(QLocale(), QLocale.ShortFormat)
+ QDateTime.fromTime_t(block['medianTime']).date(),
+ QLocale.dateFormat(QLocale(), QLocale.ShortFormat)
),
self.community.short_currency if units else "")
else:
diff --git a/src/sakia/tests/unit/core/money/test_relative_to_past.py b/src/sakia/tests/unit/core/money/test_relative_to_past.py
index 305cc58a..1ad2cb74 100644
--- a/src/sakia/tests/unit/core/money/test_relative_to_past.py
+++ b/src/sakia/tests/unit/core/money/test_relative_to_past.py
@@ -61,8 +61,8 @@ class TestRelativeToPast(unittest.TestCase, QuamashTest):
value = await referential.localized(units=True)
self.assertEqual(value, "0.101000 UD({0}) TC".format(QLocale.toString(
QLocale(),
- QDateTime.fromTime_t(1452663088792),
- QLocale.dateTimeFormat(QLocale(), QLocale.ShortFormat)
+ QDateTime.fromTime_t(1452663088792).date(),
+ QLocale.dateFormat(QLocale(), QLocale.ShortFormat)
)))
self.lp.run_until_complete(exec_test())
@@ -80,8 +80,8 @@ class TestRelativeToPast(unittest.TestCase, QuamashTest):
value = await referential.localized(units=True, international_system=True)
self.assertEqual(value, "1.011000 dUD({0}) TC".format(QLocale.toString(
QLocale(),
- QDateTime.fromTime_t(1452663088792),
- QLocale.dateTimeFormat(QLocale(), QLocale.ShortFormat)
+ QDateTime.fromTime_t(1452663088792).date(),
+ QLocale.dateFormat(QLocale(), QLocale.ShortFormat)
)))
self.lp.run_until_complete(exec_test())
@@ -114,8 +114,8 @@ class TestRelativeToPast(unittest.TestCase, QuamashTest):
value = await referential.localized(units=False, international_system=True)
self.assertEqual(value, "1.011000 dUD({0}) ".format(QLocale.toString(
QLocale(),
- QDateTime.fromTime_t(1452663088792),
- QLocale.dateTimeFormat(QLocale(), QLocale.ShortFormat)
+ QDateTime.fromTime_t(1452663088792).date(),
+ QLocale.dateFormat(QLocale(), QLocale.ShortFormat)
)))
self.lp.run_until_complete(exec_test())
@@ -133,8 +133,8 @@ class TestRelativeToPast(unittest.TestCase, QuamashTest):
value = await referential.diff_localized(units=True)
self.assertEqual(value, "0.101100 UD({0}) TC".format(QLocale.toString(
QLocale(),
- QDateTime.fromTime_t(1452663088792),
- QLocale.dateTimeFormat(QLocale(), QLocale.ShortFormat)
+ QDateTime.fromTime_t(1452663088792).date(),
+ QLocale.dateFormat(QLocale(), QLocale.ShortFormat)
)))
self.lp.run_until_complete(exec_test())
@@ -152,8 +152,8 @@ class TestRelativeToPast(unittest.TestCase, QuamashTest):
value = await referential.diff_localized(units=True, international_system=True)
self.assertEqual(value, "1.011000 dUD({0}) TC".format(QLocale.toString(
QLocale(),
- QDateTime.fromTime_t(1452663088792),
- QLocale.dateTimeFormat(QLocale(), QLocale.ShortFormat)
+ QDateTime.fromTime_t(1452663088792).date(),
+ QLocale.dateFormat(QLocale(), QLocale.ShortFormat)
)))
self.lp.run_until_complete(exec_test())
@@ -186,7 +186,7 @@ class TestRelativeToPast(unittest.TestCase, QuamashTest):
value = await referential.diff_localized(units=False, international_system=True)
self.assertEqual(value, "1.011000 dUD({0}) ".format(QLocale.toString(
QLocale(),
- QDateTime.fromTime_t(1452663088792),
- QLocale.dateTimeFormat(QLocale(), QLocale.ShortFormat)
+ QDateTime.fromTime_t(1452663088792).date(),
+ QLocale.dateFormat(QLocale(), QLocale.ShortFormat)
)))
self.lp.run_until_complete(exec_test())
--
GitLab