Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Town6 display phone numbers in international format #1732

Merged
merged 7 commits into from
Mar 13, 2025
Merged

Town6 display phone numbers in international format #1732

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
6d313f3
Town6 display phone numbers in international format
Tschuppi81 Mar 13, 2025
ea6acd5
Org display phone numbers in international format
Tschuppi81 Mar 13, 2025
aea32be
Org/Town6 display organizer phone in international format
Tschuppi81 Mar 13, 2025
f2ebe08
Adjust phone numbers in tests
Tschuppi81 Mar 13, 2025
ca371ee
PAS display parliamentarian phone numbers in international format
Tschuppi81 Mar 13, 2025
141cfdb
Agency display phone numbers in international format
Tschuppi81 Mar 13, 2025
d4658f0
Feriennet display phone numbers in international format
Tschuppi81 Mar 13, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/onegov/agency/templates/macros.pt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,12 +40,12 @@

<tal:block tal:condition="agency.phone">
<dt i18n:translate>Phone</dt>
<dd><a href="tel: ${agency.phone}">${agency.phone}</a></dd>
<dd><a href="tel: ${layout.format_phone_number(agency.phone)}">${layout.format_phone_number(agency.phone)}</a></dd>
</tal:block>

<tal:block tal:condition="agency.phone_direct">
<dt i18n:translate>Alternate Phone Number or Fax</dt>
<dd><a href="tel: ${agency.phone_direct}">${agency.phone_direct}</a></dd>
<dd><a href="tel: ${layout.format_phone_number(agency.phone_direct)}">${layout.format_phone_number(agency.phone_direct)}</a></dd>
</tal:block>

<tal:block tal:condition="agency.email">
Expand Down Expand Up @@ -115,7 +115,7 @@
<a href="mailto:${person.email}">${person.email}</a>
</li>
<li tal:condition="person.phone and 'phone' not in exclude" class="person-card-phone">
<a href="tel:${person.phone}">${person.phone}</a>
<a href="tel:${layout.format_phone_number(person.phone)}">${layout.format_phone_number(person.phone)}</a>
</li>
</ul>
<div class="clearfix"></div>
Expand Down Expand Up @@ -191,12 +191,12 @@

<tal:block tal:condition="person.phone and 'phone' not in exclude">
<dt i18n:translate>Phone</dt>
<dd><a href="tel:${person.phone}">${person.phone}</a></dd>
<dd><a href="tel:${layout.format_phone_number(person.phone)}">${layout.format_phone_number(person.phone)}</a></dd>
</tal:block>

<tal:block tal:condition="person.phone_direct and 'phone_direct' not in exclude">
<dt i18n:translate>Direct Phone</dt>
<dd><a href="tel:${person.phone_direct}">${person.phone_direct}</a></dd>
<dd><a href="tel:${layout.format_phone_number(person.phone_direct)}">${layout.format_phone_number(person.phone_direct)}</a></dd>
</tal:block>

<tal:block tal:condition="person.website and 'website' not in exclude">
Expand All @@ -206,7 +206,7 @@

<tal:block tal:condition="person.website_2 and 'website_2' not in exclude">
<dt i18n:translate>Website 2</dt>
<dd><a href="${person.website_2}">${person .website_2}</a></dd>
<dd><a href="${person.website_2}">${person.website_2}</a></dd>
</tal:block>

<tal:block tal:condition="person.notes and 'notes' not in exclude">
Expand Down
2 changes: 1 addition & 1 deletion src/onegov/feriennet/templates/bookings.pt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -225,7 +225,7 @@
<i class="fa fa-envelope" aria-hidden="true"></i>
</a>

<a href="tel:${row.phone}" tal:condition="row.phone" title="${row.phone}">
<a href="tel:${layout.format_phone_number(row.phone)}" tal:condition="row.phone" title="${layout.format_phone_number(row.phone)}">
<span class="show-for-sr" i18n:translate>
Call <tal:b i18n:name="name">${row.parent}</tal:b>
</span>
Expand Down
4 changes: 2 additions & 2 deletions src/onegov/feriennet/templates/macros.pt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@
</div>
<div tal:define="phone user.data.get('phone')" tal:condition="phone">
<dt i18n:translate>Phone</dt>
<dd><a href="tel:${phone}">${phone}</a></dd>
<dd><a href="tel:${layout.format_phone_number(phone)}">${layout.format_phone_number(phone)}</a></dd>
</div>
</metal:b

Expand Down Expand Up @@ -415,7 +415,7 @@
</tal:b>
<tal:b condition="'phone' in public">
<li class="organiser-phone" tal:condition="organiser.data.phone|nothing">
<a href="tel:${organiser.data.phone}">${organiser.data.phone}</a>
<a href="tel:${layout.format_phone_number(organiser.data.phone)}">${layout.format_phone_number(organiser.data.phone)}</a>
</li>
</tal:b>
<tal:b condition="'website' in public">
Expand Down
3 changes: 1 addition & 2 deletions src/onegov/feriennet/templates/occasion_attendees.pt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,13 +55,12 @@
</div>
<div>
<span i18n:translate>Phone:</span>
<span><a href="tel:${volunteer.phone}">${volunteer.phone}</a></span>
<span><a href="tel:${layout.format_phone_number(volunteer.phone)}">${layout.format_phone_number(volunteer.phone)}</a></span>
</div>
</li>
</ul>
</tal:b>


<h4 i18n:translate>Attendees</h4>
<ul class="attendees">
<li tal:repeat="details occasions[occasion]">
Expand Down
4 changes: 2 additions & 2 deletions src/onegov/feriennet/templates/volunteers.pt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
</a>
</li>
<li>
<a href="tel:${record.phone}">
<a href="tel:${layout.format_phone_number(record.phone)}">
<i class="fa fa-fw fa-phone-square" aria-hidden="true"></i>
<tal:b i18n:translate>
Contact by phone
Expand Down Expand Up @@ -183,7 +183,7 @@
<div>
<dt i18n:translate>Phone</dt>
<dd>
<a href="tel:${record.phone}">${record.phone}</a>
<a href="tel:${layout.format_phone_number(record.phone)}">${layout.format_phone_number(record.phone)}</a>
</dd>
</div>
</dl>
Expand Down
3 changes: 3 additions & 0 deletions src/onegov/org/layout.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -665,6 +665,9 @@ def format_vat(self, amount: numbers.Number | Decimal | float | None,

return ''

def format_phone_number(self, phone_number: str) -> str:
return utils.format_phone_number(phone_number)

def password_reset_url(self, user: User | None) -> str | None:
if not user:
return None
Expand Down
8 changes: 4 additions & 4 deletions src/onegov/org/templates/macros.pt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -764,7 +764,7 @@
<a href="mailto:${person.email}">${person.email}</a>
</li>
<li tal:condition="person.phone and 'phone' not in exclude" class="person-card-phone">
<a href="tel:${person.phone}">${person.phone}</a>
<a href="tel:${layout.format_phone_number(person.phone)}">${layout.format_phone_number(person.phone)}</a>
</li>
</ul>
<div class="clearfix"></div>
Expand Down Expand Up @@ -814,10 +814,10 @@
<a href="mailto:${person.email}">${person.email}</a>
</li>
<li tal:condition="person.phone and 'phone' not in exclude" class="person-card-phone">
<a href="tel:${person.phone}">${person.phone}</a>
<a href="tel:${layout.format_phone_number(person.phone)}">${layout.format_phone_number(person.phone)}</a>
</li>
<li tal:condition="person.phone_direct and 'phone_direct' not in exclude" class="person-card-phone-direct">
<a href="tel:${person.phone_direct}">${person.phone_direct}</a>
<a href="tel:${layout.format_phone_number(person.phone_direct)}">${layout.format_phone_number(person.phone_direct)}</a>
</li>
<li tal:condition="person.website and 'website' not in exclude" class="person-card-website">
<a href="${person.website}">${person.website}</a>
Expand Down Expand Up @@ -1068,7 +1068,7 @@

<tal:b condition="event.organizer_phone">
<dt i18n:translate>Organizer phone number</dt>
<dd><a href="tel:${event.organizer_phone}" tal:content="event.organizer_phone" /></dd>
<dd><a href="tel:${layout.format_phone_number(event.organizer_phone)}" tal:content="layout.format_phone_number(event.organizer_phone)" /></dd>
</tal:b>

<tal:b condition="event.tags and show_tags">
Expand Down
2 changes: 1 addition & 1 deletion src/onegov/org/templates/occurrence.pt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
</div>
<div tal:condition="organizer_phone">
<dt i18n:translate>Organizer phone number</dt>
<dd><a href="tel:${organizer_phone}" tal:content="organizer_phone" /></dd>
<dd><a href="tel:${layout.format_phone_number(organizer_phone)}" tal:content="layout.format_phone_number(organizer_phone)" /></dd>
</div>
</dl>
</div>
Expand Down
19 changes: 19 additions & 0 deletions src/onegov/org/utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,8 @@

import colorsys
import re

import phonenumbers
import sedate
import pytz

Expand Down Expand Up @@ -1247,3 +1249,20 @@
return cats

return cats, subcats


def format_phone_number(phone_number: str) -> str:
"""
Returns phone number in the international format +41 79 123 45 67
"""
if not phone_number:
return ''

Check warning on line 1259 in src/onegov/org/utils.py

View check run for this annotation

Codecov / codecov/patch

src/onegov/org/utils.py#L1259 

Added line #L1259 was not covered by tests

try:
parsed = phonenumbers.parse(phone_number, 'CH')

return phonenumbers.format_number(
parsed, phonenumbers.PhoneNumberFormat.INTERNATIONAL
)
except phonenumbers.phonenumberutil.NumberParseException:
return phone_number

Check warning on line 1268 in src/onegov/org/utils.py

View check run for this annotation

Codecov / codecov/patch

src/onegov/org/utils.py#L1267-L1268 

Added lines #L1267 - L1268 were not covered by tests
6 changes: 3 additions & 3 deletions src/onegov/pas/templates/parliamentarian.pt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -85,15 +85,15 @@
</div>
<div tal:condition="parliamentarian.phone_private">
<dt i18n:translate>Private phone number</dt>
<dd>${parliamentarian.phone_private}</dd>
<dd>${layout.format_phone_number(parliamentarian.phone_private)}</dd>
</div>
<div tal:condition="parliamentarian.phone_mobile">
<dt i18n:translate>Mobile phone number</dt>
<dd>${parliamentarian.phone_mobile}</dd>
<dd>${layout.format_phone_number(parliamentarian.phone_mobile)}</dd>
</div>
<div tal:condition="parliamentarian.phone_business">
<dt i18n:translate>Business phone number</dt>
<dd>${parliamentarian.phone_business}</dd>
<dd>${layout.format_phone_number(parliamentarian.phone_business)}</dd>
</div>
<div tal:condition="parliamentarian.email_primary">
<dt i18n:translate>Primary email address</dt>
Expand Down
10 changes: 5 additions & 5 deletions src/onegov/town6/templates/macros.pt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1055,10 +1055,10 @@
<a href="mailto:${person.email}">${person.email}</a>
</li>
<li tal:condition="person.phone and 'phone' not in exclude" class="person-card-phone">
<a href="tel:${person.phone}">${person.phone}</a>
<a href="tel:${layout.format_phone_number(person.phone)}">${layout.format_phone_number(person.phone)}</a>
</li>
<li tal:condition="person.phone_direct and 'phone_direct' not in exclude" class="person-card-phone_direct">
<a href="tel:${person.phone_direct}">${person.phone_direct}</a>
<a href="tel:${layout.format_phone_number(person.phone_direct)}">${layout.format_phone_number(person.phone_direct)}</a>
</li>
</ul>
<a href="${link}"><i class="fa fa-chevron-right"></i></a>
Expand Down Expand Up @@ -1108,10 +1108,10 @@
<a href="mailto:${person.email}">${person.email}</a>
</li>
<li tal:condition="person.phone and 'phone' not in exclude" class="person-card-phone">
<a href="tel:${person.phone}">${person.phone}</a>
<a href="tel:${layout.format_phone_number(person.phone)}">${layout.format_phone_number(person.phone)}</a>
</li>
<li tal:condition="person.phone_direct and 'phone_direct' not in exclude" class="person-card-phone-direct">
<a href="tel:${person.phone_direct}">${person.phone_direct}</a>
<a href="tel:${layout.format_phone_number(person.phone_direct)}">${layout.format_phone_number(person.phone_direct)}</a>
</li>
<li tal:condition="person.website and 'website' not in exclude" class="person-card-website">
<a href="${person.website}">${person.website}</a>
Expand Down Expand Up @@ -1373,7 +1373,7 @@
</tal:b>
<tal:b condition="event.organizer_phone">
<dt i18n:translate>Organizer phone number</dt>
<dd><a href="tel:${event.organizer_phone}" tal:content="event.organizer_phone" /></dd>
<dd>tschupre <a href="tel:${layout.format_phone_number(event.organizer_phone)}" tal:content="layout.format_phone_number(event.organizer_phone)" /></dd>
</tal:b>

<tal:b condition="event.tags and show_tags">
Expand Down
2 changes: 1 addition & 1 deletion src/onegov/town6/templates/occurrence.pt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -69,7 +69,7 @@
</div>
<div tal:condition="organizer_phone">
<dt i18n:translate>Organizer phone number</dt>
<dd><a href="tel:${organizer_phone}" tal:content="organizer_phone" /></dd>
<dd><a href="tel:${layout.format_phone_number(organizer_phone)}" tal:content="layout.format_phone_number(organizer_phone)" /></dd>
</div>
</dl>
</div>
Expand Down
10 changes: 5 additions & 5 deletions tests/onegov/feriennet/test_views.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -549,7 +549,7 @@ def test_organiser_info(client, scenario):
contact.form['zip_code'] = '20001'
contact.form['place'] = 'Washington'
contact.form['email'] = '[email protected]'
contact.form['phone'] = '+41 23 456 789'
contact.form['phone'] = '+41234567890'
contact.form['website'] = 'https://www.example.org'
contact.form['emergency'] = '+01 234 56 78 (Peter)'
contact.form.submit()
Expand Down Expand Up @@ -600,28 +600,28 @@ def with_public_organiser_data(values):
assert "Admins Association" not in page
assert "Washington" in page
assert "[email protected]" not in page
assert "+41 23 456 789" not in page
assert "+41 23 456 78 90" not in page
assert "https://www.example.org" not in page

page = with_public_organiser_data(['email'])
assert "Admins Association" not in page
assert "Washington" not in page
assert "[email protected]" in page
assert "+41 23 456 789" not in page
assert "+41 23 456 78 90" not in page
assert "https://www.example.org" not in page

page = with_public_organiser_data(['phone'])
assert "Admins Association" not in page
assert "Washington" not in page
assert "[email protected]" not in page
assert "+41 23 456 789" in page
assert "+41 23 456 78 90" in page
assert "https://www.example.org" not in page

page = with_public_organiser_data(['website'])
assert "Admins Association" not in page
assert "Washington" not in page
assert "[email protected]" not in page
assert "+41 23 456 789" not in page
assert "+41 23 456 78 90" not in page
assert "https://www.example.org" in page


Expand Down
30 changes: 30 additions & 0 deletions tests/onegov/org/test_utils.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
from datetime import date, datetime


from onegov.core.utils import Bunch
from onegov.org import utils
from pytz import timezone
Expand Down Expand Up @@ -297,3 +299,31 @@ def test_extract_categories_and_subcategories():
result = utils.extract_categories_and_subcategories(categories,
flattened=True)
assert result == ['a', 'b', 'c', 'd', 'a1', 'a2', 'b1']


def test_format_phone_number():
assert utils.format_phone_number('+41411112233') == '+41 41 111 22 33'
assert utils.format_phone_number('0041411112233') == '+41 41 111 22 33'
assert utils.format_phone_number('0411112233') == '+41 41 111 22 33'
assert utils.format_phone_number('411112233') == '+41 41 111 22 33'
assert utils.format_phone_number('41 111 22 33') == '+41 41 111 22 33'
assert utils.format_phone_number('041 111 22 33') == '+41 41 111 22 33'
assert utils.format_phone_number('041-111-22-33') == '+41 41 111 22 33'
assert utils.format_phone_number('041/111/22/33') == '+41 41 111 22 33'
assert utils.format_phone_number('041/111-22 33') == '+41 41 111 22 33'

# invalid phone numbers are just prefixed with the country code
assert utils.format_phone_number('41111223') == '+41 41111223'
assert utils.format_phone_number('4111122') == '+41 4111122'
assert utils.format_phone_number('411112') == '+41 411112'
assert utils.format_phone_number('41111') == '+41 41111'
assert utils.format_phone_number('4111') == '+41 4111'
assert utils.format_phone_number('411') == '+41 411'
assert utils.format_phone_number('41') == '+41 41'
assert utils.format_phone_number('') == ''
assert utils.format_phone_number(None) == ''

# force error (too long for phone number), will return the input
long_text = ('You can reach me during office hours at 041 111 22 33 '
'otherwise at 041 111 22 44')
assert utils.format_phone_number(long_text) == long_text
6 changes: 3 additions & 3 deletions tests/onegov/org/test_views_event.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -400,7 +400,7 @@ def test_submit_event(broadcast, authenticate, connect, client, skip):
assert "Bibliothek" in preview_page
assert "The Organizer" in preview_page
assert "[email protected]" in preview_page
assert "076 987 65 43" in preview_page
assert "+41 76 987 65 43" in preview_page
assert "{} 18:00 - 22:00".format(
babel.dates.format_date(
start_date, format='d. MMMM yyyy', locale='de'
Expand Down Expand Up @@ -480,7 +480,7 @@ def test_submit_event(broadcast, authenticate, connect, client, skip):
assert "A special place" in ticket_page
assert "The Organizer" in ticket_page
assert "[email protected]" in preview_page
assert "076 987 65 43" in preview_page
assert "+41 76 987 65 43" in preview_page
assert "Ausstellung" in ticket_page
assert "Bibliothek" in ticket_page
assert "Veranstaltung bearbeitet" in ticket_page
Expand Down Expand Up @@ -536,7 +536,7 @@ def test_submit_event(broadcast, authenticate, connect, client, skip):
assert "Bibliothek" in message
assert "A carful organizer" in message
assert "[email protected]" in preview_page
assert "076 111 22 33" in preview_page
assert "+41 76 111 22 33" in preview_page
assert "{} 18:00 - 22:00".format(
start_date.strftime('%d.%m.%Y')) in message
for days in range(5):
Expand Down
6 changes: 3 additions & 3 deletions tests/onegov/town6/test_views_event.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,7 +160,7 @@ def test_event_steps(broadcast, authenticate, connect, client):

# Make some more corrections
form_page = confirmation_page.click("Bearbeiten Sie diese Veranstaltung.")
form_page.form['organizer'] = "A carful organizer"
form_page.form['organizer'] = "A careful organizer"
form_page.form['organizer_phone'] = "079 123 45 56"
preview_page = form_page.form.submit().follow()
assert "My event is exceptional." in preview_page
Expand Down Expand Up @@ -191,8 +191,8 @@ def test_event_steps(broadcast, authenticate, connect, client):
assert "A special place" in message
assert "Ausstellung" in message
assert "Bibliothek" in message
assert "A carful organizer" in message
assert "079 123 45 56" in ticket_page
assert "A careful organizer" in message
assert "+41 79 123 45 56" in ticket_page
assert "[email protected]" in ticket_page
assert "{} 18:00 - 22:00".format(
start_date.strftime('%d.%m.%Y')) in message
Expand Down