diff --git a/apps/administration/templates/admin_panel.html b/apps/administration/templates/admin_panel.html index fef58da..4944164 100644 --- a/apps/administration/templates/admin_panel.html +++ b/apps/administration/templates/admin_panel.html @@ -10,14 +10,14 @@
Nota: Un estado de exención no lo exime de los requisitos de actividad mensual, sino que evita que se lo ponga automáticamente para ser eliminado de la lista.
+Note: An exempt status does not exempt you from monthly activity requirements, rather it prevents you from being automatically put up for removal from the roster.
Nombre | +Name | CID | Rating | {% for month in months %} -{{ month }} Horas | +{{ month }} Hours | {% endfor %} -Exento | +Exempt | |||||||||||
---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|---|
{{ user.user_obj.full_name }} {% if user.user_obj.main_role == 'VC' %}Visitante de {{ user.user_obj.home_facility }}{% endif %} | +{{ user.user_obj.full_name }} {% if user.user_obj.main_role == 'VC' %}Visitor from {{ user.user_obj.home_facility }}{% endif %} | {{ user.user_obj.cid }} | {{ user.user_obj.rating }} |
@@ -84,9 +84,9 @@ Requisitos de Actividad | {{ user.hours.current|duration|default:'N/A'|safe }} |
{% if user.user_obj.is_staff %}
- Personal
+ Staff
{% elif user.user_obj.activity_exempt %}
- Exento
+ Exempt
{% elif user.user_obj.status == 1 or user.user_obj.loa_last_month %}
LOA
{% endif %}
diff --git a/apps/api/views.py b/apps/api/views.py
index f0941ee..c257229 100644
--- a/apps/api/views.py
+++ b/apps/api/views.py
@@ -30,7 +30,7 @@ def view_statistics(request):
]
return render(request, 'statistics.html', {
- 'page_title': 'Estadísticas',
+ 'page_title': 'Statistics',
'main_stats': main_stats,
'main_users': main_users,
'months': months,
diff --git a/apps/event/templates/events.html b/apps/event/templates/events.html
index 6550f66..52c8e64 100644
--- a/apps/event/templates/events.html
+++ b/apps/event/templates/events.html
@@ -5,7 +5,7 @@
{% block body %}
{% if request.user_obj.is_staff %}
{% endif %}
diff --git a/apps/event/views.py b/apps/event/views.py
index f484776..0c86b28 100644
--- a/apps/event/views.py
+++ b/apps/event/views.py
@@ -41,7 +41,7 @@ def view_all_events(request):
for event in events
})
return render(request, 'events.html', {
- 'page_title': 'Eventos',
+ 'page_title': 'Events',
'events': events,
'events_json': json_events,
})
@@ -57,7 +57,7 @@ def view_archived_events(request):
for event in events
})
return render(request, 'archived_events.html', {
- 'page_title': 'Eventos Archivados',
+ 'page_title': 'Archived Events',
'events': events,
'events_json': json_events,
})
@@ -241,7 +241,22 @@ def unrequest_position(request, request_id):
def assign_position(request, request_id):
position_request = get_object_or_404(EventPositionRequest, id=request_id)
if position_request.position.user != position_request.user:
+ if position_request.position.user is not None:
+ send_mail(
+ 'Event Position Unassigned',
+ render_to_string('emails/position_unassigned.html', {'position': position_request.position}),
+ os.getenv('NO_REPLY'),
+ [position_request.position.user.email],
+ )
position_request.assign()
+
+ send_mail(
+ 'Event Position Assigned!',
+ render_to_string('emails/position_assigned.html', {'position': position_request.position}),
+ os.getenv('NO_REPLY'),
+ [position_request.user.email],
+ )
+
position_request.user.event_requests.filter(position__event=position_request.position.event).delete()
return HttpResponse(status=200)
@@ -313,14 +328,6 @@ def embed_positions(request, event_id):
name=position.name,
value=position.user.full_name if position.user is not None else 'Unassigned',
)
- if position.user is not None:
- send_mail(
- 'Event Position Assigned!',
- render_to_string('emails/position_assigned.html', {'position': position}),
- os.getenv('NO_REPLY'),
- [position.user.email],
- )
-
embed.set_image(url=request.build_absolute_uri(event.banner))
webhook.add_embed(embed)
webhook.execute()
diff --git a/apps/pilots/templates/scenery.html b/apps/pilots/templates/scenery.html
index 76c6e32..cccdbb2 100644
--- a/apps/pilots/templates/scenery.html
+++ b/apps/pilots/templates/scenery.html
@@ -3,7 +3,7 @@
{% block body %}
{% if request.user_obj.is_staff %}
-
+
{% endif %}
diff --git a/apps/pilots/views.py b/apps/pilots/views.py
index 1c64792..59254ed 100644
--- a/apps/pilots/views.py
+++ b/apps/pilots/views.py
@@ -19,7 +19,7 @@ def view_scenery(request):
scenery_sorted = {k: list(g) for k, g in groupby(sceneries, key=lambda scenery: scenery.get_simulator_display())}
simulators = Scenery._meta.get_field('simulator').choices
return render(request, 'scenery.html', {
- 'page_title': 'Paisaje',
+ 'page_title': 'Scenery',
'sceneries': scenery_sorted,
'simulators': simulators
})
diff --git a/apps/resource/templates/resources.html b/apps/resource/templates/resources.html
index 4289478..11ac88d 100644
--- a/apps/resource/templates/resources.html
+++ b/apps/resource/templates/resources.html
@@ -4,7 +4,7 @@
{% block body %}
{% if request.user_obj.is_staff %}
-
+
{% endif %}
@@ -14,7 +14,7 @@
{{ category.0 }}-{{ resources|get_value_from_dict:category.0|length }} Recurso{{ resources|get_value_from_dict:category.0|length|pluralize }} +{{ resources|get_value_from_dict:category.0|length }} Resource{{ resources|get_value_from_dict:category.0|length|pluralize }}
@@ -23,8 +23,8 @@ {{ category.0 }}{% if request.user_obj.is_staff %}
{% endif %}
- | Actualizado |
- Archivo |
+ Updated |
+ File |
{% for resource in resources|get_value_from_dict:category.0 %}
@@ -36,7 +36,7 @@ {{ category.0 }}{{ resource.name }} |
{% empty %}
- ¡No se encontraron recursos! |
+ No resources found! |
{% endfor %}
|
Nivel | -Tipo | +Date / Time | +Level | +Type | Instructor | -Estado | +Status | @@ -158,7 +158,7 @@Aún no ha tenido una sesión, ¿por qué no programar una? | +You have not had a session yet, why not schedule one? | {% endfor %}
---|
Fecha / hora | -Indicativo | -Duración | +Date / Time | +Callsign | +Duration | No connections found... | {% endfor %}
---|
Fecha / hora | -Indicativo | -Valuación | -Información | +Date / Time | +Callsign | +Rating | +Info | No feedback found... | {% endfor %}
---|