From 723b96cd515de2a161a86a8af77ff6349cda4916 Mon Sep 17 00:00:00 2001
From: Dan Albert <dan@gingerhq.net>
Date: Thu, 10 Aug 2023 00:41:16 -0700
Subject: [PATCH] Fix faction templates for unit type prop changes.

---
 resources/ui/templates/factiontemplate_EN.j2 | 20 ++++++--------------
 resources/ui/templates/factiontemplate_FR.j2 | 19 ++++++-------------
 2 files changed, 12 insertions(+), 27 deletions(-)

diff --git a/resources/ui/templates/factiontemplate_EN.j2 b/resources/ui/templates/factiontemplate_EN.j2
index b48f3349..d19b7c68 100644
--- a/resources/ui/templates/factiontemplate_EN.j2
+++ b/resources/ui/templates/factiontemplate_EN.j2
@@ -19,21 +19,17 @@
     custom campaigns guide</a>.
 </p>
 <ul>
-{% for aircraft in faction.aircrafts | sort(attribute="name") %}
-<li>{{aircraft.name}}</li>
+{% for aircraft in faction.aircrafts | sort(attribute="display_name") %}
+<li>{{aircraft.display_name}}</li>
 {% endfor %}
 </ul>
 <br/>
 
 <strong>Frontlines vehicles:</strong>
 <ul>
-{% for vehicle in faction.frontline_units | sort(attribute="name") %}
+{% for vehicle in faction.frontline_units | sort(attribute="display_name") %}
 <li>
-{% if vehicle.name is not none %}
-    {{ vehicle.name }}
-{% else %}
-    {{ vehicle.id }}
-{%endif %}
+{{ vehicle.display_name }}
 </li>
 {% endfor %}
 </ul>
@@ -41,13 +37,9 @@
 
 <strong>Artillery units:</strong>
 <ul>
-{% for arty in faction.artillery_units | sort(attribute="name") %}
+{% for arty in faction.artillery_units | sort(attribute="display_name") %}
 <li>
-{% if arty.name is not none %}
-    {{ arty.name }}
-{% else %}
-    {{ arty.id }}
-{%endif %}
+{{ arty.display_name }}
 </li>
 {% endfor %}
 </ul>
diff --git a/resources/ui/templates/factiontemplate_FR.j2 b/resources/ui/templates/factiontemplate_FR.j2
index e772c3e2..3e762774 100644
--- a/resources/ui/templates/factiontemplate_FR.j2
+++ b/resources/ui/templates/factiontemplate_FR.j2
@@ -7,20 +7,17 @@
 
 <strong>Aéronefs disponibles :</strong>
 <ul>
-{% for aircraft in faction.aircrafts | sort(attribute="name") %}
-<li>{{aircraft.name}}</li>
+{% for aircraft in faction.aircrafts | sort(attribute="display_name") %}
+<li>{{aircraft.display_name}}</li>
 {% endfor %}
 </ul>
 <br/>
 
 <strong>Véhicules disponibles :</strong>
 <ul>
-{% for vehicle in faction.frontline_units | sort(attribute="name") %}
+{% for vehicle in faction.frontline_units | sort(attribute="display_name") %}
 <li>
-{% if vehicle.name is not none %}
-    {{ vehicle.name }}
-{% else %}
-    {{ vehicle.id }}
+{{ vehicle.display_name }}
 {%endif %}
 </li>
 {% endfor %}
@@ -29,13 +26,9 @@
 
 <strong>Pièces d'artillerie :</strong>
 <ul>
-{% for arty in faction.artillery_units | sort(attribute="name") %}
+{% for arty in faction.artillery_units | sort(attribute="display_name") %}
 <li>
-{% if arty.name is not none %}
-    {{ arty.name }}
-{% else %}
-    {{ arty.id }}
-{%endif %}
+{{ arty.display_name }}
 </li>
 {% endfor %}
 </ul>