pk/atst
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove inflect dependency

Browse Source
This commit is contained in:
leigh-mil 2019-09-09 14:51:59 -04:00
parent 7132edc1f1
commit 3e3dfc5056
3 changed files with 6 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Pipfile
View File

@ -26,7 +26,6 @@ azure-storage = "*"
azure-storage-common = "*"
boto3 = "*"
celery = "*"
inflect = "*"
[dev-packages]
bandit = "*"

11
atst/filters.py
View File

@ -1,6 +1,5 @@
import re
import datetime
import inflect
from atst.utils.localization import translate
from flask import render_template
from jinja2 import contextfilter
@ -68,14 +67,6 @@ def renderAuditEvent(event):
return render_template("audit_log/events/default.html", event=event)
def numberToWords(integer):
return inflect.engine().number_to_words(integer)
def pluralize(word, number):
return inflect.engine().plural(word, number)
def register_filters(app):
app.jinja_env.filters["iconSvg"] = iconSvg
app.jinja_env.filters["dollars"] = dollars
@ -85,8 +76,6 @@ def register_filters(app):
app.jinja_env.filters["pageWindow"] = pageWindow
app.jinja_env.filters["renderAuditEvent"] = renderAuditEvent
app.jinja_env.filters["withExtraParams"] = with_extra_params
app.jinja_env.filters["numberToWords"] = numberToWords
app.jinja_env.filters["pluralize"] = pluralize
@contextfilter
def translateWithoutCache(context, *kwargs):

8
templates/portfolios/applications/settings.html
View File

@ -252,7 +252,11 @@
{% if user_can(permissions.DELETE_APPLICATION) %}
{% set env_count = application.environments | length %}
{% set pluralized_env = "environment" | pluralize(env_count) %}
{% if env_count == 1 %}
{% set pluralized_env = "environment" %}
{% else %}
{% set pluralized_env = "environments" %}
{% endif %}
<div class='subheading'>
{{ "portfolios.applications.delete.subheading" | translate }}
@ -262,7 +266,7 @@
<div class="panel__content">
<div class="form-row">
<div class="form-col form-col--two-thirds">
{{ "portfolios.applications.delete.panel_text" | translate({"name": application.name, "env_count": env_count | numberToWords, "pluralized_env": pluralized_env}) | safe }}
{{ "portfolios.applications.delete.panel_text" | translate({"name": application.name, "env_count": env_count , "pluralized_env": pluralized_env}) | safe }}
</div>
<div class="form-col form-col--third">
<div class="usa-input">