Skip to content
Snippets Groups Projects
Commit 2846e905 authored by inso's avatar inso
Browse files

Fix display, remove hour

parent 1b7e2ffb
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
src/sakia/core/money/relative_to_past.py
+ 4
− 4
View file @ 2846e905
...@@ -61,8 +61,8 @@ class RelativeToPast(BaseReferential): ...@@ -61,8 +61,8 @@ class RelativeToPast(BaseReferential):
prefix, prefix,
QLocale.toString( QLocale.toString(
QLocale(), QLocale(),
QDateTime.fromTime_t(block['medianTime']), QDateTime.fromTime_t(block['medianTime']).date(),
QLocale.dateTimeFormat(QLocale(), QLocale.ShortFormat) QLocale.dateFormat(QLocale(), QLocale.ShortFormat)
), ),
self.community.short_currency if units else "") self.community.short_currency if units else "")
else: else:
...@@ -83,8 +83,8 @@ class RelativeToPast(BaseReferential): ...@@ -83,8 +83,8 @@ class RelativeToPast(BaseReferential):
prefix, prefix,
QLocale.toString( QLocale.toString(
QLocale(), QLocale(),
QDateTime.fromTime_t(block['medianTime']), QDateTime.fromTime_t(block['medianTime']).date(),
QLocale.dateTimeFormat(QLocale(), QLocale.ShortFormat) QLocale.dateFormat(QLocale(), QLocale.ShortFormat)
), ),
self.community.short_currency if units else "") self.community.short_currency if units else "")
else: else:
......
src/sakia/tests/unit/core/money/test_relative_to_past.py
+ 12
− 12
View file @ 2846e905
...@@ -61,8 +61,8 @@ class TestRelativeToPast(unittest.TestCase, QuamashTest): ...@@ -61,8 +61,8 @@ class TestRelativeToPast(unittest.TestCase, QuamashTest):
value = await referential.localized(units=True) value = await referential.localized(units=True)
self.assertEqual(value, "0.101000 UD({0}) TC".format(QLocale.toString( self.assertEqual(value, "0.101000 UD({0}) TC".format(QLocale.toString(
QLocale(), QLocale(),
QDateTime.fromTime_t(1452663088792), QDateTime.fromTime_t(1452663088792).date(),
QLocale.dateTimeFormat(QLocale(), QLocale.ShortFormat) QLocale.dateFormat(QLocale(), QLocale.ShortFormat)
))) )))
self.lp.run_until_complete(exec_test()) self.lp.run_until_complete(exec_test())
...@@ -80,8 +80,8 @@ class TestRelativeToPast(unittest.TestCase, QuamashTest): ...@@ -80,8 +80,8 @@ class TestRelativeToPast(unittest.TestCase, QuamashTest):
value = await referential.localized(units=True, international_system=True) value = await referential.localized(units=True, international_system=True)
self.assertEqual(value, "1.011000 dUD({0}) TC".format(QLocale.toString( self.assertEqual(value, "1.011000 dUD({0}) TC".format(QLocale.toString(
QLocale(), QLocale(),
QDateTime.fromTime_t(1452663088792), QDateTime.fromTime_t(1452663088792).date(),
QLocale.dateTimeFormat(QLocale(), QLocale.ShortFormat) QLocale.dateFormat(QLocale(), QLocale.ShortFormat)
))) )))
self.lp.run_until_complete(exec_test()) self.lp.run_until_complete(exec_test())
...@@ -114,8 +114,8 @@ class TestRelativeToPast(unittest.TestCase, QuamashTest): ...@@ -114,8 +114,8 @@ class TestRelativeToPast(unittest.TestCase, QuamashTest):
value = await referential.localized(units=False, international_system=True) value = await referential.localized(units=False, international_system=True)
self.assertEqual(value, "1.011000 dUD({0}) ".format(QLocale.toString( self.assertEqual(value, "1.011000 dUD({0}) ".format(QLocale.toString(
QLocale(), QLocale(),
QDateTime.fromTime_t(1452663088792), QDateTime.fromTime_t(1452663088792).date(),
QLocale.dateTimeFormat(QLocale(), QLocale.ShortFormat) QLocale.dateFormat(QLocale(), QLocale.ShortFormat)
))) )))
self.lp.run_until_complete(exec_test()) self.lp.run_until_complete(exec_test())
...@@ -133,8 +133,8 @@ class TestRelativeToPast(unittest.TestCase, QuamashTest): ...@@ -133,8 +133,8 @@ class TestRelativeToPast(unittest.TestCase, QuamashTest):
value = await referential.diff_localized(units=True) value = await referential.diff_localized(units=True)
self.assertEqual(value, "0.101100 UD({0}) TC".format(QLocale.toString( self.assertEqual(value, "0.101100 UD({0}) TC".format(QLocale.toString(
QLocale(), QLocale(),
QDateTime.fromTime_t(1452663088792), QDateTime.fromTime_t(1452663088792).date(),
QLocale.dateTimeFormat(QLocale(), QLocale.ShortFormat) QLocale.dateFormat(QLocale(), QLocale.ShortFormat)
))) )))
self.lp.run_until_complete(exec_test()) self.lp.run_until_complete(exec_test())
...@@ -152,8 +152,8 @@ class TestRelativeToPast(unittest.TestCase, QuamashTest): ...@@ -152,8 +152,8 @@ class TestRelativeToPast(unittest.TestCase, QuamashTest):
value = await referential.diff_localized(units=True, international_system=True) value = await referential.diff_localized(units=True, international_system=True)
self.assertEqual(value, "1.011000 dUD({0}) TC".format(QLocale.toString( self.assertEqual(value, "1.011000 dUD({0}) TC".format(QLocale.toString(
QLocale(), QLocale(),
QDateTime.fromTime_t(1452663088792), QDateTime.fromTime_t(1452663088792).date(),
QLocale.dateTimeFormat(QLocale(), QLocale.ShortFormat) QLocale.dateFormat(QLocale(), QLocale.ShortFormat)
))) )))
self.lp.run_until_complete(exec_test()) self.lp.run_until_complete(exec_test())
...@@ -186,7 +186,7 @@ class TestRelativeToPast(unittest.TestCase, QuamashTest): ...@@ -186,7 +186,7 @@ class TestRelativeToPast(unittest.TestCase, QuamashTest):
value = await referential.diff_localized(units=False, international_system=True) value = await referential.diff_localized(units=False, international_system=True)
self.assertEqual(value, "1.011000 dUD({0}) ".format(QLocale.toString( self.assertEqual(value, "1.011000 dUD({0}) ".format(QLocale.toString(
QLocale(), QLocale(),
QDateTime.fromTime_t(1452663088792), QDateTime.fromTime_t(1452663088792).date(),
QLocale.dateTimeFormat(QLocale(), QLocale.ShortFormat) QLocale.dateFormat(QLocale(), QLocale.ShortFormat)
))) )))
self.lp.run_until_complete(exec_test()) self.lp.run_until_complete(exec_test())
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment