Links update & translations typos fixes (#671)

* Remove BDF link (as BDF is now part of AE) * Remove unused pages * Fix typos * Fix typo again
ae-utbm · Oct 10, 2023 · d16bf12 · d16bf12
1 parent 4231a79
commit d16bf12
Show file tree

Hide file tree

Showing 15 changed files with 56 additions and 76 deletions.
diff --git a/club/templates/club/club_sellings.jinja b/club/templates/club/club_sellings.jinja
@@ -2,7 +2,7 @@
 {% from 'core/macros.jinja' import user_profile_link, paginate %}
 
 {% block content %}
-<h3>{% trans %}Sellings{% endtrans %}</h3>
+<h3>{% trans %}Sales{% endtrans %}</h3>
 <form id="form" action="?page=1" method="post">
     {% csrf_token %}
     {{ form }}

diff --git a/club/templates/club/club_tools.jinja b/club/templates/club/club_tools.jinja
@@ -30,7 +30,7 @@
     {% endif %}
     </ul>
     {% if object.club_account.exists() %}
-        <h4>{% trans %}Accouting: {% endtrans %}</h4>
+        <h4>{% trans %}Accounting: {% endtrans %}</h4>
         <ul>
         {% for ca in object.club_account.all() %}
             <li><a href="{{ url('accounting:club_details', c_account_id=ca.id) }}">{{ ca.get_display_name() }}</a></li>

diff --git a/com/templates/com/news_detail.jinja b/com/templates/com/news_detail.jinja
@@ -39,7 +39,7 @@
         <p> <a href="{{ url('com:news_moderate', news_id=news.id) }}">{% trans %}Moderate{% endtrans %}</a></p>
         {% endif %}
         {% if user.can_edit(news) %}
-        <p> <a href="{{ url('com:news_edit', news_id=news.id) }}">{% trans %}Edit (will be remoderated){% endtrans %}</a></p>
+        <p> <a href="{{ url('com:news_edit', news_id=news.id) }}">{% trans %}Edit (will be moderated again){% endtrans %}</a></p>
         {% endif %}
         </div>
         </div>

diff --git a/core/templates/core/base.jinja b/core/templates/core/base.jinja
@@ -203,11 +203,7 @@
                             <ul class="content">
                                 <li><a href="{{ url('core:page', page_name='ae') }}">{% trans %}AE{% endtrans %}</a></li>
                                 <li><a href="{{ url('core:page', page_name='clubs') }}">{% trans %}AE's clubs{% endtrans %}</a></li>
-                                <li><a href="{{ url('core:page', page_name='bdf') }}">{% trans %}BdF{% endtrans %}</a></li>
-                                <li><a href="{{ url('core:page', page_name='bds') }}">{% trans %}BDS{% endtrans %}</a></li>
-                                <li><a href="{{ url('core:page', page_name='cetu') }}">{% trans %}CETU{% endtrans %}</a></li>
-                                <li><a href="{{ url('core:page', page_name='clubs/doceo') }}">{% trans %}Doceo{% endtrans %}</a></li>
-                                <li><a href="{{ url('core:page', page_name='positions') }}">{% trans %}Positions{% endtrans %}</a></li>
+                                <li><a href="{{ url('core:page', page_name='utbm-associations') }}">{% trans %}Others UTBM's Associations{% endtrans %}</a></li>
                             </ul>
                         </div>
                         <div class="menu">

diff --git a/core/templates/core/register.jinja b/core/templates/core/register.jinja
@@ -17,7 +17,7 @@
 
     {% if user_registered %}
         {% trans user_name=user_registered.get_display_name() %}Welcome {{ user_name }}!{% endtrans %}<br>
-        {% trans %}You successfully registred and you will soon receive a confirmation mail.{% endtrans %}<br>
+        {% trans %}You successfully registered and you will soon receive a confirmation mail.{% endtrans %}<br>
         {% trans username=user_registered.username %}Your username is {{ username }}.{% endtrans %}<br>
 
     {% else %}

diff --git a/core/templates/core/user_account.jinja b/core/templates/core/user_account.jinja
@@ -41,11 +41,11 @@
 {% set refilled = customer.refillings.exists() %}
 {% if bought or refilled %}
     {% if bought %}
-    <h5>{% trans %}Account buyings{% endtrans %}</h5>
+    <h5>{% trans %}Account purchases{% endtrans %}</h5>
         {{ monthly(buyings_month) }}
     {% endif %}
     {% if refilled %}
-    <h5>{% trans %}Refillings{% endtrans %}</h5>
+    <h5>{% trans %}Reloads{% endtrans %}</h5>
         {{ monthly(refilling_month) }}
     {% endif %}
 {% endif %}

diff --git a/core/templates/core/user_account_detail.jinja b/core/templates/core/user_account_detail.jinja
@@ -10,7 +10,7 @@
 <p>{% trans %}Amount: {% endtrans %}{{ customer.amount }} €</p>
 <p><a href="{{ url('core:user_account', user_id=profile.id) }}">{% trans %}Back{% endtrans %}</a></p>
 {% if customer.buyings.exists() %}
-<h4>{% trans %}Account buyings{% endtrans %}</h4>
+<h4>{% trans %}Account purchases{% endtrans %}</h4>
 <table>
     <thead>
         <tr>
@@ -43,7 +43,7 @@
 </table>
 {% endif %}
 {% if customer.refillings.exists() %}
-<h4>{% trans %}Refillings{% endtrans %}</h4>
+<h4>{% trans %}Reloads{% endtrans %}</h4>
 <table>
     <thead>
         <tr>

diff --git a/counter/templates/counter/cash_summary_list.jinja b/counter/templates/counter/cash_summary_list.jinja
@@ -14,7 +14,7 @@
     {{ form }}
     <p><input type="submit" value="{% trans %}Show{% endtrans %}" /></p>
 </form>
-<h6>{% trans %}Refillings{% endtrans %}</h6>
+<h6>{% trans %}Reloads{% endtrans %}</h6>
 <p>
 {% for b,s in refilling_sums.items() %}
     {{ b }}: {{ s }} €<br/>

diff --git a/counter/templates/counter/counter_list.jinja b/counter/templates/counter/counter_list.jinja
@@ -19,7 +19,7 @@
     {% endif %}
     {% if user.is_owner(c) %}
     <a href="{{ url('counter:prop_admin', counter_id=c.id) }}">{% trans %}Props{% endtrans %}</a> -
-    <a href="{{ url('counter:refilling_list', counter_id=c.id) }}">{% trans %}Refillings list{% endtrans %}</a>
+    <a href="{{ url('counter:refilling_list', counter_id=c.id) }}">{% trans %}Reloads list{% endtrans %}</a>
     {% endif %}
     </li>
     {% endfor %}
@@ -41,7 +41,7 @@
     {% endif %}
     {% if user.is_owner(c) %}
     <a href="{{ url('counter:prop_admin', counter_id=c.id) }}">{% trans %}Props{% endtrans %}</a> -
-    <a href="{{ url('counter:refilling_list', counter_id=c.id) }}">{% trans %}Refillings list{% endtrans %}</a>
+    <a href="{{ url('counter:refilling_list', counter_id=c.id) }}">{% trans %}Reloads list{% endtrans %}</a>
     {% endif %}
     </li>
     {% endfor %}

diff --git a/counter/templates/counter/counter_main.jinja b/counter/templates/counter/counter_main.jinja
@@ -21,7 +21,7 @@
 {% block content %}
 <h3>{% trans counter_name=counter %}{{ counter_name }} counter{% endtrans %}</h3>
     <div>
-        <h3>{% trans %}Sellings{% endtrans %}</h3>
+        <h3>{% trans %}Sales{% endtrans %}</h3>
         {% if last_basket %}
         <h4>{% trans %}Last selling: {% endtrans %}</h4>
         <p>{% trans %}Client: {% endtrans %}{{ last_customer }} - {% trans %}New amount: {% endtrans %}{{ new_customer_amount }} €.</p>

diff --git a/counter/templates/counter/last_ops.jinja b/counter/templates/counter/last_ops.jinja
@@ -13,7 +13,7 @@
 
 {% block content %}
 <h3>{% trans counter_name=counter %}{{ counter_name }} last operations{% endtrans %}</h3>
-<h4>{% trans %}Refillings{% endtrans %}</h4>
+<h4>{% trans %}Reloads{% endtrans %}</h4>
 <table>
     <thead>
         <tr>
@@ -38,7 +38,7 @@
     </tbody>
 </table>
 
-<h4>{% trans %}Sellings{% endtrans %}</h4>
+<h4>{% trans %}Sales{% endtrans %}</h4>
 <table>
     <thead>
         <tr>

diff --git a/counter/templates/counter/refilling_list.jinja b/counter/templates/counter/refilling_list.jinja
@@ -2,7 +2,7 @@
 {% from 'core/macros.jinja' import paginate %}
 
 {% block title %}
-{%- trans %}Refillings list{% endtrans %} -- {{ counter.name }}
+{%- trans %}Reloads list{% endtrans %} -- {{ counter.name }}
 {% endblock %}
 
 {% block content %}