Removed unused xapian action

* integration of 3D secure v2 for eboutic bank payment

* edit yml to avoid git conflict when deploying on test

* escape html characters on xml (#505)

* Change country id to ISO 3166 1 numeric for 3DSV2 (#510)

* remove useless tests

* Fix le panier de l'Eboutic pour Safari (#518)

Co-authored-by: Théo DURR <git@theodurr.fr>
Co-authored-by: thomas girod <56346771+imperosol@users.noreply.github.com>

* update some dependencies (#523)

* [Eboutic] Fix double quote issue & improved user experience on small screen (#522)

* Fix #511 Regex issue with escaped double quotes

* Fix basket being when reloading the page (when cookie != "")

+ Added JSDoc
+ Cleaned some code

* Fix #509 Improved user experience on small screens

* Fix css class not being added back when reloading page

* CSS Fixes (see description)

+ Fixed overlaping item title with the cart emoji on small screen
+ Fixed minimal size of the basket on small screen (full width)

* Added darkened background circle to items with no image

* Fix issue were the basket could be None


* Edited CSS to have bette img ratio & the 🛒 icon

Adapt, Improve, Overcome

* Moved basket down on small screen size

* enhance admin pages

* update documentation

* Update doc/about/tech.rst

Co-authored-by: Julien Constant <49886317+Juknum@users.noreply.github.com>

* remove csrf_token

* Fix 3DSv2 implementation (#542)

* Fixed wrong HMAC signature generation

* Fix xml du panier

Co-authored-by: Julien Constant <julienconstant190@gmail.com>

* [FIX] 3DSv2 - Echappement du XML et modif tables (#543)

* Fixed wrong HMAC signature generation
* Updated migration files

Co-authored-by: Julien Constant <julienconstant190@gmail.com>

* Update doc/about/tech.rst

* Update doc/start/install.rst

* Updated lock file according to pyproject

* unify account_id creation

* upgrade re_path to path (#533)

* redirect directly on counter if user is barman

* Passage de vue à Alpine pour les comptoirs (#561)

Vue, c'est cool, mais avec Django c'est un peu chiant à utiliser. Alpine a l'avantage d'être plus léger et d'avoir une syntaxe qui ne ressemble pas à celle de Jinja (ce qui évite d'avoir à mettre des {% raw %} partout).

* resolved importError (#565)

* Add galaxy (#562)

* style.scss: lint

* style.scss: add 'th' padding

* core: populate: add much more data for development

* Add galaxy

* repair user merging tool (#498)

* Disabled galaxy feature (only visually)

* Disabled Galaxy button & Removed 404 exception display

* Update 404.jinja

* Fixed broken test

* Added eurocks links to eboutic

* fix typo

* fix wording

Co-authored-by: Théo DURR <git@theodurr.fr>

* Edited unit tests

This test caused a breach in security due to the alert block displaying sensitive data.

* Repair NaN bug for autocomplete on counter click

* remove-useless-queries-counter-stats (#519)

* Amélioration des pages utilisateurs pour les petits écrans (#578, #520)

- Refonte de l'organisation des pages utilisateurs (principalement du front)
  - Page des parrains/fillots
  - Page d'édition du profil
  - Page du profil
  - Page des outils
  - Page des préférences
  - Page des stats utilisateurs

- Refonte du CSS / organisation de la navbar principale (en haut de l'écran)
- Refonte du CSS de la navbar bleu clair (le menu)
- Refonte du CSS du SAS :
  - Page de photo
  - Page d'albums

* Added GA/Clubs Google Calendar to main page (#585)

* Added GA/Clubs google calendar to main page

* Made tables full width

* Create dependabot.yml (#587)

* Bump django from 3.2.16 to 3.2.18 (#574)

* [CSS] Follow up of #578 (#589)

* [FIX] Broken link in readme and license fix (& update) (#591)

* Fixes pour la mise à jour de mars (#598)

* Fix problème de cache dans le SAS & améliore le CSS du SAS

Co-authored-by: Bartuccio Antoine <klmp200@users.noreply.github.com>

* Fixes & améliorations du nouveau CSS (#616)

* [UPDATE] Bump sentry-sdk from 1.12.1 to 1.19.1 (#620)

* [FIX] Fixes supplémentaires pour la màj de mars (#622)

- Les photos de l'onglet de la page utilisateur utilise désormais leur version thumbnail au lieu de leur version HD
- Une des classes du CSS du SAS a été renommée car elle empiétait sur une class de la navbar
- Le profil utilisateur a été revu pour ajouter plus d'espacement entre le tableau des cotisations et le numéro de cotisants
- Les images de forum & blouse sont de nouveau cliquable pour les afficher en grands
- Sur mobile, lorsqu'on cliquait sur le premier élément de la navbar, ce dernier avait un overlay avec des angles arrondis
- Sur mobile, les utilisateurs avec des images de profils non carrées dépassait dans l'onglet Famille

* [UPDATE] Bump dict2xml from 1.7.2 to 1.7.3 (#592)

Bumps [dict2xml](https://github.com/delfick/python-dict2xml) from 1.7.2 to 1.7.3.
- [Release notes](https://github.com/delfick/python-dict2xml/releases)
- [Commits](https://github.com/delfick/python-dict2xml/compare/release-1.7.2...release-1.7.3)

---
updated-dependencies:
- dependency-name: dict2xml
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

* [UPDATE] Bump django-debug-toolbar from 3.8.1 to 4.0.0 (#593)

Bumps [django-debug-toolbar](https://github.com/jazzband/django-debug-toolbar) from 3.8.1 to 4.0.0.
- [Release notes](https://github.com/jazzband/django-debug-toolbar/releases)
- [Changelog](https://github.com/jazzband/django-debug-toolbar/blob/main/docs/changes.rst)
- [Commits](https://github.com/jazzband/django-debug-toolbar/compare/3.8.1...4.0.0)

---
updated-dependencies:
- dependency-name: django-debug-toolbar
  dependency-type: direct:development
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* [UPDATE] Bump cryptography from 37.0.4 to 40.0.1 (#594)

* [UPDATE] Bump cryptography from 37.0.4 to 40.0.1

Bumps [cryptography](https://github.com/pyca/cryptography) from 37.0.4 to 40.0.1.
- [Release notes](https://github.com/pyca/cryptography/releases)
- [Changelog](https://github.com/pyca/cryptography/blob/main/CHANGELOG.rst)
- [Commits](https://github.com/pyca/cryptography/compare/37.0.4...40.0.1)

---
updated-dependencies:
- dependency-name: cryptography
  dependency-type: direct:production
  update-type: version-update:semver-major
...

Signed-off-by: dependabot[bot] <support@github.com>

* Updated pyOpenSSL to match cryptography requirements

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Julien Constant <julienconstant190@gmail.com>

* Mise à jour de Black vers la version 23.3 (#629)

* update link for poetry install

* [UPDATE] Bump django-countries from 7.5 to 7.5.1 (#624)

Bumps [django-countries](https://github.com/SmileyChris/django-countries) from 7.5 to 7.5.1.
- [Release notes](https://github.com/SmileyChris/django-countries/releases)
- [Changelog](https://github.com/SmileyChris/django-countries/blob/main/CHANGES.rst)
- [Commits](https://github.com/SmileyChris/django-countries/compare/v7.5...v7.5.1)

---
updated-dependencies:
- dependency-name: django-countries
  dependency-type: direct:production
  update-type: version-update:semver-patch
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* [UPDATE] Bump sentry-sdk from 1.19.1 to 1.21.0

Bumps [sentry-sdk](https://github.com/getsentry/sentry-python) from 1.19.1 to 1.21.0.
- [Release notes](https://github.com/getsentry/sentry-python/releases)
- [Changelog](https://github.com/getsentry/sentry-python/blob/master/CHANGELOG.md)
- [Commits](https://github.com/getsentry/sentry-python/compare/1.19.1...1.21.0)

---
updated-dependencies:
- dependency-name: sentry-sdk
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>

* Speed up tests (#638)

* Better usage of cache for groups and clubs related operations (#634)

* Better usage of cache for group retrieval

* Cache clearing on object deletion or update

* replace signals by save and delete override

* add is_anonymous check in is_owned_by

Add in many is_owned_by(self, user) methods that user is not anonymous. Since many of those functions do db queries, this should reduce a little bit the load of the db.

* Stricter usage of User.is_in_group

Constrain the parameters that can be passed to the function to make sure only a str or an int can be used. Also force to explicitly specify if the group id or the group name is used.

* write test and correct bugs

* remove forgotten populate commands

* Correct test

* [FIX] Correction de bugs (#617)

* Fix #600

* Fix #602

* Fixes & améliorations du nouveau CSS (#616)

* Fix #604

* should fix #605

* Fix #608

* Update core/views/site.py

Co-Authored-By: thomas girod <56346771+imperosol@users.noreply.github.com>

* Added back the permission denied

* Should fix #609

* Fix failing test when 2 user are merged

* Should fix #610

* Should fix #627

* Should fix #109

Block les URLs suivantes lorsque le fichier se trouve dans le dir `profiles` ou `SAS` :
- `/file/<id>/`
- `/file/<id>/[delete|prop|edit]`

> Les urls du SAS restent accessiblent pour les roots & les admins SAS
> Les urls de profiles sont uniquement accessiblent aux roots

* Fix root dir of SAS being unnaccessible for sas admins

⚠️ need to edit the SAS directory & save it (no changes required in sas directory properties)

* Remove overwritten code

* Should fix duplicated albums in user profile (wtf)

* Fix typo

* Extended profiles picture access to board members

* Should fix #607

* Fix keyboard navigation not working properly

* Fix user tagged pictures section inside python rather than in the template

* Update utils.py

* Apply suggested changes

* Fix #604

* Fix #608

* Added back the permission denied

* Should fix duplicated albums in user profile (wtf)

* Fix user tagged pictures section inside python rather than in the template

* Apply suggested changes

---------

Co-authored-by: thomas girod <56346771+imperosol@users.noreply.github.com>

* Remove duplicated css

* Galaxy improvements (#628)

* galaxy: improve logging and performance reporting

* galaxy: add a full galaxy state test

* galaxy: optimize user self score computation

* galaxy: add 'generate_galaxy_test_data' command for development at scale

* galaxy: big refactor

Main changes:
  - Multiple Galaxy objects can now exist at the same time in DB. This allows for ruling a new galaxy while still
    displaying the old one.
  - The criteria to quickly know whether a user is a possible citizen is now a simple query on picture count. This
    avoids a very complicated query to database, that could often result in huge working memory load. With this change,
    it should be possible to run the galaxy even on a vanilla Postgres that didn't receive fine tuning for the Sith's
    galaxy.

* galaxy: template: make the galaxy graph work and be usable with a lot of stars

- Display focused star and its connections clearly
- Display star label faintly by default for other stars to avoid overloading the graph
- Hide non-focused lanes
- Avoid clicks on non-highlighted, too far stars
- Make the canva adapt its width to initial screen size, doesn't work dynamically

* galaxy: better docstrings

* galaxy: use bulk_create whenever possible

This is a big performance gain, especially for the tests.

Examples:

----

`./manage.py test galaxy.tests.GalaxyTest.test_full_galaxy_state`

Measurements averaged over 3 run on *my machine*™:
Before: 2min15s
After: 1m41s

----

`./manage.py generate_galaxy_test_data --user-pack-count 1`

Before: 48s
After: 25s

----

`./manage.py rule_galaxy` (for 600 citizen, corresponding to 1 user-pack)

Before: 14m4s
After: 12m34s

* core: populate: use a less ambiguous 'timezone.now()'

When running the tests around midnight, the day is changing, leading to some values being offset to the next day
depending on the timezone, and making some tests to fail. This ensure to use a less ambiguous `now` when populating
the database.

* write more extensive documentation

- add documentation to previously documented classes and functions and refactor some of the documented one, in accordance to the PEP257 and ReStructuredText standards ;
- add some type hints ;
- use a NamedTuple for the `Galaxy.compute_users_score` method instead of a raw tuple. Also change a little bit the logic in the function which call the latter ;
- add some additional parameter checks on a few functions ;
- change a little bit the logic of the log level setting for the galaxy related commands.

* galaxy: tests: split Model and View for more efficient data usage

---------

Co-authored-by: maréchal <thgirod@hotmail.com>

* [UPDATE] Bump libsass from 0.21.0 to 0.22.0 (#640)

Bumps [libsass](https://github.com/sass/libsass-python) from 0.21.0 to 0.22.0.
- [Release notes](https://github.com/sass/libsass-python/releases)
- [Changelog](https://github.com/sass/libsass-python/blob/main/docs/changes.rst)
- [Commits](https://github.com/sass/libsass-python/compare/0.21.0...0.22.0)

---
updated-dependencies:
- dependency-name: libsass
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* [FIX] Fix cached groups (#647)

* Bump sqlparse from 0.4.3 to 0.4.4 (#645)

Bumps [sqlparse](https://github.com/andialbrecht/sqlparse) from 0.4.3 to 0.4.4.
- [Release notes](https://github.com/andialbrecht/sqlparse/releases)
- [Changelog](https://github.com/andialbrecht/sqlparse/blob/master/CHANGELOG)
- [Commits](https://github.com/andialbrecht/sqlparse/compare/0.4.3...0.4.4)

---
updated-dependencies:
- dependency-name: sqlparse
  dependency-type: indirect
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* [UPDATE] Bump django-ordered-model from 3.6 to 3.7.4 (#625)

Bumps [django-ordered-model](https://github.com/django-ordered-model/django-ordered-model) from 3.6 to 3.7.4.
- [Release notes](https://github.com/django-ordered-model/django-ordered-model/releases)
- [Changelog](https://github.com/django-ordered-model/django-ordered-model/blob/master/CHANGES.md)
- [Commits](https://github.com/django-ordered-model/django-ordered-model/compare/3.6...3.7.4)

---
updated-dependencies:
- dependency-name: django-ordered-model
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>

* Fix immutable default variable in `get_start_of_semester` (#656)

Le serveur ne percevait pas le changement de semestre, parce
que la valeur par défaut passée à la fonction `get_start_of_semester()` était une fonction appelée une seule fois, lors du lancement du serveur. Bref, c'était ça : https://beta.ruff.rs/docs/rules/function-call-in-default-argument/

---------

Co-authored-by: imperosol <thgirod@hotmail.com>

* Add missing method on AnonymousUser (#649)

* Add eurocks partnership in the eboutic (#661)

* Add eurocks partnership in the eboutic (#661)

Revert "Add eurocks partnership in the eboutic (#661)"

This reverts commit 193c820757.

Add eurocks partnership in the eboutic (#661)

* Update workflow

Following this update : https://github.blog/changelog/2023-09-13-github-actions-updates-to-github_ref-and-github-ref/

* Update workflow

* Remove eurocks tickets from eboutic (event is finished)

* Links update & translations typos fixes (#671)

* Remove BDF link (as BDF is now part of AE)

* Remove unused pages

* Fix typos

* Fix typo again

---------

Signed-off-by: dependabot[bot] <support@github.com>
Co-authored-by: Thomas Girod <thgirod@hotmail.com>
Co-authored-by: thomas girod <56346771+imperosol@users.noreply.github.com>
Co-authored-by: Théo DURR <git@theodurr.fr>
Co-authored-by: Skia <skia@hya.sk>
Co-authored-by: dependabot[bot] <49699333+dependabot[bot]@users.noreply.github.com>
Co-authored-by: Bartuccio Antoine <klmp200@users.noreply.github.com>

.github/actions/setup_project/action.yml

@@ -6,13 +6,13 @@ runs:
     - name: Install apt packages
       uses: awalsh128/cache-apt-pkgs-action@latest
       with:
-        packages: gettext libxapian-dev libgraphviz-dev
+        packages: gettext libgraphviz-dev
-        version: 1.0  # increment to reset cache
+        version: 1.0 # increment to reset cache
 
     - name: Install dependencies
       run: |
         sudo apt update
-        sudo apt install gettext libxapian-dev libgraphviz-dev
+        sudo apt install gettext libgraphviz-dev
       shell: bash
 
     - name: Set up python
@@ -25,7 +25,7 @@ runs:
       uses: actions/cache@v3
       with:
         path: ~/.local
-        key: poetry-0  # increment to reset cache
+        key: poetry-0 # increment to reset cache
 
     - name: Install Poetry
       if: steps.cached-poetry.outputs.cache-hit != 'true'

.github/actions/setup_xapian/action.yml

@@ -1,10 +0,0 @@
-name: "Setup xapian"
-description: "Setup the xapian indexes"
-runs:
-  using: composite
-  steps:
-    - name: Setup xapian index
-      run: |
-        mkdir -p /dev/shm/search_indexes
-        ln -s /dev/shm/search_indexes sith/search_indexes
-      shell: bash

.github/workflows/ci.yml

@@ -2,7 +2,7 @@ name: Sith 3 CI
 
 on:
   push:
-    branches: [master, taiste]
+    branches: [master, taiste, features/**]
   pull_request:
     branches: [master, taiste]
   workflow_dispatch:
@@ -21,11 +21,16 @@ jobs:
   tests:
     name: Run tests and generate coverage report
     runs-on: ubuntu-latest
+    container:
+      image: docker.elastic.co/elasticsearch/elasticsearch:7.17.14
+      env:
+        discovery.type: single-node
+      ports:
+        - 9200
     steps:
       - name: Check out repository
         uses: actions/checkout@v3
       - uses: ./.github/actions/setup_project
-      - uses: ./.github/actions/setup_xapian
       - uses: ./.github/actions/compile_messages
       - name: Run tests
         run: poetry run coverage run ./manage.py test

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 }}

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>

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>

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='utbm-associations') }}">{% trans %}Others UTBM's Associations{% 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>
                             </ul>
                         </div>
                         <div class="menu">

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 %}

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 %}

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>

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/>

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 %}

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>

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>

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 %}

eboutic/templates/eboutic/eboutic_main.jinja

@@ -90,24 +90,6 @@
                 </div>
             {% endif %}
 
-            <section>
-                <div class="category-header">
-                    <h3>Partenariat Eurockéenes</h3>
-                    <br>
-                    {% if user.is_subscribed %}
-                        <a title="Logiciel billetterie en ligne"
-                            href="https://widget.weezevent.com/ticket/6e2917c4-03bf-42b4-aebb-27ee8353b022?id_evenement=1013910&locale=fr-FR&code=11855"
-                            class="weezevent-widget-integration" target="_blank"
-                            data-src="https://widget.weezevent.com/ticket/6e2917c4-03bf-42b4-aebb-27ee8353b022?id_evenement=1013910&locale=fr-FR&code=11855"
-                            data-width="650" data-height="600" data-resize="1" data-nopb="0" data-type="neo" data-width_auto="1"
-                            data-noscroll="0" data-id="1013910">Billetterie Weezevent</a>
-                        <script type="text/javascript" src="https://widget.weezevent.com/weez.js" async defer></script>
-                    {% else %}
-                        <div>Vous devez être cotisant pour accéder à la billeterie des Eurockéennes</div>
-                    {% endif %}
-                </div>
-            </section>
-
             {% for priority_groups in products|groupby('priority')|reverse %}
                 {% for category, items in priority_groups.list|groupby('category') %}
                     {% if items|count > 0 %}

locale/fr/LC_MESSAGES/django.po

@@ -63,7 +63,7 @@ msgstr "IBAN"
 
 #: accounting/models.py:112
 msgid "account number"
-msgstr "numero de compte"
+msgstr "numéro de compte"
 
 #: accounting/models.py:116 accounting/models.py:147 club/models.py:275
 #: com/models.py:75 com/models.py:266 com/models.py:302 counter/models.py:273
@@ -1173,7 +1173,7 @@ msgstr "Au"
 #: club/templates/club/club_sellings.jinja:5 club/views.py:154
 #: club/views.py:483 counter/templates/counter/counter_main.jinja:24
 #: counter/templates/counter/last_ops.jinja:41
-msgid "Sellings"
+msgid "Sales"
 msgstr "Ventes"
 
 #: club/templates/club/club_sellings.jinja:9 club/templates/club/stats.jinja:19
@@ -1278,7 +1278,7 @@ msgid "Counters:"
 msgstr "Comptoirs : "
 
 #: club/templates/club/club_tools.jinja:33
-msgid "Accouting: "
+msgid "Accounting: "
 msgstr "Comptabilité : "
 
 #: club/templates/club/club_tools.jinja:41
@@ -1295,8 +1295,8 @@ msgid ""
 "not shown wait until moderation takes action"
 msgstr ""
 "Rappelez vous : les mailing listes doivent être modérées, si votre liste "
-"nouvellement créee n'est pas affichée, attendez jusqu'à qu'un modérateur "
+"nouvellement créée n'est pas affichée, attendez jusqu'à ce qu'un modérateur "
-"entre en action"
+"prenne une décision"
 
 #: club/templates/club/mailing.jinja:13
 msgid "Mailing lists waiting for moderation"
@@ -1671,8 +1671,8 @@ msgid "Moderator: "
 msgstr "Modérateur : "
 
 #: com/templates/com/news_detail.jinja:42
-msgid "Edit (will be remoderated)"
+msgid "Edit (will be moderated again)"
-msgstr "Éditer (sera resoumise à modération)"
+msgstr "Éditer (sera soumise de nouveau à la modération)"
 
 #: com/templates/com/news_edit.jinja:6 com/templates/com/news_edit.jinja:29
 msgid "Edit news"
@@ -1680,7 +1680,7 @@ msgstr "Éditer la nouvelle"
 
 #: com/templates/com/news_edit.jinja:39
 msgid "Notice: Information, election result - no date"
-msgstr "Information, resultat d'élection - sans date"
+msgstr "Information, résultat d'élection - sans date"
 
 #: com/templates/com/news_edit.jinja:40
 msgid "Event: punctual event, associated with one date"
@@ -1951,7 +1951,7 @@ msgstr "T'es fou? Un événement ne peut pas finir avant même de commencer."
 
 #: com/views.py:466
 msgid "Delete and save to regenerate"
-msgstr "Supprimer et sauver pour regénérer"
+msgstr "Supprimer et sauver pour régénérer"
 
 #: com/views.py:481
 msgid "Weekmail of the "
@@ -2036,7 +2036,7 @@ msgid ""
 "Designates whether this user should be treated as active. Unselect this "
 "instead of deleting accounts."
 msgstr ""
-"Est-ce que l'utilisateur doit être traité comme actif. Déselectionnez au "
+"Est-ce que l'utilisateur doit être traité comme actif. Désélectionnez au "
 "lieu de supprimer les comptes."
 
 #: core/models.py:185
@@ -2085,7 +2085,7 @@ msgstr "pronoms"
 
 #: core/models.py:234
 msgid "tshirt size"
-msgstr "taille de tshirt"
+msgstr "taille de t-shirt"
 
 #: core/models.py:237
 msgid "-"
@@ -2426,7 +2426,7 @@ msgstr "Voir plus"
 #: core/templates/core/base.jinja:122
 #: forum/templates/forum/last_unread.jinja:17
 msgid "Mark all as read"
-msgstr "Marquer tout commme lu"
+msgstr "Marquer tout comme lu"
 
 #: core/templates/core/base.jinja:132
 msgid "Logout"
@@ -2440,33 +2440,17 @@ msgstr "Accueil"
 msgid "Associations & Clubs"
 msgstr "Associations & Clubs"
 
-#: core/templates/core/base.jinja:173
+#: core/templates/core/base.jinja:204
 msgid "AE"
 msgstr "L'AE"
 
-#: core/templates/core/base.jinja:174
+#: core/templates/core/base.jinja:205
 msgid "AE's clubs"
 msgstr "Les clubs de L'AE"
 
-#: core/templates/core/base.jinja:175
+#: core/templates/core/base.jinja:206
-msgid "BdF"
+msgid "Others UTBM's Associations"
-msgstr "Le BdF"
+msgstr "Les autres associations de l'UTBM"
-
-#: core/templates/core/base.jinja:176
-msgid "BDS"
-msgstr "Le BDS"
-
-#: core/templates/core/base.jinja:177
-msgid "CETU"
-msgstr "Le CETU"
-
-#: core/templates/core/base.jinja:178
-msgid "Doceo"
-msgstr "Doceo"
-
-#: core/templates/core/base.jinja:179
-msgid "Positions"
-msgstr "Postes à pourvoir"
 
 #: core/templates/core/base.jinja:187 core/templates/core/user_tools.jinja:118
 msgid "Elections"
@@ -2780,7 +2764,7 @@ msgstr "Cotisant jusqu'au %(subscription_end)s"
 
 #: core/templates/core/macros.jinja:86 core/templates/core/user_edit.jinja:40
 msgid "Account number: "
-msgstr "Numero de compte : "
+msgstr "Numéro de compte : "
 
 #: core/templates/core/macros.jinja:91 launderette/models.py:217
 msgid "Slot"
@@ -3004,7 +2988,7 @@ msgstr "Bienvenue, %(user_name)s!"
 
 #: core/templates/core/register.jinja:10
 msgid ""
-"You successfully registred and you will soon receive a confirmation mail."
+"You successfully registered and you will soon receive a confirmation mail."
 msgstr ""
 "Vous vous êtes correctement enregistré, et vous devriez recevoir rapidement "
 "un email de confirmation."
@@ -3063,14 +3047,14 @@ msgstr "Compte utilisateur"
 
 #: core/templates/core/user_account.jinja:44
 #: core/templates/core/user_account_detail.jinja:13
-msgid "Account buyings"
+msgid "Account purchases"
-msgstr "Achat sur compte utilisateur"
+msgstr "Achats du compte"
 
 #: core/templates/core/user_account.jinja:48
 #: core/templates/core/user_account_detail.jinja:46
 #: counter/templates/counter/cash_summary_list.jinja:17
 #: counter/templates/counter/last_ops.jinja:16
-msgid "Refillings"
+msgid "Reloads"
 msgstr "Rechargements"
 
 #: core/templates/core/user_account.jinja:53
@@ -4114,7 +4098,7 @@ msgstr "Nouveau comptoir"
 #: counter/templates/counter/counter_list.jinja:22
 #: counter/templates/counter/counter_list.jinja:44
 #: counter/templates/counter/refilling_list.jinja:5
-msgid "Refillings list"
+msgid "Reloads list"
 msgstr "Liste de rechargements"
 
 #: counter/templates/counter/counter_list.jinja:27
@@ -5033,7 +5017,7 @@ msgid ""
 "The code of an UV must only contains uppercase characters without accent and "
 "numbers"
 msgstr ""
-"Le code d'une UV doit seulement contenire des caractères majuscule sans "
+"Le code d'une UV doit seulement contenir des caractères majuscule sans "
 "accents et nombres"
 
 #: pedagogy/models.py:67
@@ -5058,7 +5042,7 @@ msgstr "département"
 
 #: pedagogy/models.py:103
 msgid "objectives"
-msgstr "objecifs"
+msgstr "objectifs"
 
 #: pedagogy/models.py:104
 msgid "program"
@@ -5094,7 +5078,7 @@ msgstr "heures TE"
 
 #: pedagogy/models.py:217 pedagogy/models.py:291
 msgid "uv"
-msgstr "uv"
+msgstr "UE"
 
 #: pedagogy/models.py:221
 msgid "global grade"
@@ -5153,7 +5137,7 @@ msgstr "%(credit_type)s"
 #: pedagogy/templates/pedagogy/guide.jinja:59
 #: pedagogy/templates/pedagogy/moderation.jinja:12
 msgid "UV"
-msgstr "UV"
+msgstr "UE"
 
 #: pedagogy/templates/pedagogy/guide.jinja:61
 msgid "Department"
@@ -5253,8 +5237,8 @@ msgid "Key concepts"
 msgstr "Concepts clefs"
 
 #: pedagogy/templates/pedagogy/uv_detail.jinja:79
-msgid "UV manager: "
+msgid "UE manager: "
-msgstr "Gestionnaire d'UV : "
+msgstr "Gestionnaire d'UE : "
 
 #: pedagogy/templates/pedagogy/uv_detail.jinja:86 pedagogy/tests.py:453
 msgid ""
@@ -5284,23 +5268,23 @@ msgstr "Signaler ce commentaire"
 
 #: pedagogy/templates/pedagogy/uv_edit.jinja:4
 #: pedagogy/templates/pedagogy/uv_edit.jinja:8
-msgid "Edit UV"
+msgid "Edit UE"
-msgstr "Éditer"
+msgstr "Éditer l'UE"
 
 #: pedagogy/templates/pedagogy/uv_edit.jinja:27
 msgid "Import from UTBM"
 msgstr "Importer depuis l'UTBM"
 
 #: pedagogy/templates/pedagogy/uv_edit.jinja:62
-msgid "Unknown UV code"
+msgid "Unknown UE code"
-msgstr "Code d'UV inconnu"
+msgstr "Code d'UE inconnu"
 
 #: pedagogy/templates/pedagogy/uv_edit.jinja:77
 msgid "Successful autocomplete"
 msgstr "Autocomplétion réussite"
 
 #: pedagogy/templates/pedagogy/uv_edit.jinja:80
-msgid "An error occured: "
+msgid "An error occurred: "
 msgstr "Une erreur est survenue : "
 
 #: rootplace/templates/rootplace/delete_user_messages.jinja:8
@@ -5566,7 +5550,7 @@ msgstr "Automne et printemps"
 
 #: sith/settings.py:448
 msgid "German"
-msgstr "Allemant"
+msgstr "Allemand"
 
 #: sith/settings.py:449
 msgid "Spanish"

pedagogy/templates/pedagogy/uv_detail.jinja

@@ -76,7 +76,7 @@
 				<p>{{ object.skills|markdown }}</p>
 				<p><b>{% trans %}Key concepts{% endtrans %}</b></p>
 				<p>{{ object.key_concepts|markdown }}</p>
-				<p><b>{% trans %}UV manager: {% endtrans %}</b>{{ object.manager }}</p>
+				<p><b>{% trans %}UE manager: {% endtrans %}</b>{{ object.manager }}</p>
 			</div>
 		</div>
 

pedagogy/templates/pedagogy/uv_edit.jinja

@@ -1,11 +1,11 @@
 {% extends "core/base.jinja" %}
 
 {% block title %}
-{% trans %}Edit UV{% endtrans %}
+{% trans %}Edit UE{% endtrans %}
 {% endblock %}
 
 {% block content %}
-<h2>{% trans %}Edit UV{% endtrans %}</h2>
+<h2>{% trans %}Edit UE{% endtrans %}</h2>
 <form action="" method="post" enctype="multipart/form-data" id="uv_edit">
     {% csrf_token %}
     {{ form.non_field_errors() }}
@@ -59,7 +59,7 @@
                 url: url,
                 success: function(data, _, xhr) {
                     if (xhr.status != 200) {
-                        createQuickNotif("{% trans %}Unknown UV code{% endtrans %}")
+                        createQuickNotif("{% trans %}Unknown UE code{% endtrans %}")
                         return
                     }
                     for (let key in data) {
@@ -77,7 +77,7 @@
                     createQuickNotif('{% trans %}Successful autocomplete{% endtrans %}')
                 },
                 error: function(_, _, statusMessage) {
-                    createQuickNotif('{% trans %}An error occured: {% endtrans %}' + statusMessage)
+                    createQuickNotif('{% trans %}An error occurred: {% endtrans %}' + statusMessage)
                 },
             })
         })

poetry.lock

@@ -1,4 +1,4 @@
-# This file is automatically @generated by Poetry 1.5.1 and should not be changed by hand.
+# This file is automatically @generated by Poetry 1.6.1 and should not be changed by hand.
 
 [[package]]
 name = "alabaster"
@@ -1526,30 +1526,6 @@ files = [
     {file = "wcwidth-0.2.5.tar.gz", hash = "sha256:c4d647b99872929fdb7bdcaa4fbe7f01413ed3d98077df798530e5b04f116c83"},
 ]
 
-[[package]]
-name = "xapian-bindings"
-version = "0.1.0"
-description = "Meta-package to build and install xapian-bindings extension."
-optional = false
-python-versions = "*"
-files = [
-    {file = "xapian-bindings-0.1.0.tar.gz", hash = "sha256:f2b0396082ebf4f6681ab43d6d8fd1f63b6964b18c32c91236ed067c6f62ad14"},
-]
-
-[[package]]
-name = "xapian-haystack"
-version = "3.0.1"
-description = "A Xapian backend for Haystack"
-optional = false
-python-versions = "*"
-files = [
-    {file = "xapian-haystack-3.0.1.tar.gz", hash = "sha256:a5c0e1262b95008df4dfeb58d093c654acee3f2b27ea3f7d366900895cdc70f9"},
-]
-
-[package.dependencies]
-django = ">=2.2"
-django-haystack = ">=2.8.0"
-
 [[package]]
 name = "zipp"
 version = "3.11.0"
@@ -1572,4 +1548,4 @@ testing = ["coverage"]
 [metadata]
 lock-version = "2.0"
 python-versions = "^3.8"
-content-hash = "62519616aff5a472dac3dd8071a6404b1ee8eab12a197af717a0520f7ded0331"
+content-hash = "32bf0229e7ac812ea278a36587c184cd4ae507f87816f573447e85cd5312e52c"

pyproject.toml

@@ -33,8 +33,6 @@ phonenumbers = "^8.12"
 django-ajax-selects = "^2.1.0"
 reportlab = "^3.6"
 django-haystack = "^3.2.1"
-xapian-haystack = "^3.0.1"
-xapian-bindings = "^0.1.0"
 libsass = "^0.22"
 django-ordered-model = "^3.7"
 django-simple-captcha = "^0.5.17"

sith/settings.py

@@ -191,9 +191,9 @@ TEMPLATES = [
 
 HAYSTACK_CONNECTIONS = {
     "default": {
-        "ENGINE": "xapian_backend.XapianEngine",
+        "ENGINE": "haystack.backends.elasticsearch7_backend.Elasticsearch7SearchEngine",
-        "PATH": os.path.join(os.path.dirname(__file__), "search_indexes", "xapian"),
+        'URL': 'http://localhost:9200/',
-        "INCLUDE_SPELLING": True,
+        'INDEX_NAME': 'haystack',
     }
 }