From 4ba983cbdd37866e7936e2753d0b3caaa7671f29 Mon Sep 17 00:00:00 2001 From: dandds Date: Thu, 13 Jun 2019 09:51:00 -0400 Subject: [PATCH] Remove unused template filters --- atst/filters.py | 24 +----------------------- atst/forms/fields.py | 2 +- atst/utils/localization.py | 13 ------------- 3 files changed, 2 insertions(+), 37 deletions(-) diff --git a/atst/filters.py b/atst/filters.py index 02d51c5c..fe7104a6 100644 --- a/atst/filters.py +++ b/atst/filters.py @@ -1,6 +1,6 @@ import re import datetime -from atst.utils.localization import translate, translate_duration +from atst.utils.localization import translate from flask import current_app as app, render_template from jinja2 import contextfilter from jinja2.exceptions import TemplateNotFound @@ -19,16 +19,6 @@ def dollars(value): return "${:,.2f}".format(numberValue) -def justDollars(value): - raw = dollars(value) - return raw.split(".")[0] - - -def justCents(value): - raw = dollars(value) - return raw.split(".")[1] - - def usPhone(number): if not number: return "" @@ -74,27 +64,15 @@ def renderAuditEvent(event): return render_template("audit_log/events/default.html", event=event) -def normalizeOrder(title): - # reorders titles from "Army, Department of the" to "Department of the Army" - text = title.split(", ") - reordered_text = text[0:-1] - reordered_text.insert(0, text[-1]) - return " ".join(reordered_text) - - def register_filters(app): app.jinja_env.filters["iconSvg"] = iconSvg app.jinja_env.filters["dollars"] = dollars - app.jinja_env.filters["justDollars"] = justDollars - app.jinja_env.filters["justCents"] = justCents app.jinja_env.filters["usPhone"] = usPhone app.jinja_env.filters["findFilter"] = findFilter app.jinja_env.filters["formattedDate"] = formattedDate app.jinja_env.filters["dateFromString"] = dateFromString app.jinja_env.filters["pageWindow"] = pageWindow app.jinja_env.filters["renderAuditEvent"] = renderAuditEvent - app.jinja_env.filters["normalizeOrder"] = normalizeOrder - app.jinja_env.filters["translateDuration"] = translate_duration @contextfilter def translateWithoutCache(context, *kwargs): diff --git a/atst/forms/fields.py b/atst/forms/fields.py index 900780d2..a6518844 100644 --- a/atst/forms/fields.py +++ b/atst/forms/fields.py @@ -1,4 +1,4 @@ -from wtforms.fields import FormField, SelectField as SelectField_ +from wtforms.fields import SelectField as SelectField_ class SelectField(SelectField_): diff --git a/atst/utils/localization.py b/atst/utils/localization.py index ff4c39bd..58291a8c 100644 --- a/atst/utils/localization.py +++ b/atst/utils/localization.py @@ -1,7 +1,5 @@ import yaml from functools import lru_cache -import math -from gettext import ngettext from flask import current_app as app from atst.utils import getattr_path @@ -40,14 +38,3 @@ def translate(key, variables=None): raise LocalizationInvalidKeyError(key, variables) return value.format(**variables).replace("\n", "") - - -def translate_duration(duration_in_months): - duration = [] - years = math.floor(duration_in_months / 12) - months = duration_in_months % 12 - if years > 0: - duration.append("{} {}".format(years, ngettext("year", "years", years))) - if months > 0: - duration.append("{} {}".format(months, ngettext("month", "months", months))) - return (", ").join(duration)