darkhelm/notifications-admin
1
0
Fork 0
mirror of https://github.com/GSA/notifications-admin.git synced 2026-09-06 08:28:26 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #949 from GSA/notify-admin-901

Browse Source 
Create UI changes to let people know of considerations when using Non-ISO character sets
This commit is contained in:
Carlo Costino
2023-12-04 13:28:53 -05:00
committed by GitHub
parent ecb2015ad5 da3fa99c52
commit e26967acac
3 changed files with 27 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
app/main/views/templates.py
View File

@@ -2,6 +2,7 @@ from functools import partial
from flask import abort, flash, jsonify, redirect, render_template, request, url_for from flask import abort, flash, jsonify, redirect, render_template, request, url_for
from flask_login import current_user from flask_login import current_user
from markupsafe import Markup
from notifications_python_client.errors import HTTPError from notifications_python_client.errors import HTTPError
from notifications_utils import SMS_CHAR_COUNT_LIMIT from notifications_utils import SMS_CHAR_COUNT_LIMIT
@@ -679,8 +680,23 @@ def count_content_length(service_id, template_type):
) )
def _is_latin1(s):
return bool(s.encode(encoding="latin-1", errors="strict"))
def _get_content_count_error_and_message_for_template(template): def _get_content_count_error_and_message_for_template(template):
url = "https://en.wikipedia.org/wiki/ISO/IEC_8859-1"
if template.template_type == "sms": if template.template_type == "sms":
s1 = f"<html><body>Use of characters outside the <a href='{url}'>IEC_8859-1</a> character set may increase "
s2 = "the message fragment count, resulting in additional charges, and these IEC_8859-1 "
s3 = "characters may not display properly on some older mobile devices.</body></html>"
warning = ""
try:
_is_latin1(template.content)
except UnicodeEncodeError:
warning = f"{s1}{s2}{s3}"
if template.is_message_too_long(): if template.is_message_too_long():
return True, ( return True, (
f"You have " f"You have "
@@ -689,11 +705,16 @@ def _get_content_count_error_and_message_for_template(template):
) )
if template.placeholders: if template.placeholders:
return False, ( return False, (
f"Will be charged as {message_count(template.fragment_count, template.template_type)} " Markup(
f"(not including personalization)" f"Will be charged as {message_count(template.fragment_count, template.template_type)} "
f"(not including personalization). {warning}"
)
) )
return False, ( return False, (
f"Will be charged as {message_count(template.fragment_count, template.template_type)} " # Markup marks html contents safe so that they render properly. Don't use it if there is user input.
Markup(
f"Will be charged as {message_count(template.fragment_count, template.template_type)}. {warning} "
)
) )

2
app/templates/views/edit-sms-template.html
View File

@@ -50,7 +50,7 @@
</div> </div>
<div class="grid-row"> <div class="grid-row">
<div class="grid-col-12"> <div class="grid-col-12">
<div class="template-content-count"> <div class="template-content-count" bg-color="red">
<div data-module="update-status" data-target="template_content" <div data-module="update-status" data-target="template_content"
data-updates-url="{{ url_for('.count_content_length', service_id=current_service.id, template_type='sms') }}" data-updates-url="{{ url_for('.count_content_length', service_id=current_service.id, template_type='sms') }}"
aria-live="polite"> aria-live="polite">

2
tests/app/main/views/test_templates.py
View File

@@ -2112,7 +2112,7 @@ def test_content_count_json_endpoint(
html = json.loads(response.get_data(as_text=True))["html"] html = json.loads(response.get_data(as_text=True))["html"]
snippet = BeautifulSoup(html, "html.parser").select_one("span") snippet = BeautifulSoup(html, "html.parser").select_one("span")
assert normalize_spaces(snippet.text) == expected_message assert expected_message in normalize_spaces(snippet.text)
if snippet.has_attr("class"): if snippet.has_attr("class"):
assert snippet["class"] == [expected_class] assert snippet["class"] == [expected_class]