From aaa34955253657b751f719ad25db3bb03ddd19eb Mon Sep 17 00:00:00 2001
From: Valentin Deniaud <vdeniaud@entrouvert.com>
Date: Mon, 24 Oct 2022 12:15:24 +0200
Subject: [PATCH 2/7] manager: reword time period related labels (#70185)

---
 .../chrono/manager_meetings_agenda_settings.html     |  4 ++--
 .../templates/chrono/manager_time_period_form.html   |  6 ++----
 tests/manager/test_timeperiod.py                     | 12 ++++++------
 3 files changed, 10 insertions(+), 12 deletions(-)

diff --git a/chrono/manager/templates/chrono/manager_meetings_agenda_settings.html b/chrono/manager/templates/chrono/manager_meetings_agenda_settings.html
index e8c2e9ed..d2382b01 100644
--- a/chrono/manager/templates/chrono/manager_meetings_agenda_settings.html
+++ b/chrono/manager/templates/chrono/manager_meetings_agenda_settings.html
@@ -39,7 +39,7 @@
     aria-selected="{{meeting_types|yesno:"true,false"}}"
     id="tab-time-periods" role="tab"
     tabindex="{{meeting_types|yesno:"0"}}"
-  >{% trans "Time Periods" %}</button>
+  >{% trans "Opening hours" %}</button>
   {% if has_resources %}
     <button aria-controls="panel-resources" aria-selected="false" id="tab-resources" role="tab" tabindex="-1">{% trans "Resources" %}</button>
   {% endif %}
@@ -108,7 +108,7 @@
                     <a rel="popup" class="delete" href="{% url 'chrono-manager-time-period-delete' pk=time_period.id %}">{% trans "remove" %}</a>
                   </li>
                 {% endfor %}
-                <li><a class="add" rel="popup" href="{{add_time_period_url}}">{% trans 'Add a time period' %}</a></li>
+                <li><a class="add" rel="popup" href="{{add_time_period_url}}">{% trans 'Add repeating periods' %}</a></li>
                 {% url 'chrono-manager-agenda-add-time-period-exception' agenda_pk=object.pk pk=desk.pk as add_time_period_exception_url %}
                 <li>
                   <a><strong>{% trans 'Exceptions' %}</strong></a>
diff --git a/chrono/manager/templates/chrono/manager_time_period_form.html b/chrono/manager/templates/chrono/manager_time_period_form.html
index 33342002..cb0d2215 100644
--- a/chrono/manager/templates/chrono/manager_time_period_form.html
+++ b/chrono/manager/templates/chrono/manager_time_period_form.html
@@ -11,18 +11,16 @@
   {% if object.id %}
     <a href="">{{object}}</a>
   {% else %}
-    <a href="">{% trans "New Time Period" %}</a>
+    <a href="">{% trans "Repeating period" %}</a>
   {% endif %}
 {% endblock %}
 
 {% block appbar %}
+  <h2>{% trans "Repeating period" %}</h2>
   {% if object.id %}
-    <h2>{% trans "Edit Time Period" %}</h2>
     <span class="actions">
       <a rel="popup" href="{% url 'chrono-manager-time-period-delete' pk=object.id %}">{% trans 'Delete' %}</a>
     </span>
-  {% else %}
-    <h2>{% trans "New Time Period" %}</h2>
   {% endif %}
 {% endblock %}
 
diff --git a/tests/manager/test_timeperiod.py b/tests/manager/test_timeperiod.py
index 71853f03..83f2e9f4 100644
--- a/tests/manager/test_timeperiod.py
+++ b/tests/manager/test_timeperiod.py
@@ -15,7 +15,7 @@ def test_meetings_agenda_add_time_period(app, admin_user):
     MeetingType.objects.create(agenda=agenda, label='Blah')
     app = login(app)
     resp = app.get('/manage/agendas/%s/settings' % agenda.pk)
-    resp = resp.click('Add a time period', index=0)
+    resp = resp.click('Add repeating periods', index=0)
     resp.form.get('weekdays', index=2).checked = True
     resp.form['start_time'] = '10:00'
     resp.form['end_time'] = '17:00'
@@ -30,7 +30,7 @@ def test_meetings_agenda_add_time_period(app, admin_user):
     resp = resp.follow()
 
     # add a second time period
-    resp = resp.click('Add a time period', index=0)
+    resp = resp.click('Add repeating periods', index=0)
     resp.form.get('weekdays', index=0).checked = True
     resp.form['start_time'] = '10:00'
     resp.form['end_time'] = '13:00'
@@ -43,7 +43,7 @@ def test_meetings_agenda_add_time_period(app, admin_user):
     assert resp.text.index('Monday') < resp.text.index('Wednesday')
 
     # invert start and end
-    resp2 = resp.click('Add a time period', index=0)
+    resp2 = resp.click('Add repeating periods', index=0)
     resp2.form.get('weekdays', index=0).checked = True
     resp2.form['start_time'] = '13:00'
     resp2.form['end_time'] = '10:00'
@@ -51,7 +51,7 @@ def test_meetings_agenda_add_time_period(app, admin_user):
     assert 'End time must come after start time.' in resp2.text
 
     # and add same time periods on multiple days
-    resp = resp.click('Add a time period', index=0)
+    resp = resp.click('Add repeating periods', index=0)
     resp.form.get('weekdays', index=4).checked = True
     resp.form.get('weekdays', index=5).checked = True
     resp.form['start_time'] = '10:00'
@@ -107,7 +107,7 @@ def test_meetings_agenda_add_time_period_as_manager(app, manager_user):
     agenda.save()
 
     resp = app.get('/manage/agendas/%s/settings' % agenda.pk)
-    assert 'Add a time period' in resp.text
+    assert 'Add repeating periods' in resp.text
     assert '/manage/timeperiods/%s/edit' % time_period.id in resp.text
     assert '/manage/timeperiods/%s/delete' % time_period.id in resp.text
 
@@ -128,7 +128,7 @@ def test_meetings_agenda_edit_time_period(app, admin_user):
     # edit
     resp = app.get('/manage/agendas/%s/settings' % agenda.pk)
     resp = resp.click('Monday / 9 a.m. → noon', index=0)
-    assert 'Edit Time Period' in resp.text
+    assert 'Repeating period' in resp.text
     resp.form['start_time'] = '10:00'
     resp = resp.form.submit()
     resp = resp.follow()
-- 
2.35.1