Skip to content

Commit

Permalink
enhance tooltips and update translation
Browse files Browse the repository at this point in the history
  • Loading branch information
@digitalfox
digitalfox committed Jun 1, 2024
1 parent 6cbc369 commit 7f3b38c
Show file tree
Hide file tree
Showing 3 changed files with 50 additions and 34 deletions.
Binary file modified locale/fr/LC_MESSAGES/django.mo
View file
Binary file not shown.
78 changes: 47 additions & 31 deletions locale/fr/LC_MESSAGES/django.po
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,8 @@ msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2024-04-14 21:09+0200\n"
"PO-Revision-Date: 2024-04-14 21:08+0200\n"
"POT-Creation-Date: 2024-06-01 17:43+0200\n"
"PO-Revision-Date: 2024-06-01 17:43+0200\n"
"Last-Translator: Sébastien Renard <[email protected]>\n"
"Language-Team: French <[email protected]>\n"
"Language: fr\n"
Expand Down Expand Up @@ -334,7 +334,7 @@ msgstr "Libellé"
#: billing/tests.py:268 billing/tests.py:277 billing/tests.py:283
#: billing/tests.py:289 billing/utils.py:164 billing/utils.py:182
#: billing/utils.py:198 billing/utils.py:218 billing/utils.py:225
#: core/views.py:376 core/views.py:397 crm/views.py:465 staffing/views.py:1608
#: core/views.py:376 core/views.py:397 crm/views.py:464 staffing/views.py:1608
#: staffing/views.py:1647 staffing/views.py:1662
#: templates/billing/_lead_billing.html:24
#: templates/billing/client_billing_control_pivotable.html:56
Expand All @@ -344,8 +344,8 @@ msgstr "Libellé"
#: templates/core/risks.html:43 templates/core/risks.html:49
#: templates/core/risks.html:58
#: templates/crm/_clientcompany_rates_margin.html:103
#: templates/crm/_clientcompany_rates_margin.html:111
#: templates/crm/_clientcompany_rates_margin.html:119
#: templates/crm/_clientcompany_rates_margin.html:109
#: templates/crm/_clientcompany_rates_margin.html:115
#: templates/staffing/rate_objective_report.html:43
#: templates/staffing/rates_report.html:49
#: templates/staffing/rates_report.html:57
Expand Down Expand Up @@ -490,15 +490,13 @@ msgstr "mois"

#: billing/utils.py:166 billing/utils.py:180 billing/utils.py:197
#: billing/utils.py:219 billing/utils.py:226 core/views.py:372
#: core/views.py:393 crm/views.py:463 staffing/views.py:1509
#: staffing/views.py:1606 staffing/views.py:1645 staffing/views.py:1660
#: staffing/views.py:1705 templates/billing/_lead_billing.html:20
#: core/views.py:393 staffing/views.py:1509 staffing/views.py:1606
#: staffing/views.py:1645 staffing/views.py:1660 staffing/views.py:1705
#: templates/billing/_lead_billing.html:20
#: templates/billing/client_billing_control_pivotable.html:53
#: templates/core/risks.html:41 templates/core/risks.html:48
#: templates/core/risks.html:57
#: templates/crm/_clientcompany_rates_margin.html:101
#: templates/crm/_clientcompany_rates_margin.html:110
#: templates/crm/_clientcompany_rates_margin.html:118
#: templates/staffing/missions_report.html:66
#: templates/staffing/missions_report.html:72
#: templates/staffing/missions_report.html:77
Expand Down Expand Up @@ -998,8 +996,8 @@ msgstr "affaire"
msgid "company"
msgstr "société"

#: core/views.py:378 core/views.py:399 crm/views.py:462 crm/views.py:523
#: templates/crm/_clientcompany_rates_margin.html:116
#: core/views.py:378 core/views.py:399 crm/views.py:462 crm/views.py:522
#: templates/crm/_clientcompany_rates_margin.html:114
#: templates/crm/clientcompany_detail.html:295
#: templates/crm/company_pivotable.html:49 templates/leads/leads.html:15
#: templates/leads/leads_to_bill.html:14
Expand Down Expand Up @@ -1323,27 +1321,17 @@ msgstr "12 derniers mois"
msgid "profile"
msgstr "profile"

#: crm/views.py:463 people/models.py:317 staffing/views.py:1660
#: templates/crm/_clientcompany_rates_margin.html:110
#: templates/crm/_clientcompany_rates_margin.html:118
#: templates/people/consultant_detail.html:237
#: templates/people/consultant_detail.html:243
#: templates/staffing/_consultant_prod_tooltip.html:2
#: templates/staffing/rates_report.html:56
msgid "daily rate"
msgstr "taux journalier"

#: crm/views.py:464 staffing/views.py:1646 staffing/views.py:1661
#: crm/views.py:463 staffing/views.py:1646 staffing/views.py:1661
#: templates/crm/_clientcompany_rates_margin.html:101
#: templates/crm/_clientcompany_rates_margin.html:107
#: templates/crm/_clientcompany_rates_margin.html:115
#: templates/crm/_clientcompany_rates_margin.html:113
#: templates/staffing/rates_report.html:47
#: templates/staffing/rates_report.html:53
#: templates/staffing/rates_report.html:61
msgid "period"
msgstr "période"

#: crm/views.py:594
#: crm/views.py:593
msgid "Others"
msgstr "Autres"

Expand Down Expand Up @@ -1865,6 +1853,14 @@ msgstr "Profil"
msgid "Subcontractor"
msgstr "Sous-traitant"

#: people/models.py:317 staffing/views.py:1660
#: templates/people/consultant_detail.html:237
#: templates/people/consultant_detail.html:243
#: templates/staffing/_consultant_prod_tooltip.html:2
#: templates/staffing/rates_report.html:56
msgid "daily rate"
msgstr "taux journalier"

#: people/models.py:318 staffing/views.py:1645 staffing/views.py:2190
#: templates/staffing/_consultant_prod_tooltip.html:1
#: templates/staffing/graph_timesheet_rates_bar.html:15
Expand Down Expand Up @@ -3197,8 +3193,8 @@ msgstr "Délai de création au cours du temps"
#: templates/billing/payment_delay.html:93
#: templates/billing/payment_delay.html:99
#: templates/crm/_clientcompany_rates_margin.html:103
#: templates/crm/_clientcompany_rates_margin.html:111
#: templates/crm/_clientcompany_rates_margin.html:119
#: templates/crm/_clientcompany_rates_margin.html:109
#: templates/crm/_clientcompany_rates_margin.html:115
#: templates/staffing/rates_report.html:49
#: templates/staffing/rates_report.html:57
#: templates/staffing/rates_report.html:65
Expand Down Expand Up @@ -5045,7 +5041,6 @@ msgid "Margin (k€)"
msgstr "Marge fin de mission (k€)"

#: templates/staffing/fixed_price_report.html:23
#: templates/staffing/mission_timesheet.html:99
msgid ""
"Sum of unused or overtaken days and margin over budget rate, considering "
"done days and forecasting"
Expand Down Expand Up @@ -5236,7 +5231,7 @@ msgid "Overtaking"
msgstr "Dépassement"

#: templates/staffing/mission_timesheet.html:95
msgid "Done and forecasted days with defined rate overtake mision price"
msgid "Done and forecasted days with defined rate overtake mission price"
msgstr ""
"Les jours réalisés et prévus avec les taux définis dépassent le montant de "
"la mission"
Expand All @@ -5250,6 +5245,14 @@ msgstr "Montant inutilisé en projection"
msgid "Margin"
msgstr "Marge"

#: templates/staffing/mission_timesheet.html:99
msgid ""
"Sum of unused or overtaken days and margin over budget rate, considering "
"done days and forecasting."
msgstr ""
"Somme des montants inutilisés ou en dépassement et de la marge sur objectifs "
"de TJM en prenant en compte les jours réalisés et prévus."

#: templates/staffing/mission_timesheet.html:101
msgid "Currently unused"
msgstr "Montant inutilisé actuel"
Expand All @@ -5265,10 +5268,12 @@ msgstr ""
#: templates/staffing/mission_timesheet.html:108
msgid ""
"Computed as the difference between budget objectives and applied rates for "
"done days (timesheet) and forecasted days"
"done days (timesheet) and forecasted days. For subcontractors default margin "
"is subtracted"
msgstr ""
"Calculé comme la différence entre le taux objectif défini dans le budget et "
"le taux appliqué pour cette mission pour les jours réalisés et prévus"
"le taux appliqué pour cette mission pour les jours réalisés et prévus. Pour "
"les sous traitants la marge par défaut est soustraite."

#: templates/staffing/mission_timesheet.html:156
msgid "Click to show past timesheet"
Expand Down Expand Up @@ -5499,6 +5504,17 @@ msgstr "Proportion de sous traitance par produit"
msgid "Sum ratio"
msgstr "Ratio de sommes"

#, fuzzy
#~| msgid ""
#~| "Sum of unused or overtaken days and margin over budget rate, considering "
#~| "done days and forecasting"
#~ msgid ""
#~ "Sum of unused or overtaken days and margin over budget rate, considering "
#~ "done days and forecasting. For subcontractors default margin is subtracted"
#~ msgstr ""
#~ "Somme des montants inutilisés ou en dépassement et de la marge sur "
#~ "objectifs de TJM en prenant en compte les jours réalisés et prévus"

#~ msgid "My leads"
#~ msgstr "Mes affaires"

Expand Down
6 changes: 3 additions & 3 deletions templates/staffing/mission_timesheet.html
View file
Original file line number Diff line number Diff line change
Expand Up @@ -92,11 +92,11 @@ <h2>{% trans "Profitability" %}</h2>
{% if mission.billing_mode == "FIXED_PRICE" %}
<tr><td>{% trans "Average daily rate" %}</td><td>{{ avg_daily_rate }} €</td></tr>
{% if forecasted_unused < 0 %}
<tr><td>{% trans "Overtaking" %} <i class="bi bi-question-circle-fill pydici-tooltip d-none d-md-inline" title="{% blocktrans %}Done and forecasted days with defined rate overtake mision price{% endblocktrans %}"></i></td><td>{{ forecasted_unused }} k€</td></tr>
<tr><td>{% trans "Overtaking" %} <i class="bi bi-question-circle-fill pydici-tooltip d-none d-md-inline" title="{% blocktrans %}Done and forecasted days with defined rate overtake mission price{% endblocktrans %}"></i></td><td>{{ forecasted_unused }} k€</td></tr>
{% else %}
<tr><td>{% trans "Forecasted unused" %}</td><td>{{ forecasted_unused }} k€</td></tr>
{% endif %}
<tr><td>{% trans "Margin" %} <i class="bi bi-question-circle-fill pydici-tooltip d-none d-md-inline" title="{% blocktrans %}Sum of unused or overtaken days and margin over budget rate, considering done days and forecasting{% endblocktrans %}"></i></td><td>{{ margin }} k€</td></tr>
<tr><td>{% trans "Margin" %} <i class="bi bi-question-circle-fill pydici-tooltip d-none d-md-inline" title="{% blocktrans %}Sum of unused or overtaken days and margin over budget rate, considering done days and forecasting.{% endblocktrans %}"></i></td><td>{{ margin }} k€</td></tr>
{% else %}
<tr><td>{% trans "Currently unused" %}</td><td>{{ current_unused }} k€</td></tr>
<tr><td>{% trans "Forecasted unused" %}{% if forecasted_unused < 0 %} <i class="bi bi-question-circle-fill pydici-tooltip d-none d-md-inline" title="{% blocktrans %}Consider mission price update to reflect reality or use elastic management mode for this mission{% endblocktrans %}"></i>{% endif %}</td><td>{{ forecasted_unused }} k€</td></tr>
Expand All @@ -105,7 +105,7 @@ <h2>{% trans "Profitability" %}</h2>
</div>

<div class="col-md-6 col-xl-4">
<h2>{% trans "Margin over rate objective" %} <span class="bi bi-question-circle-fill pydici-tooltip d-none d-md-inline" title="{% blocktrans %}Computed as the difference between budget objectives and applied rates for done days (timesheet) and forecasted days{% endblocktrans %}"></span></h2>
<h2>{% trans "Margin over rate objective" %} <span class="bi bi-question-circle-fill pydici-tooltip d-none d-md-inline" title="{% blocktrans %}Computed as the difference between budget objectives and applied rates for done days (timesheet) and forecasted days. For subcontractors default margin is subtracted{% endblocktrans %}"></span></h2>
<table class="table table-hover">
{% for consultant, consultant_objective_margin in objective_margin.items %}
<tr>
Expand Down

0 comments on commit 7f3b38c

Please sign in to comment.