Skip to content
Snippets Groups Projects
Commit d4bc64a5 authored by Felix Blanke's avatar Felix Blanke
Browse files

Use regular minus to avoid unicode problems

parent 40ac9cd7
Branches
No related tags found
No related merge requests found
...@@ -589,10 +589,10 @@ class Event(models.Model): ...@@ -589,10 +589,10 @@ class Event(models.Model):
start_day = block_start.strftime("%A, %d. %b") start_day = block_start.strftime("%A, %d. %b")
if block_start.date() == block_end.date(): if block_start.date() == block_end.date():
# same day # same day
time_str = block_start.strftime("%H:%M") + " " + block_end.strftime("%H:%M") time_str = block_start.strftime("%H:%M") + " - " + block_end.strftime("%H:%M")
else: else:
# different days # different days
time_str = block_start.strftime("%a %H:%M") + " " + block_end.strftime("%a %H:%M") time_str = block_start.strftime("%a %H:%M") + " - " + block_end.strftime("%a %H:%M")
block_names.append([start_day, time_str]) block_names.append([start_day, time_str])
block_timeconstraints = [f"notblock{idx}" for idx in range(len(blocks)) if idx != block_idx] block_timeconstraints = [f"notblock{idx}" for idx in range(len(blocks)) if idx != block_idx]
......
...@@ -542,8 +542,8 @@ class JSONExportTest(TestCase): ...@@ -542,8 +542,8 @@ class JSONExportTest(TestCase):
# check that all category availabilities are covered # check that all category availabilities are covered
self.assertTrue( self.assertTrue(
avail.is_covered(export_cat_avails[cat_name]), avail.is_covered(export_cat_avails[cat_name]),
f"AKCategory {cat_name}: avail ({avail.start} {avail.end}) " f"AKCategory {cat_name}: avail ({avail.start} - {avail.end}) "
f"not covered by {[f'({a.start} {a.end})' for a in export_cat_avails[cat_name]]}", f"not covered by {[f'({a.start} - {a.end})' for a in export_cat_avails[cat_name]]}",
) )
def _is_restricted_and_contained_slot( def _is_restricted_and_contained_slot(
...@@ -678,14 +678,14 @@ class JSONExportTest(TestCase): ...@@ -678,14 +678,14 @@ class JSONExportTest(TestCase):
# same day # same day
time_str = ( time_str = (
block_start.strftime("%H:%M") block_start.strftime("%H:%M")
+ " " + " - "
+ block_end.strftime("%H:%M") + block_end.strftime("%H:%M")
) )
else: else:
# different days # different days
time_str = ( time_str = (
block_start.strftime("%a %H:%M") block_start.strftime("%a %H:%M")
+ " " + " - "
+ block_end.strftime("%a %H:%M") + block_end.strftime("%a %H:%M")
) )
block_names.append([start_day, time_str]) block_names.append([start_day, time_str])
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment