added back the translate code, I hope it is correct.

This commit is contained in:
Bryan Gerlach 2024-04-17 17:44:28 -05:00
parent c5fe3e125c
commit fcd5ccedd4
3 changed files with 33 additions and 33 deletions

View File

@ -5,19 +5,19 @@
<div class="layui-row layui-col-space15">
<div class="layui-col-md15">
<div class="layui-card">
<div class="layui-card-header">{{ "Connection Log" }}:{{u.username}}</div>
<div class="layui-card-header">{{ "Connection Log" | translate }}:{{u.username}}</div>
<div class="layui-card-body">
<table class="layui-table">
<thead>
<tr>
<th>User IP</th>
<th>User ID</th>
<th>User Alias</th>
<th>Remote ID</th>
<th>Remote Alias</th>
<th>Connection Start Time</th>
<th>Connection End Time</th>
<th>Duration (HH:MM:SS)</th>
<th>{{ "User IP" | translate }}</th>
<th>{{ "User ID" | translate }}</th>
<th>{{ "User Alias" | translate }}</th>
<th>{{ "Remote ID" | translate }}</th>
<th>{{ "Remote Alias" | translate }}</th>
<th>{{ "Connection Start Time" | translate }}</th>
<th>{{ "Connection End Time" | translate }}</th>
<th>{{ "Duration (HH:MM:SS)" | translate }}</th>
</tr>
</thead>
<tbody>
@ -41,17 +41,17 @@
<div class="layui-col-md4 layui-col-md-offset4">
<span class="step-links">
{% if page_obj.has_previous %}
<button class="layui-btn" ><a href="?page=1">&laquo; {{ "First" }}</a></button>
<button class="layui-btn" ><a href="?page={{ page_obj.previous_page_number }}">{{ "Previous" }}</a></button>
<button class="layui-btn" ><a href="?page=1">&laquo; {{ "First" | translate }}</a></button>
<button class="layui-btn" ><a href="?page={{ page_obj.previous_page_number }}">{{ "Previous" | translate }}</a></button>
{% endif %}
{% if page_obj.paginator.num_pages > 1 %}
<span class="current">
{{ "Page #" }} {{ page_obj.number }} / {{ page_obj.paginator.num_pages }}
{{ "Page #" | translate }} {{ page_obj.number }} / {{ page_obj.paginator.num_pages }}
</span>
{% endif %}
{% if page_obj.has_next %}
<button class="layui-btn" > <a href="?page={{ page_obj.next_page_number }}">{{ "First" }}</a></button>
<button class="layui-btn" ><a href="?page={{ page_obj.paginator.num_pages }}">{{ "Next" }} &raquo;</a></button>
<button class="layui-btn" > <a href="?page={{ page_obj.next_page_number }}">{{ "Next" | translate }}</a></button>
<button class="layui-btn" ><a href="?page={{ page_obj.paginator.num_pages }}">{{ "Last" | translate }} &raquo;</a></button>
{% endif %}
</span>
</div>

View File

@ -5,20 +5,20 @@
<div class="layui-row layui-col-space15">
<div class="layui-col-md15">
<div class="layui-card">
<div class="layui-card-header">{{ "File Transfer Log" }}:{{u.username}}</div>
<div class="layui-card-header">{{ "File Transfer Log" | translate }}:{{u.username}}</div>
<div class="layui-card-body">
<table class="layui-table">
<thead>
<tr>
<th>File</th>
<th>Remote ID</th>
<th>Remote Alias</th>
<th>User ID</th>
<th>User Alias</th>
<th>User IP</th>
<th>Filesize</th>
<th>Sent/Received</th>
<th>Logged At</th>
<th>{{ "File" | translate }}</th>
<th>{{ "Remote ID" | translate }}</th>
<th>{{ "Remote Alias" | translate }}</th>
<th>{{ "User ID" | translate }}</th>
<th>{{ "User Alias" | translate }}</th>
<th>{{ "User IP" | translate }}</th>
<th>{{ "Filesize" | translate }}</th>
<th>{{ "Sent/Received" | translate }}</th>
<th>{{ "Logged At" | translate }}</th>
</tr>
</thead>
<tbody>
@ -47,17 +47,17 @@
<div class="layui-col-md4 layui-col-md-offset4">
<span class="step-links">
{% if page_obj.has_previous %}
<button class="layui-btn" ><a href="?page=1">&laquo; {{ "First" }}</a></button>
<button class="layui-btn" ><a href="?page={{ page_obj.previous_page_number }}">{{ "Previous" }}</a></button>
<button class="layui-btn" ><a href="?page=1">&laquo; {{ "First" | translate }}</a></button>
<button class="layui-btn" ><a href="?page={{ page_obj.previous_page_number }}">{{ "Previous" | translate }}</a></button>
{% endif %}
{% if page_obj.paginator.num_pages > 1 %}
<span class="current">
{{ "page #" }} {{ page_obj.number }} / {{ page_obj.paginator.num_pages }}
{{ "page #" | translate }} {{ page_obj.number }} / {{ page_obj.paginator.num_pages }}
</span>
{% endif %}
{% if page_obj.has_next %}
<button class="layui-btn" > <a href="?page={{ page_obj.next_page_number }}">{{ "Next" }}</a></button>
<button class="layui-btn" ><a href="?page={{ page_obj.paginator.num_pages }}">{{ "Last" }} &raquo;</a></button>
<button class="layui-btn" > <a href="?page={{ page_obj.next_page_number }}">{{ "Next" | translate }}</a></button>
<button class="layui-btn" ><a href="?page={{ page_obj.paginator.num_pages }}">{{ "Last" | translate }} &raquo;</a></button>
{% endif %}
</span>
</div>

View File

@ -370,12 +370,12 @@ def get_conn_log():
peer = RustDeskPeer.objects.get(rid=v['rid'])
logs[k]['alias'] = peer.alias
except:
logs[k]['alias'] = 'UNKNOWN'
logs[k]['alias'] = _('UNKNOWN')
try:
peer = RustDeskPeer.objects.get(rid=v['from_id'])
logs[k]['from_alias'] = peer.alias
except:
logs[k]['from_alias'] = 'UNKNOWN'
logs[k]['from_alias'] = _('UNKNOWN')
#from_zone = tz.tzutc()
#to_zone = tz.tzlocal()
#utc = logs[k]['logged_at']
@ -406,12 +406,12 @@ def get_file_log():
peer_remote = RustDeskPeer.objects.get(rid=v['remote_id'])
logs[k]['remote_alias'] = peer_remote.alias
except:
logs[k]['remote_alias'] = 'UNKNOWN'
logs[k]['remote_alias'] = _('UNKNOWN')
try:
peer_user = RustDeskPeer.objects.get(rid=v['user_id'])
logs[k]['user_alias'] = peer_user.alias
except:
logs[k]['user_alias'] = 'UNKNOWN'
logs[k]['user_alias'] = _('UNKNOWN')
sorted_logs = sorted(logs.items(), key=lambda x: x[1]['logged_at'], reverse=True)
new_ordered_dict = {}