diff --git a/app/port/templates/port/includes/port-header.html b/app/port/templates/port/includes/port-header.html index 1e70f03ba..ea184509c 100644 --- a/app/port/templates/port/includes/port-header.html +++ b/app/port/templates/port/includes/port-header.html @@ -27,7 +27,7 @@

{% if is_followed %} Unfollow {% else %} Add to my watchlist{% endif %} - +

{{ port.description }} diff --git a/app/port/templates/port/port_basic.html b/app/port/templates/port/port_basic.html index 466adedb9..baef3c93d 100644 --- a/app/port/templates/port/port_basic.html +++ b/app/port/templates/port/port_basic.html @@ -83,7 +83,7 @@
- The MacPorts Project uses a system called Trac to file tickets to report bugs and enhancement requests. + The MacPorts Project uses a system called Trac to file tickets to report bugs and enhancement requests. Though anyone may search Trac for tickets, you must have a GitHub account in order to login to Trac to create tickets.

Report an Issue on MacPorts Trac @@ -133,7 +133,7 @@

Installable ports:

{% else %} Add to my watchlist {% endif %} - +

@@ -141,11 +141,11 @@

Installable ports:

- + - +
Installations{{ count.all }}{{ count.all|intcomma }}
Requested Installations{{ count.requested }}{{ count.requested|intcomma }}
diff --git a/app/port/templates/port/port_details.html b/app/port/templates/port/port_details.html index e82e0e9c7..2de7a580d 100644 --- a/app/port/templates/port/port_details.html +++ b/app/port/templates/port/port_details.html @@ -84,7 +84,7 @@
{% with subports=port.get_subports %} {% if subports %} -

Subport(s) ({{ subports.count }})

+

Subport(s) ({{ subports.count|intcomma }})

{% for subport in subports %}
@@ -98,7 +98,7 @@

Subport(s) ({{ subports.count }})

"{{ port.name }}" depends on

{% if port.dependent_port.all.count > 0 %} {% for d in port.dependent_port.all %} -
{{ d.type }} ({{ d.dependencies.all.count }})
+
{{ d.type }} ({{ d.dependencies.all.count|intcomma }})
{% for i in d.dependencies.all|dictsort:"name.lower" %}
@@ -115,7 +115,7 @@

Ports that depend on "{{ port.name }}"

{% if dependents|length > 0 %} {% for d in dependents %}
{% for i in d.ports|dictsort:"0.lower" %} @@ -145,13 +145,13 @@
Port Health:
Installations (30 days)
-

{{count.all}}

+

{{count.all|intcomma}}

Requested Installations (30 days)
-

{{ count.requested }}

+

{{ count.requested|intcomma }}

{% if port.livecheck.result %} diff --git a/app/port/templates/port/port_health.html b/app/port/templates/port/port_health.html index 0d7adac53..98391be38 100644 --- a/app/port/templates/port/port_health.html +++ b/app/port/templates/port/port_health.html @@ -1,4 +1,5 @@ {% load url_generate %} +{% load humanize %}
    {% for builder in builders %} @@ -14,7 +15,7 @@ {{ builder.natural_name }} {% if latest_build.files.count > 0 %} - + {% endif %} {% if latest_build.files.count > 0 %} @@ -65,4 +66,4 @@
    Files ({{ builder.display_name }})
    } $("#" + id + "-modal-body").html(ul); }); - \ No newline at end of file + diff --git a/app/port/templates/port/port_stats.html b/app/port/templates/port/port_stats.html index d95011177..ae8ba48e8 100644 --- a/app/port/templates/port/port_stats.html +++ b/app/port/templates/port/port_stats.html @@ -1,6 +1,7 @@ {% extends 'layout.html' %} {% load static %} {% load url_replace %} +{% load humanize %} {% block title %}Statistics - {{ port.name }} |{% endblock %} @@ -15,7 +16,7 @@ {% include 'port/includes/port-tabs.html' with port_name=port.name active="stats" %}
    - Displaying statistics for {{ users_in_duration_count }} users who made submissions during: + Displaying statistics for {{ users_in_duration_count|intcomma }} users who made submissions during: {% for i in allowed_days|slice:"1:" %} @@ -73,7 +74,7 @@

    -
    +

    MacPorts Versions

    Loading Chart @@ -161,7 +162,7 @@

    return r; }, {}); - return generateDataset(result, group, 'os_version'); + return generateDataset(result, group, 'os_version'); } async function drawOSVersionsChart() { diff --git a/app/templates/account/my_ports.html b/app/templates/account/my_ports.html index d3dbd7ea1..59c3474ff 100644 --- a/app/templates/account/my_ports.html +++ b/app/templates/account/my_ports.html @@ -1,6 +1,7 @@ {% extends 'account/account_layout.html' %} {% load i18n %} +{% load humanize %} {% block account_head_scripts %}{% include 'account/style.html' %}{% endblock %} {% block account_title %}Maintained by me |{% endblock %} @@ -9,8 +10,8 @@

    Ports maintained by me:

    {% if connections|length > 0 %} diff --git a/app/templates/account/profile.html b/app/templates/account/profile.html index 8d35abd0a..a82eaf2b5 100644 --- a/app/templates/account/profile.html +++ b/app/templates/account/profile.html @@ -1,6 +1,7 @@ {% extends 'account/account_layout.html' %} {% load notifications_tags %} +{% load humanize %} {% block account_head_scripts %}{% include 'account/style.html' %}{% endblock %} {% block account_title %}Profile |{% endblock %} @@ -12,7 +13,7 @@

    Hello, {{ user.username }}

    {% if followed_count > 0 %} -

    You are following {{ followed_count }} port(s). View

    +

    You are following {{ followed_count|intcomma }} port(s). View

    {% else %}

    You are not following any ports. To receive notifications about changes to the ports that interest you, add them to your watchlist.

    @@ -33,7 +34,7 @@
    Connected GitHub
  • {{ handle }}
    • {% endfor %}
- View ports ({{ ports_by_github_count }}) + View ports ({{ ports_by_github_count|intcomma }}) Mange GitHub connections {% else %}

You have no GitHub accounts connected. To track the ports maintained by you, please add a GitHub account.

@@ -65,4 +66,4 @@
Connected Emails
-{% endblock %} \ No newline at end of file +{% endblock %} diff --git a/app/templates/filtered_table.html b/app/templates/filtered_table.html index d943add47..0f682ad2a 100644 --- a/app/templates/filtered_table.html +++ b/app/templates/filtered_table.html @@ -1,11 +1,13 @@ +{% load humanize %} + {% if ports.count > 0 %} {% if content == "Category" %} -

Your search "{{ query }}" in category "{{ search_in }}" matched {{ ports|length }} ports.

+

Your search "{{ query }}" in category "{{ search_in }}" matched {{ ports|length|intcomma }} ports.

{% elif content == "Maintainer" %} -

Your search "{{ query }}" in ports maintained by "{{ search_in }}" matched {{ ports|length }} ports.

+

Your search "{{ query }}" in ports maintained by "{{ search_in }}" matched {{ ports|length|intcomma }} ports.

{% elif content == "Variant" %} -

Your search "{{ query }}" in variant "{{ search_in }}" matched {{ ports|length }} ports.

+

Your search "{{ query }}" in variant "{{ search_in }}" matched {{ ports|length|intcomma }} ports.

{% else %}

Showing results for "{{ query }}".

{% endif %} @@ -68,4 +70,3 @@

Showing results for "{{ query }}".

{% endif %} {% endif %} - diff --git a/app/templates/includes/basic_pagination.html b/app/templates/includes/basic_pagination.html index b6101b9a8..c4ba27a6a 100644 --- a/app/templates/includes/basic_pagination.html +++ b/app/templates/includes/basic_pagination.html @@ -1,9 +1,10 @@ {% load url_replace %} +{% load humanize %} -{{ items.paginator.count }} {{contents}} found +{{ items.paginator.count|intcomma }} {{contents}} found {% if items.has_other_pages %} -

Page {{ items.number }} of {{ items.paginator.num_pages }} | Showing {{contents}} {{ items.start_index }} to - {{ items.end_index }}

+

Page {{ items.number|intcomma }} of {{ items.paginator.num_pages|intcomma }} | Showing {{contents}} {{ items.start_index|intcomma }} to + {{ items.end_index|intcomma }}

-

{{ ports_count }}

+

{{ ports_count|intcomma }}

View all
diff --git a/app/templates/search/search.html b/app/templates/search/search.html index 6241f175a..f0914d294 100644 --- a/app/templates/search/search.html +++ b/app/templates/search/search.html @@ -2,6 +2,7 @@ {% load static %} {% load highlight %} {% load url_replace %} +{% load humanize %} {% block head_scripts %} @@ -35,7 +36,7 @@ {% for maintainer in facets.fields.maintainers|slice:":5" %} {% endfor %}
@@ -63,7 +64,7 @@ {% for category in facets.fields.categories|slice:":5" %} {% endfor %} @@ -91,7 +92,7 @@ {% for variant in facets.fields.variants|slice:":5" %} {% endfor %}