holm/django-helpdesk
1
0
Fork 0
forked from extern/django-helpdesk
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #835 from Benbb96/0.2.x

Browse Source 
Update French Translations
This commit is contained in:
Garret Wassermann 2020-06-10 17:03:54 -04:00 committed by GitHub
commit 8f94503811
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 2182 additions and 1585 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

BIN
helpdesk/locale/fr/LC_MESSAGES/django.mo
View File

Binary file not shown.

3747
helpdesk/locale/fr/LC_MESSAGES/django.po
View File

File diff suppressed because it is too large Load Diff

10
helpdesk/templates/helpdesk/create_ticket.html
View File

@ -28,7 +28,10 @@ $(document).on('change', ':file', function() {
</div>
<!-- /.panel-heading -->
<div class="panel-body">
<p>{% trans "Unless otherwise stated, all fields are required." %} {% trans "Please provide as descriptive a title and description as possible." %}</p>
<p>
{% trans "Unless otherwise stated, all fields are required." %}
{% trans "Please provide as descriptive a title and description as possible." %}
</p>
<form method='post' action='./' enctype='multipart/form-data'>
<fieldset class='col-xs-8'>
{% comment %}{{ form|bootstrap }}{% endcomment %}
@ -37,7 +40,10 @@ $(document).on('change', ':file', function() {
{{ field }}
{% else %}
<div class="form-group">
<dt><label for='id_{{ field.name }}'>{% trans field.label %}</label>{% if not field.field.required %} <span class='form_optional'>{% trans "(Optional)" %}</span>{% endif %}</dt>
<dt>
<label for='id_{{ field.name }}'>{{ field.label }}</label>
{% if not field.field.required %} <span class='form_optional'>{% trans "(Optional)" %}</span>{% endif %}
</dt>
<dd>{{ field }}</dd>
{% if field.errors %}<dd class='error'>{{ field.errors }}</dd>{% endif %}
{% if field.help_text %}<dd class='form_help_text help-block'>{% trans field.help_text %}</dd>{% endif %}

2
helpdesk/templates/helpdesk/report_index.html
View File

@ -26,7 +26,7 @@
</tr>
<tr>
<td>{% trans "Average number of days until ticket is closed (tickets opened in last 60 days): " %}</td>
<td><strong style="color: red;">{{ basic_ticket_stats.average_nbr_days_until_ticket_closed_last_60_days }}</strong>. {% trans "Click" %} <strong><a href="{% url 'helpdesk:report_index' %}daysuntilticketclosedbymonth">here</a></strong> {% trans "for detailed average by month." %} </td>
<td><strong style="color: red;">{{ basic_ticket_stats.average_nbr_days_until_ticket_closed_last_60_days }}</strong>. {% trans "Click" %} <strong><a href="{% url 'helpdesk:report_index' %}daysuntilticketclosedbymonth">{% trans "here" %}</a></strong> {% trans "for detailed average by month." %} </td>
</tr>
</tbody>
</table>

2
helpdesk/templates/helpdesk/ticket_list.html
View File

@ -184,7 +184,7 @@ $(document).ready(function() {
<form method='get' action='{% url 'helpdesk:list' %}'>
<p><label for='id_query_selector'>{% trans "Query" %}</label> <select name='saved_query' id='id_query_selector'>
{% for q in user_saved_queries %}
<option value='{{ q.id }}'>{{ q.title }}{% if q.shared %} (Shared{% ifnotequal user q.user %} by {{ q.user.get_username }}{% endifnotequal %}){% endif %}</option>
<option value='{{ q.id }}'>{{ q.title }}{% if q.shared %} ({% trans "Shared" %}{% ifnotequal user q.user %} by {{ q.user.get_username }}{% endifnotequal %}){% endif %}</option>
{% endfor %}
</select></p>
<input class="btn btn-primary" type='submit' value='{% trans "Run Query" %}'>

6
helpdesk/views/staff.py
View File

@ -97,9 +97,9 @@ def dashboard(request):
tickets_per_page = request.user.usersettings_helpdesk.settings.get('tickets_per_page') or 25
# page vars for the three ticket tables
user_tickets_page = request.GET.get('ut_page', 1)
user_tickets_closed_resolved_page = request.GET.get('utcr_page', 1)
all_tickets_reported_by_current_user_page = request.GET.get('atrbcu_page', 1)
user_tickets_page = request.GET.get(_('ut_page'), 1)
user_tickets_closed_resolved_page = request.GET.get(_('utcr_page'), 1)
all_tickets_reported_by_current_user_page = request.GET.get(_('atrbcu_page'), 1)
# open & reopened tickets, assigned to current user
tickets = Ticket.objects.select_related('queue').filter(