README.md

@@ -267,18 +267,14 @@ La documentation plus haut niveau sur le développement est disponible sur [le W
 
 ### Regénérer les fichiers de traduction
 
-Pour regénérer les traductions vous pouvez vous placer à la racine du projet et lancer le script `makemessages`.
+Pour regénérer les traductions vous pouvez vous placer à la racine du projet et lancer le script `makemessages`. Il faut penser à ignorer les dossiers ne contenant pas notre code, dont le virtualenv.
-Il faut penser à ignorer les dossiers ne contenant pas notre code, dont le virtualenv.
-De plus, il faut aussi extraire les variables des fichiers JavaScript.
 
 ```bash
-python3 manage.py makemessages -i env
+django-admin makemessages -i env
-python3 manage.py makemessages -i env -e js -d djangojs
 ```
 
 Une fois les fichiers édités, vous pouvez compiler les nouvelles traductions avec
 
 ```bash
-python3 manage.py compilemessages
+django-admin compilemessages
-python3 manage.py compilejsmessages
 ```

ansible/roles/7-postinstall/tasks/main.yml

@@ -1,10 +1,4 @@
 ---
-- name: Collect static files
-  command: /var/www/note_kfet/env/bin/python manage.py collectstatic --noinput
-  args:
-    chdir: /var/www/note_kfet
-  become_user: www-data
-
 - name: Migrate Django database
   command: /var/www/note_kfet/env/bin/python manage.py migrate
   args:
@@ -17,14 +11,14 @@
     chdir: /var/www/note_kfet
   become_user: www-data
 
-- name: Compile JavaScript messages
-  command: /var/www/note_kfet/env/bin/python manage.py compilejsmessages
-  args:
-    chdir: /var/www/note_kfet
-  become_user: www-data
-
 - name: Install initial fixtures
   command: /var/www/note_kfet/env/bin/python manage.py loaddata initial
   args:
     chdir: /var/www/note_kfet
   become_user: postgres
+
+- name: Collect static files
+  command: /var/www/note_kfet/env/bin/python manage.py collectstatic --noinput
+  args:
+    chdir: /var/www/note_kfet
+  become_user: www-data

apps/activity/templates/activity/activity_detail.html

@@ -30,7 +30,7 @@ SPDX-License-Identifier: GPL-3.0-or-later
          headers: {"X-CSRFTOKEN": CSRF_TOKEN}
      })
       .done(function() {
-          addMsg('{% trans "Guest deleted" %}', 'success');
+          addMsg('Invité supprimé','success');
           $("#guests_table").load(location.pathname + " #guests_table");
       })
       .fail(function(xhr, textStatus, error) {

apps/activity/templates/activity/activity_entry.html

@@ -86,10 +86,10 @@ SPDX-License-Identifier: GPL-3.0-or-later
                 }).done(function () {
                     if (target.hasClass("table-info"))
                         addMsg(
-                            "{% trans "Entry done, but caution: the user is not a Kfet member." %}",
+                            "Entrée effectuée, mais attention : la personne n'est plus adhérente Kfet.",
                             "warning", 10000);
                     else
-                        addMsg("Entry made!", "success", 4000);
+                        addMsg("Entrée effectuée !", "success", 4000);
                     reloadTable(true);
                 }).fail(function (xhr) {
                     errMsg(xhr.responseJSON, 4000);
@@ -121,10 +121,10 @@ SPDX-License-Identifier: GPL-3.0-or-later
                     }).done(function () {
                         if (target.hasClass("table-info"))
                             addMsg(
-                                "{% trans "Entry done, but caution: the user is not a Kfet member." %}",
+                                "Entrée effectuée, mais attention : la personne n'est plus adhérente Kfet.",
                                 "warning", 10000);
                         else
-                            addMsg("{% trans "Entry done!" %}", "success", 4000);
+                            addMsg("Entrée effectuée !", "success", 4000);
                         reloadTable(true);
                     }).fail(function (xhr) {
                         errMsg(xhr.responseJSON, 4000);

apps/member/static/member/js/alias.js

@@ -14,7 +14,7 @@ function create_alias (e) {
   }).done(function () {
     // Reload table
     $('#alias_table').load(location.pathname + ' #alias_table')
-    addMsg(gettext('Alias successfully added'), 'success')
+    addMsg('Alias ajouté', 'success')
   }).fail(function (xhr, _textStatus, _error) {
     errMsg(xhr.responseJSON)
   })
@@ -22,7 +22,7 @@ function create_alias (e) {
 
 /**
  * On click of "delete", delete the alias
- * @param button_id:Integer Alias id to remove
+ * @param Integer button_id Alias id to remove
  */
 function delete_button (button_id) {
   $.ajax({
@@ -30,7 +30,7 @@ function delete_button (button_id) {
     method: 'DELETE',
     headers: { 'X-CSRFTOKEN': CSRF_TOKEN }
   }).done(function () {
-    addMsg(gettext('Alias successfully deleted'), 'success')
+    addMsg('Alias supprimé', 'success')
     $('#alias_table').load(location.pathname + ' #alias_table')
   }).fail(function (xhr, _textStatus, _error) {
     errMsg(xhr.responseJSON)

apps/note/static/note/js/consos.js

@@ -222,14 +222,17 @@ function consume (source, source_alias, dest, quantity, amount, reason, type, ca
       if (!isNaN(source.balance)) {
         const newBalance = source.balance - quantity * amount
         if (newBalance <= -5000) {
-          addMsg(interpolate(gettext('Warning, the transaction from the note %s succeed, ' +
+          addMsg('Attention, La transaction depuis la note ' + source_alias + ' a été réalisée avec ' +
-              'but the emitter note %s is very negative.', [source_alias, source_alias])), 'danger', 30000)
+                        'succès, mais la note émettrice ' + source_alias + ' est en négatif sévère.',
+          'danger', 30000)
         } else if (newBalance < 0) {
-          addMsg(interpolate(gettext('Warning, the transaction from the note %s succeed, ' +
+          addMsg('Attention, La transaction depuis la note ' + source_alias + ' a été réalisée avec ' +
-              'but the emitter note %s is negative.', [source_alias, source_alias])), 'warning', 30000)
+                        'succès, mais la note émettrice ' + source_alias + ' est en négatif.',
+          'warning', 30000)
         }
         if (source.membership && source.membership.date_end < new Date().toISOString()) {
-          addMsg(interpolate(gettext('Warning, the emitter note %s is no more a BDE member.', [source_alias])), 'danger', 30000)
+          addMsg('Attention : la note émettrice ' + source.name + " n'est plus adhérente.",
+            'danger', 30000)
         }
       }
       reset()
@@ -250,7 +253,7 @@ function consume (source, source_alias, dest, quantity, amount, reason, type, ca
           template: template
         }).done(function () {
         reset()
-        addMsg(gettext("The transaction couldn't be validated because of insufficient balance."), 'danger', 10000)
+        addMsg("La transaction n'a pas pu être validée pour cause de solde insuffisant.", 'danger', 10000)
       }).fail(function () {
         reset()
         errMsg(e.responseJSON)

apps/note/static/note/js/transfer.js

@@ -239,20 +239,20 @@ $('#btn_transfer').click(function () {
 
   if (!amount_field.val() || isNaN(amount_field.val()) || amount_field.val() <= 0) {
     amount_field.addClass('is-invalid')
-    $('#amount-required').html('<strong>' + gettext('This field is required and must contain a decimal positive number.') + '</strong>')
+    $('#amount-required').html('<strong>Ce champ est requis et doit comporter un nombre décimal strictement positif.</strong>')
     error = true
   }
 
   const amount = Math.floor(100 * amount_field.val())
   if (amount > 2147483647) {
     amount_field.addClass('is-invalid')
-    $('#amount-required').html('<strong>' + gettext('The amount must stay under 21,474,836.47 €.') + '</strong>')
+    $('#amount-required').html('<strong>Le montant ne doit pas excéder 21474836.47 €.</strong>')
     error = true
   }
 
   if (!reason_field.val() && $('#type_transfer').is(':checked')) {
     reason_field.addClass('is-invalid')
-    $('#reason-required').html('<strong>' + gettext('This field is required.') + '</strong>')
+    $('#reason-required').html('<strong>Ce champ est requis.</strong>')
     error = true
   }
 
@@ -278,8 +278,9 @@ $('#btn_transfer').click(function () {
     [...sources_notes_display].forEach(function (source) {
       [...dests_notes_display].forEach(function (dest) {
         if (source.note.id === dest.note.id) {
-          addMsg(interpolate(gettext('Warning: the transaction of %s from %s to %s was not made because ' +
+          addMsg('Attention : la transaction de ' + pretty_money(amount) + ' de la note ' + source.name +
-              'it is the same source and destination note.'), [pretty_money(amount), source.name, dest.name]), 'warning', 10000)
+                        ' vers la note ' + dest.name + " n'a pas été faite car il s'agit de la même note au départ" +
+                        " et à l'arrivée.", 'warning', 10000)
           LOCK = false
           return
         }
@@ -299,35 +300,43 @@ $('#btn_transfer').click(function () {
             destination_alias: dest.name
           }).done(function () {
           if (source.note.membership && source.note.membership.date_end < new Date().toISOString()) {
-            addMsg(interpolate(gettext('Warning, the emitter note %s is no more a BDE member.'), [source.name]), 'danger', 30000)
+            addMsg('Attention : la note émettrice ' + source.name + " n'est plus adhérente.",
+              'danger', 30000)
           }
           if (dest.note.membership && dest.note.membership.date_end < new Date().toISOString()) {
-            addMsg(interpolate(gettext('Warning, the destination note %s is no more a BDE member.'), [source.name]), 'danger', 30000)
+            addMsg('Attention : la note destination ' + dest.name + " n'est plus adhérente.",
+              'danger', 30000)
           }
 
           if (!isNaN(source.note.balance)) {
             const newBalance = source.note.balance - source.quantity * dest.quantity * amount
             if (newBalance <= -5000) {
-              addMsg(interpolate(gettext('Warning, the transaction of %s from the note %s to the note %s succeed, but the emitter note %s is very negative.'),
+              addMsg('Le transfert de ' +
-                  [pretty_money(source.quantity * dest.quantity * amount), source.name, dest.name, source.name]), 'danger', 10000)
+                                    pretty_money(source.quantity * dest.quantity * amount) + ' de la note ' +
+                                    source.name + ' vers la note ' + dest.name + ' a été fait avec succès, ' +
+                                    'mais la note émettrice est en négatif sévère.', 'danger', 10000)
               reset()
               return
             } else if (newBalance < 0) {
-              addMsg(interpolate(gettext('Warning, the transaction of %s from the note %s to the note %s succeed, but the emitter note %s is negative.'),
+              addMsg('Le transfert de ' +
-                  [pretty_money(source.quantity * dest.quantity * amount), source.name, dest.name, source.name]), 'danger', 10000)
+                                    pretty_money(source.quantity * dest.quantity * amount) + ' de la note ' +
+                                    source.name + ' vers la note ' + dest.name + ' a été fait avec succès, ' +
+                                    'mais la note émettrice est en négatif.', 'warning', 10000)
               reset()
               return
             }
           }
-          addMsg(interpolate(gettext('Transfer of %s from %s to %s succeed!'),
+          addMsg('Le transfert de ' +
-              [pretty_money(source.quantity * dest.quantity * amount), source.name, dest.name]), 'success', 10000)
+                            pretty_money(source.quantity * dest.quantity * amount) + ' de la note ' + source.name +
+                            ' vers la note ' + dest.name + ' a été fait avec succès !', 'success', 10000)
 
           reset()
         }).fail(function (err) { // do it again but valid = false
           const errObj = JSON.parse(err.responseText)
           if (errObj.non_field_errors) {
-            addMsg(interpolate(gettext('Transfer of %s from %s to %s failed: %s'),
+            addMsg('Le transfert de ' +
-                [pretty_money(source.quantity * dest.quantity * amount), source.name, dest.name, errObj.non_field_errors]), 'danger')
+                                pretty_money(source.quantity * dest.quantity * amount) + ' de la note ' + source.name +
+                                ' vers la note ' + dest.name + ' a échoué : ' + errObj.non_field_errors, 'danger')
             LOCK = false
             return
           }
@@ -347,15 +356,17 @@ $('#btn_transfer').click(function () {
               destination: dest.note.id,
               destination_alias: dest.name
             }).done(function () {
-            addMsg(interpolate(gettext('Transfer of %s from %s to %s failed: %s'),
+            addMsg('Le transfert de ' +
-                [pretty_money(source.quantity * dest.quantity * amount), source.name, + dest.name, gettext('insufficient funds')]), 'danger', 10000)
+                                pretty_money(source.quantity * dest.quantity * amount) + ' de la note ' + source.name +
+                                ' vers la note ' + dest.name + ' a échoué : Solde insuffisant', 'danger', 10000)
             reset()
           }).fail(function (err) {
             const errObj = JSON.parse(err.responseText)
             let error = errObj.detail ? errObj.detail : errObj.non_field_errors
             if (!error) { error = err.responseText }
-            addMsg(interpolate(gettext('Transfer of %s from %s to %s failed: %s'),
+            addMsg('Le transfert de ' +
-                [pretty_money(source.quantity * dest.quantity * amount), source.name, + dest.name, error]), 'danger')
+                                pretty_money(source.quantity * dest.quantity * amount) + ' de la note ' + source.name +
+                                ' vers la note ' + dest.name + ' a échoué : ' + error, 'danger')
             LOCK = false
           })
         })
@@ -401,14 +412,14 @@ $('#btn_transfer').click(function () {
         first_name: $('#first_name').val(),
         bank: $('#bank').val()
       }).done(function () {
-      addMsg(gettext('Credit/debit succeed!'), 'success', 10000)
+      addMsg('Le crédit/retrait a bien été effectué !', 'success', 10000)
-      if (user_note.membership && user_note.membership.date_end < new Date().toISOString()) { addMsg(gettext('Warning, the emitter note %s is no more a BDE member.'), 'danger', 10000) }
+      if (user_note.membership && user_note.membership.date_end < new Date().toISOString()) { addMsg('Attention : la note ' + alias + " n'est plus adhérente.", 'danger', 10000) }
       reset()
     }).fail(function (err) {
       const errObj = JSON.parse(err.responseText)
       let error = errObj.detail ? errObj.detail : errObj.non_field_errors
       if (!error) { error = err.responseText }
-      addMsg(interpolate(gettext('Credit/debit failed: %s'), [error]), 'danger', 10000)
+      addMsg('Le crédit/retrait a échoué : ' + error, 'danger', 10000)
       LOCK = false
     })
   }

apps/permission/fixtures/initial.json

@@ -2855,22 +2855,6 @@
 			"description": "Voir n'importe quel utilisateur qui est adhérent BDE"
 		}
 	},
-	{
-		"model": "permission.permission",
-		"pk": 183,
-		"fields": {
-			"model": [
-				"note",
-				"note"
-			],
-			"query": "{}",
-			"type": "change",
-			"mask": 1,
-			"field": "display_image",
-			"permanent": false,
-			"description": "Changer l'image de n'importe quelle note"
-		}
-	},
 	{
 		"model": "permission.role",
 		"pk": 1,
@@ -3086,8 +3070,7 @@
 				175,
 				176,
 				177,
-				178,
+				178
-				183
 			]
 		}
 	},
@@ -3270,12 +3253,7 @@
 				175,
 				176,
 				177,
-				178,
+				178
-				179,
-				180,
-				181,
-				182,
-				183
 			]
 		}
 	},

apps/scripts

@@ -1 +1 @@
-Subproject commit dbe7bf65917df40b0ce476f357d04726e20b406f
+Subproject commit 654492f9e9262c37fecb43261f02557aeb6e1cc1

entrypoint.sh

@@ -14,7 +14,6 @@ fi
 # Set up Django project
 python3 manage.py collectstatic --noinput
 python3 manage.py compilemessages
-python3 manage.py compilejsmessages
 python3 manage.py migrate
 
 if [ "$1" ]; then

locale/de/LC_MESSAGES/django.po

@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-11-15 23:26+0100\n"
+"POT-Creation-Date: 2020-10-07 11:42+0200\n"
-"PO-Revision-Date: 2020-11-16 20:02+0000\n"
+"PO-Revision-Date: 2020-09-13 12:39+0200\n"
-"Last-Translator: Yohann D'ANELLO <ynerant@crans.org>\n"
+"Last-Translator: elkmaennchen <elkmaennchen@crans.org>\n"
-"Language-Team: German <http://translate.ynerant.fr/projects/nk20/nk20/de/>\n"
+"Language-Team: \n"
 "Language: de\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Weblate 4.3.2\n"
+"X-Generator: Poedit 2.3\n"
 
 #: apps/activity/apps.py:10 apps/activity/models.py:151
 #: apps/activity/models.py:167
@@ -46,7 +46,7 @@ msgstr "Diese Person wurde schon eingeladen."
 
 #: apps/activity/forms.py:97 apps/activity/models.py:289
 msgid "You can't invite more than 3 people to this activity."
-msgstr "Sie dürfen höchstens 3 Leute zu dieser Veranstaltung einladen."
+msgstr "Sie dürfen höchstens 3 Leute  zu dieser Veranstaltung einladen."
 
 #: apps/activity/models.py:28 apps/activity/models.py:63
 #: apps/member/models.py:199
@@ -101,7 +101,7 @@ msgstr "Ort"
 
 #: apps/activity/models.py:76
 msgid "Place where the activity is organized, eg. Kfet."
-msgstr "Wo findet die Veranstaltung statt ? (z.B Kfet)."
+msgstr "Wo findet die Veranstaltung statt ? (z.B Kfet)"
 
 #: apps/activity/models.py:83
 #: apps/activity/templates/activity/includes/activity_info.html:22
@@ -279,17 +279,11 @@ msgstr "Kontostand"
 msgid "Guests list"
 msgstr "Gastliste"
 
-#: apps/activity/templates/activity/activity_detail.html:33
-#, fuzzy
-#| msgid "Guests list"
-msgid "Guest deleted"
-msgstr "Gastliste"
-
 #: apps/activity/templates/activity/activity_entry.html:14
 #: apps/note/models/transactions.py:256
 #: apps/note/templates/note/transaction_form.html:16
 #: apps/note/templates/note/transaction_form.html:148
-#: note_kfet/templates/base.html:73
+#: note_kfet/templates/base.html:70
 msgid "Transfer"
 msgstr "Überweisen"
 
@@ -314,17 +308,6 @@ msgstr "Eintritte"
 msgid "Return to activity page"
 msgstr "Zurück zur Veranstaltungseite"
 
-#: apps/activity/templates/activity/activity_entry.html:89
-#: apps/activity/templates/activity/activity_entry.html:124
-msgid "Entry done, but caution: the user is not a Kfet member."
-msgstr ""
-
-#: apps/activity/templates/activity/activity_entry.html:127
-#, fuzzy
-#| msgid "Entry page"
-msgid "Entry done!"
-msgstr "Eintrittseite"
-
 #: apps/activity/templates/activity/activity_form.html:16
 #: apps/member/templates/member/add_members.html:46
 #: apps/member/templates/member/club_form.html:16
@@ -376,11 +359,11 @@ msgstr "Schlusss"
 
 #: apps/activity/templates/activity/includes/activity_info.html:68
 msgid "invalidate"
-msgstr ""
+msgstr "invalidate"
 
 #: apps/activity/templates/activity/includes/activity_info.html:68
 msgid "validate"
-msgstr ""
+msgstr "validate"
 
 #: apps/activity/templates/activity/includes/activity_info.html:71
 #: apps/logs/models.py:64 apps/note/tables.py:195
@@ -395,7 +378,7 @@ msgstr "Einladen"
 msgid "Create new activity"
 msgstr "Neue Veranstaltung schaffen"
 
-#: apps/activity/views.py:67 note_kfet/templates/base.html:91
+#: apps/activity/views.py:67 note_kfet/templates/base.html:88
 msgid "Activities"
 msgstr "Veranstaltungen"
 
@@ -1637,7 +1620,7 @@ msgstr "Tatsen finden"
 msgid "Update button"
 msgstr "Tatse bearbeiten"
 
-#: apps/note/views.py:151 note_kfet/templates/base.html:67
+#: apps/note/views.py:151 note_kfet/templates/base.html:64
 msgid "Consumptions"
 msgstr "Verbräuche"
 
@@ -1815,7 +1798,7 @@ msgstr ""
 "diesen Parametern zu erstellen. Bitte korrigieren Sie Ihre Daten und "
 "versuchen Sie es erneut."
 
-#: apps/permission/views.py:110 note_kfet/templates/base.html:109
+#: apps/permission/views.py:110 note_kfet/templates/base.html:106
 msgid "Rights"
 msgstr "Rechten"
 
@@ -2024,7 +2007,7 @@ msgstr ""
 msgid "Invalidate pre-registration"
 msgstr "Ungültige Vorregistrierung"
 
-#: apps/treasury/apps.py:12 note_kfet/templates/base.html:97
+#: apps/treasury/apps.py:12 note_kfet/templates/base.html:94
 msgid "Treasury"
 msgstr "Quaestor"
 
@@ -2426,7 +2409,7 @@ msgstr "Krediten von der Société générale handeln"
 
 #: apps/wei/apps.py:10 apps/wei/models.py:49 apps/wei/models.py:50
 #: apps/wei/models.py:61 apps/wei/models.py:167
-#: note_kfet/templates/base.html:103
+#: note_kfet/templates/base.html:100
 msgid "WEI"
 msgstr "WEI"
 
@@ -3038,34 +3021,34 @@ msgstr "Reset"
 msgid "The ENS Paris-Saclay BDE note."
 msgstr "Die BDE ENS-Paris-Saclay Note."
 
-#: note_kfet/templates/base.html:79
+#: note_kfet/templates/base.html:76
 msgid "Users"
 msgstr "Users"
 
-#: note_kfet/templates/base.html:85
+#: note_kfet/templates/base.html:82
 msgid "Clubs"
 msgstr "Clubs"
 
-#: note_kfet/templates/base.html:114
+#: note_kfet/templates/base.html:111
 msgid "Admin"
 msgstr "Admin"
 
-#: note_kfet/templates/base.html:128
+#: note_kfet/templates/base.html:125
 msgid "My account"
 msgstr "Mein Konto"
 
-#: note_kfet/templates/base.html:131
+#: note_kfet/templates/base.html:128
 msgid "Log out"
 msgstr "Abmelden"
 
-#: note_kfet/templates/base.html:139
+#: note_kfet/templates/base.html:136
 #: note_kfet/templates/registration/signup.html:6
 #: note_kfet/templates/registration/signup.html:11
 #: note_kfet/templates/registration/signup.html:28
 msgid "Sign up"
 msgstr "Registrieren"
 
-#: note_kfet/templates/base.html:146
+#: note_kfet/templates/base.html:143
 #: note_kfet/templates/registration/login.html:6
 #: note_kfet/templates/registration/login.html:15
 #: note_kfet/templates/registration/login.html:38

locale/de/LC_MESSAGES/djangojs.po

@@ -1,133 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-11-15 23:21+0100\n"
-"PO-Revision-Date: 2020-11-16 20:21+0000\n"
-"Last-Translator: Yohann D'ANELLO <ynerant@crans.org>\n"
-"Language-Team: German <http://translate.ynerant.fr/projects/nk20/nk20-js/de/>"
-"\n"
-"Language: de\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.3.2\n"
-
-#: apps/member/static/member/js/alias.js:17
-msgid "Alias successfully added"
-msgstr "Alias erfolgreich hinzugefügt"
-
-#: apps/member/static/member/js/alias.js:33
-msgid "Alias successfully deleted"
-msgstr "Alias erfolgreich gelöscht"
-
-#: apps/note/static/note/js/consos.js:225
-#, javascript-format
-msgid ""
-"Warning, the transaction from the note %s succeed, but the emitter note %s "
-"is very negative."
-msgstr ""
-"Warnung, die Transaktion aus der Note %s gelingt, aber die Emitternote %s "
-"ist sehr negativ."
-
-#: apps/note/static/note/js/consos.js:228
-#, javascript-format
-msgid ""
-"Warning, the transaction from the note %s succeed, but the emitter note %s "
-"is negative."
-msgstr ""
-"Warnung, die Transaktion aus der Note %s gelingt, aber die Emitternote %s "
-"ist negativ."
-
-#: apps/note/static/note/js/consos.js:232
-#: apps/note/static/note/js/transfer.js:298
-#: apps/note/static/note/js/transfer.js:401
-#, javascript-format
-msgid "Warning, the emitter note %s is no more a BDE member."
-msgstr "Warnung, der Emittent Hinweis %s ist kein BDE-Mitglied mehr."
-
-#: apps/note/static/note/js/consos.js:253
-msgid "The transaction couldn't be validated because of insufficient balance."
-msgstr ""
-"Die Transaktion konnte aufgrund eines unzureichenden Saldos nicht validiert "
-"werden."
-
-#: apps/note/static/note/js/transfer.js:238
-msgid "This field is required and must contain a decimal positive number."
-msgstr ""
-"Dieses Feld ist erforderlich und muss eine positive Dezimalzahl enthalten."
-
-#: apps/note/static/note/js/transfer.js:245
-msgid "The amount must stay under 21,474,836.47 €."
-msgstr "Der Betrag muss unter 21.474.836,47 € bleiben."
-
-#: apps/note/static/note/js/transfer.js:251
-msgid "This field is required."
-msgstr "Dies ist ein Pflichtfeld."
-
-#: apps/note/static/note/js/transfer.js:277
-#, javascript-format
-msgid ""
-"Warning: the transaction of %s from %s to %s was not made because it is the "
-"same source and destination note."
-msgstr ""
-"Warnung: Die Transaktion von %s von %s nach %s wurde nicht durchgeführt, da "
-"es sich um die gleiche Quell- und Zielnotiz handelt."
-
-#: apps/note/static/note/js/transfer.js:301
-#, javascript-format
-msgid "Warning, the destination note %s is no more a BDE member."
-msgstr "Warnung, der Bestimmungsvermerk %s ist kein BDE-Mitglied mehr."
-
-#: apps/note/static/note/js/transfer.js:307
-#, javascript-format
-msgid ""
-"Warning, the transaction of %s from the note %s to the note %s succeed, but "
-"the emitter note %s is very negative."
-msgstr ""
-"Warnung, die Transaktion von %s von der Note %s zur Note %s gelingt, aber "
-"die Emitternote %s ist sehr negativ."
-
-#: apps/note/static/note/js/transfer.js:312
-#, javascript-format
-msgid ""
-"Warning, the transaction of %s from the note %s to the note %s succeed, but "
-"the emitter note %s is negative."
-msgstr ""
-"Warnung, die Transaktion von %s von der Note %s zur Note %s gelingt, aber "
-"die Emitternote %s ist negativ."
-
-#: apps/note/static/note/js/transfer.js:318
-#, javascript-format
-msgid "Transfer of %s from %s to %s succeed!"
-msgstr "Übertragung von %s von %s auf %s gelingt!"
-
-#: apps/note/static/note/js/transfer.js:325
-#: apps/note/static/note/js/transfer.js:346
-#: apps/note/static/note/js/transfer.js:353
-#, javascript-format
-msgid "Transfer of %s from %s to %s failed: %s"
-msgstr "Übertragung von %s von %s auf %s fehlgeschlagen: %s"
-
-#: apps/note/static/note/js/transfer.js:347
-msgid "insufficient funds"
-msgstr "unzureichende Geldmittel"
-
-#: apps/note/static/note/js/transfer.js:400
-msgid "Credit/debit succeed!"
-msgstr "Kredit/Debit erfolgreich!"
-
-#: apps/note/static/note/js/transfer.js:407
-#, javascript-format
-msgid "Credit/debit failed: %s"
-msgstr "Kredit/Debit fehlgeschlagen: %s"
-
-#: note_kfet/static/js/base.js:366
-msgid "An error occured while (in)validating this transaction:"
-msgstr "Bei der (Un-)Validierung dieser Transaktion ist ein Fehler aufgetreten:"

locale/es/LC_MESSAGES/django.po

@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-11-15 23:26+0100\n"
+"POT-Creation-Date: 2020-10-07 11:42+0200\n"
-"PO-Revision-Date: 2020-11-17 23:47+0100\n"
+"PO-Revision-Date: 2020-09-19 14:56+0200\n"
 "Last-Translator: elkmaennchen <elkmaennchen@crans.org>\n"
 "Language-Team: \n"
 "Language: es\n"
@@ -278,15 +278,11 @@ msgstr "Saldo de la cuenta"
 msgid "Guests list"
 msgstr "Lista de los invitados"
 
-#: apps/activity/templates/activity/activity_detail.html:33
-msgid "Guest deleted"
-msgstr "Invitados suprimidos"
-
 #: apps/activity/templates/activity/activity_entry.html:14
 #: apps/note/models/transactions.py:256
 #: apps/note/templates/note/transaction_form.html:16
 #: apps/note/templates/note/transaction_form.html:148
-#: note_kfet/templates/base.html:73
+#: note_kfet/templates/base.html:70
 msgid "Transfer"
 msgstr "Transferencia"
 
@@ -311,15 +307,6 @@ msgstr "Entradas"
 msgid "Return to activity page"
 msgstr "Regresar a la página de la actividad"
 
-#: apps/activity/templates/activity/activity_entry.html:89
-#: apps/activity/templates/activity/activity_entry.html:124
-msgid "Entry done, but caution: the user is not a Kfet member."
-msgstr "Entrada echa, pero cuidado : el usuario no es un miembro de la Kfet."
-
-#: apps/activity/templates/activity/activity_entry.html:127
-msgid "Entry done!"
-msgstr "Entrada echa !"
-
 #: apps/activity/templates/activity/activity_form.html:16
 #: apps/member/templates/member/add_members.html:46
 #: apps/member/templates/member/club_form.html:16
@@ -390,7 +377,7 @@ msgstr "Invitar"
 msgid "Create new activity"
 msgstr "Crear una nueva actividad"
 
-#: apps/activity/views.py:67 note_kfet/templates/base.html:91
+#: apps/activity/views.py:67 note_kfet/templates/base.html:88
 msgid "Activities"
 msgstr "Actividades"
 
@@ -599,7 +586,7 @@ msgstr "sección"
 
 #: apps/member/models.py:46
 msgid "e.g. \"1A0\", \"9A♥\", \"SAPHIRE\""
-msgstr "i.e. \"1A0\", \"9A♥\", \"SAPHIRE\""
+msgstr "e.g. \"1A0\", \"9A♥\", \"SAPHIRE\""
 
 #: apps/member/models.py:54 apps/wei/templates/wei/weimembership_form.html:32
 msgid "department"
@@ -1630,7 +1617,7 @@ msgstr "Buscar un botón"
 msgid "Update button"
 msgstr "Modificar el botón"
 
-#: apps/note/views.py:151 note_kfet/templates/base.html:67
+#: apps/note/views.py:151 note_kfet/templates/base.html:64
 msgid "Consumptions"
 msgstr "Consumiciones"
 
@@ -1806,7 +1793,7 @@ msgid ""
 "with these parameters. Please correct your data and retry."
 msgstr ""
 
-#: apps/permission/views.py:110 note_kfet/templates/base.html:109
+#: apps/permission/views.py:110 note_kfet/templates/base.html:106
 msgid "Rights"
 msgstr "Permisos"
 
@@ -1823,20 +1810,18 @@ msgid "This email address is already used."
 msgstr "Este correo electrónico ya esta utilizado."
 
 #: apps/registration/forms.py:49
+#, fuzzy
+#| msgid "You already opened an account in the Société générale."
 msgid ""
 "I declare that I opened a bank account in the Société générale with the BDE "
 "partnership."
-msgstr ""
+msgstr "Usted ya abrió una cuenta a la Société Générale."
-"Declaro que ya abrió una cuenta a la Société Générale en colaboración con el "
-"BDE."
 
 #: apps/registration/forms.py:50
 msgid ""
 "Warning: this engages you to open your bank account. If you finally decides "
 "to don't open your account, you will have to pay the BDE membership."
 msgstr ""
-"Cuidado : esto le obliga abrir su cuenta bancaria. Si cambia de idea y no "
-"abre su cuenta bancaria, tendrá que pagar su afiliación al BDE."
 
 #: apps/registration/forms.py:58
 msgid "Register to the WEI"
@@ -1847,7 +1832,7 @@ msgid ""
 "Check this case if you want to register to the WEI. If you hesitate, you "
 "will be able to register later, after validating your account in the Kfet."
 msgstr ""
-"Marcar esta casilla si usted quiere registrarse en el WEI. Si duda, podrá "
+"Marcar esta casilla si usted quiere registrarse  en el WEI. Si duda, podrá "
 "registrarse más tarde, después de validar su cuenta Note Kfet."
 
 #: apps/registration/forms.py:105
@@ -1907,9 +1892,11 @@ msgid "Validate account"
 msgstr "Validar la cuenta"
 
 #: apps/registration/templates/registration/future_profile_detail.html:62
+#, fuzzy
+#| msgid "You already opened an account in the Société générale."
 msgid ""
 "The user declared that he/she opened a bank account in the Société générale."
-msgstr "El usuario declara que ya abrió una cuenta a la Société Générale."
+msgstr "Usted ya abrió una cuenta a la Société Générale."
 
 #: apps/registration/templates/registration/future_profile_detail.html:71
 #: apps/wei/templates/wei/weimembership_form.html:127
@@ -2014,7 +2001,7 @@ msgstr ""
 msgid "Invalidate pre-registration"
 msgstr "Invalidar la afiliación"
 
-#: apps/treasury/apps.py:12 note_kfet/templates/base.html:97
+#: apps/treasury/apps.py:12 note_kfet/templates/base.html:94
 msgid "Treasury"
 msgstr "Tesorería"
 
@@ -2411,7 +2398,7 @@ msgstr "Gestionar los créditos de la Société Générale"
 
 #: apps/wei/apps.py:10 apps/wei/models.py:49 apps/wei/models.py:50
 #: apps/wei/models.py:61 apps/wei/models.py:167
-#: note_kfet/templates/base.html:103
+#: note_kfet/templates/base.html:100
 msgid "WEI"
 msgstr "WEI"
 
@@ -3010,40 +2997,40 @@ msgstr ""
 
 #: note_kfet/templates/autocomplete_model.html:14
 msgid "Reset"
-msgstr "Reiniciar"
+msgstr ""
 
 #: note_kfet/templates/base.html:14
 msgid "The ENS Paris-Saclay BDE note."
 msgstr "La note del BDE de la ENS Paris-Saclay."
 
-#: note_kfet/templates/base.html:79
+#: note_kfet/templates/base.html:76
 msgid "Users"
 msgstr "Usuarios"
 
-#: note_kfet/templates/base.html:85
+#: note_kfet/templates/base.html:82
 msgid "Clubs"
 msgstr "Clubs"
 
-#: note_kfet/templates/base.html:114
+#: note_kfet/templates/base.html:111
 msgid "Admin"
 msgstr ""
 
-#: note_kfet/templates/base.html:128
+#: note_kfet/templates/base.html:125
 msgid "My account"
 msgstr "Mi cuenta"
 
-#: note_kfet/templates/base.html:131
+#: note_kfet/templates/base.html:128
 msgid "Log out"
 msgstr "Desconectarse"
 
-#: note_kfet/templates/base.html:139
+#: note_kfet/templates/base.html:136
 #: note_kfet/templates/registration/signup.html:6
 #: note_kfet/templates/registration/signup.html:11
 #: note_kfet/templates/registration/signup.html:28
 msgid "Sign up"
 msgstr "Registrar"
 
-#: note_kfet/templates/base.html:146
+#: note_kfet/templates/base.html:143
 #: note_kfet/templates/registration/login.html:6
 #: note_kfet/templates/registration/login.html:15
 #: note_kfet/templates/registration/login.html:38
@@ -3056,12 +3043,10 @@ msgid ""
 "You are not a BDE member anymore. Please renew your membership if you want "
 "to use the note."
 msgstr ""
-"Usted ya no está miembro del BDE. Por favor renueva su afiliación si quiere "
-"usar la note."
 
 #: note_kfet/templates/base.html:160
 msgid "You are not a Kfet member, so you can't use your note account."
-msgstr "Usted no es un miembro de la Kfet, no puede usar su cuenta note."
+msgstr ""
 
 #: note_kfet/templates/base.html:166
 msgid ""
@@ -3079,10 +3064,6 @@ msgid ""
 "yet. This verification procedure may last a few days. Please make sure that "
 "you go to the end of the account creation."
 msgstr ""
-"Usted declaró que abrió una cuenta bancaria a la Société Générale. El banco "
-"no convalidó la cuenta al BDE, así que el bonus de 80€ no fue dado y la "
-"afiliación no está pagada. El proceso de convalidación puede durar unos "
-"días. Por favor comprueba que fue hasta el final de la creación de la cuenta."
 
 #: note_kfet/templates/base.html:194
 msgid "Contact us"
@@ -3207,6 +3188,7 @@ msgstr ""
 #~ msgid "Central Authentication Service"
 #~ msgstr "Servicio Central de Autentificación"
 
+#, python-format
 #~ msgid ""
 #~ "A new version of the application is available. This instance runs "
 #~ "%(VERSION)s and the last version is %(LAST_VERSION)s. Please consider "

locale/es/LC_MESSAGES/djangojs.po

@@ -1,129 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-msgid ""
-msgstr ""
-"Project-Id-Version: \n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-11-15 23:21+0100\n"
-"PO-Revision-Date: 2020-11-21 12:23+0100\n"
-"Language: es\n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"Last-Translator: elkmaennchen <elkmaennchen@crans.org>\n"
-"Language-Team: \n"
-"X-Generator: Poedit 2.3\n"
-
-#: apps/member/static/member/js/alias.js:17
-msgid "Alias successfully added"
-msgstr "Alias añadido con éxito"
-
-#: apps/member/static/member/js/alias.js:33
-msgid "Alias successfully deleted"
-msgstr "Alias suprimido con éxito"
-
-#: apps/note/static/note/js/consos.js:225
-#, javascript-format
-msgid ""
-"Warning, the transaction from the note %s succeed, but the emitter note %s "
-"is very negative."
-msgstr ""
-"Cuidado, la transacción de %s fue un éxito, pero la note %s está muy "
-"negativa."
-
-#: apps/note/static/note/js/consos.js:228
-#, javascript-format
-msgid ""
-"Warning, the transaction from the note %s succeed, but the emitter note %s "
-"is negative."
-msgstr ""
-"Cuidado, la transacción de %s fue un éxito, pero la note %s está negativa."
-
-#: apps/note/static/note/js/consos.js:232
-#: apps/note/static/note/js/transfer.js:298
-#: apps/note/static/note/js/transfer.js:401
-#, javascript-format
-msgid "Warning, the emitter note %s is no more a BDE member."
-msgstr "Cuidado, la note remitente %s no está más miembro del BDE."
-
-#: apps/note/static/note/js/consos.js:253
-msgid "The transaction couldn't be validated because of insufficient balance."
-msgstr ""
-"La transacción no pudo ser validada por culpa de saldo demasiado bajo."
-
-#: apps/note/static/note/js/transfer.js:238
-msgid "This field is required and must contain a decimal positive number."
-msgstr "Este campo obligatorio requiere un número decimal positivo."
-
-#: apps/note/static/note/js/transfer.js:245
-msgid "The amount must stay under 21,474,836.47 €."
-msgstr "El monto no puede superar los 21 474 836,47 €."
-
-#: apps/note/static/note/js/transfer.js:251
-msgid "This field is required."
-msgstr "Este campo es obligatorio."
-
-#: apps/note/static/note/js/transfer.js:277
-#, javascript-format
-msgid ""
-"Warning: the transaction of %s from %s to %s was not made because it is the "
-"same source and destination note."
-msgstr ""
-"Cuidado : la transacción de %s de %s a %s no fue echa porque la fuente y el "
-"destino son iguales."
-
-#: apps/note/static/note/js/transfer.js:301
-#, javascript-format
-msgid "Warning, the destination note %s is no more a BDE member."
-msgstr "Cuidado, la note destino %s no está más miembro del BDE."
-
-#: apps/note/static/note/js/transfer.js:307
-#, javascript-format
-msgid ""
-"Warning, the transaction of %s from the note %s to the note %s succeed, but "
-"the emitter note %s is very negative."
-msgstr ""
-"Cuidado, la transacción de %s de la note %s a la note %s fue un éxito, pero "
-"la note fuente %s está muy negativa."
-
-#: apps/note/static/note/js/transfer.js:312
-#, javascript-format
-msgid ""
-"Warning, the transaction of %s from the note %s to the note %s succeed, but "
-"the emitter note %s is negative."
-msgstr ""
-"Cuidado, la transacción de %s de la note %s a la note %s fue un éxito, pero "
-"la note fuente %s está negativa."
-
-#: apps/note/static/note/js/transfer.js:318
-#, javascript-format
-msgid "Transfer of %s from %s to %s succeed!"
-msgstr "¡ La transacción de %s de %s a %s fue un éxito !"
-
-#: apps/note/static/note/js/transfer.js:325
-#: apps/note/static/note/js/transfer.js:346
-#: apps/note/static/note/js/transfer.js:353
-#, javascript-format
-msgid "Transfer of %s from %s to %s failed: %s"
-msgstr "La transacción de %s de %s a %s fue un fracaso : %s"
-
-#: apps/note/static/note/js/transfer.js:347
-msgid "insufficient funds"
-msgstr "fundos insuficientes"
-
-#: apps/note/static/note/js/transfer.js:400
-msgid "Credit/debit succeed!"
-msgstr "¡ Crédito/débito tubo éxito !"
-
-#: apps/note/static/note/js/transfer.js:407
-#, javascript-format
-msgid "Credit/debit failed: %s"
-msgstr "Crédito/débito falló : %s"
-
-#: note_kfet/static/js/base.js:366
-msgid "An error occured while (in)validating this transaction:"
-msgstr "Un error ocurrió durante la (in)validación de esta transacción :"

locale/fr/LC_MESSAGES/django.po

@@ -7,16 +7,16 @@ msgid ""
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-11-15 23:26+0100\n"
+"POT-Creation-Date: 2020-10-07 11:42+0200\n"
-"PO-Revision-Date: 2020-11-16 20:02+0000\n"
+"PO-Revision-Date: 2020-09-13 12:36+0200\n"
-"Last-Translator: Yohann D'ANELLO <ynerant@crans.org>\n"
+"Last-Translator: elkmaennchen <elkmaennchen@crans.org>\n"
-"Language-Team: French <http://translate.ynerant.fr/projects/nk20/nk20/fr/>\n"
+"Language-Team: \n"
 "Language: fr\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=n > 1;\n"
+"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Weblate 4.3.2\n"
+"X-Generator: Poedit 2.3\n"
 
 #: apps/activity/apps.py:10 apps/activity/models.py:151
 #: apps/activity/models.py:167
@@ -279,15 +279,11 @@ msgstr "Solde du compte"
 msgid "Guests list"
 msgstr "Liste des invités"
 
-#: apps/activity/templates/activity/activity_detail.html:33
-msgid "Guest deleted"
-msgstr "Invité supprimé"
-
 #: apps/activity/templates/activity/activity_entry.html:14
 #: apps/note/models/transactions.py:256
 #: apps/note/templates/note/transaction_form.html:16
 #: apps/note/templates/note/transaction_form.html:148
-#: note_kfet/templates/base.html:73
+#: note_kfet/templates/base.html:70
 msgid "Transfer"
 msgstr "Virement"
 
@@ -312,16 +308,6 @@ msgstr "Entrées"
 msgid "Return to activity page"
 msgstr "Retour à la page de l'activité"
 
-#: apps/activity/templates/activity/activity_entry.html:89
-#: apps/activity/templates/activity/activity_entry.html:124
-msgid "Entry done, but caution: the user is not a Kfet member."
-msgstr ""
-"Entrée effectuée, mais attention : la personne n'est pas un adhérent Kfet."
-
-#: apps/activity/templates/activity/activity_entry.html:127
-msgid "Entry done!"
-msgstr "Entrée effectuée !"
-
 #: apps/activity/templates/activity/activity_form.html:16
 #: apps/member/templates/member/add_members.html:46
 #: apps/member/templates/member/club_form.html:16
@@ -392,7 +378,7 @@ msgstr "Inviter"
 msgid "Create new activity"
 msgstr "Créer une nouvelle activité"
 
-#: apps/activity/views.py:67 note_kfet/templates/base.html:91
+#: apps/activity/views.py:67 note_kfet/templates/base.html:88
 msgid "Activities"
 msgstr "Activités"
 
@@ -1636,7 +1622,7 @@ msgstr "Chercher un bouton"
 msgid "Update button"
 msgstr "Modifier le bouton"
 
-#: apps/note/views.py:151 note_kfet/templates/base.html:67
+#: apps/note/views.py:151 note_kfet/templates/base.html:64
 msgid "Consumptions"
 msgstr "Consommations"
 
@@ -1651,12 +1637,12 @@ msgstr "Rechercher des transactions"
 #: apps/permission/models.py:92
 #, python-brace-format
 msgid "Can {type} {model}.{field} in {query}"
-msgstr "Peut {type} {model}.{field} si {query}"
+msgstr "Can {type} {model}.{field} in {query}"
 
 #: apps/permission/models.py:94
 #, python-brace-format
 msgid "Can {type} {model} in {query}"
-msgstr "Peut {type} {model} si {query}"
+msgstr "Can {type} {model} in {query}"
 
 #: apps/permission/models.py:107
 msgid "rank"
@@ -1815,7 +1801,7 @@ msgstr ""
 "Vous n'avez pas la permission d'ajouter une instance du modèle « {model} » "
 "avec ces paramètres. Merci de les corriger et de réessayer."
 
-#: apps/permission/views.py:110 note_kfet/templates/base.html:109
+#: apps/permission/views.py:110 note_kfet/templates/base.html:106
 msgid "Rights"
 msgstr "Droits"
 
@@ -2022,7 +2008,7 @@ msgstr ""
 msgid "Invalidate pre-registration"
 msgstr "Invalider l'inscription"
 
-#: apps/treasury/apps.py:12 note_kfet/templates/base.html:97
+#: apps/treasury/apps.py:12 note_kfet/templates/base.html:94
 msgid "Treasury"
 msgstr "Trésorerie"
 
@@ -2422,7 +2408,7 @@ msgstr "Gérer les crédits de la Société générale"
 
 #: apps/wei/apps.py:10 apps/wei/models.py:49 apps/wei/models.py:50
 #: apps/wei/models.py:61 apps/wei/models.py:167
-#: note_kfet/templates/base.html:103
+#: note_kfet/templates/base.html:100
 msgid "WEI"
 msgstr "WEI"
 
@@ -2800,9 +2786,10 @@ msgid ""
 "validated the creation of the account, or to change the payment method."
 msgstr ""
 "Le WEI va être payé par la Société générale. L'adhésion sera créée même si "
-"la banque n'a pas encore payé le BDE. La transaction d'adhésion sera créée "
+"la banque n'a pas encore payé le BDE.\n"
-"mais invalide. Vous devrez la valider une fois que la banque aura validé la "
+"La transaction d'adhésion sera créée mais invalide. Vous devrez la valider "
-"création du compte, ou bien changer de moyen de paiement."
+"une fois que la banque\n"
+"aura validé la création du compte, ou bien changer de moyen de paiement."
 
 #: apps/wei/templates/wei/weimembership_form.html:149
 #, python-format
@@ -2819,7 +2806,7 @@ msgid ""
 "The note has enough money (%(pretty_fee)s required), the registration is "
 "possible."
 msgstr ""
-"La note a assez d'argent (%(pretty_fee)s requis), l'inscription est possible."
+"La note a assez d'argent (%(pretty_fee) requis), l'inscription est possible."
 
 #: apps/wei/templates/wei/weimembership_form.html:166
 msgid "The user didn't give her/his caution check."
@@ -3033,34 +3020,34 @@ msgstr "Réinitialiser"
 msgid "The ENS Paris-Saclay BDE note."
 msgstr "La note du BDE de l'ENS Paris-Saclay."
 
-#: note_kfet/templates/base.html:79
+#: note_kfet/templates/base.html:76
 msgid "Users"
 msgstr "Utilisateurs"
 
-#: note_kfet/templates/base.html:85
+#: note_kfet/templates/base.html:82
 msgid "Clubs"
 msgstr "Clubs"
 
-#: note_kfet/templates/base.html:114
+#: note_kfet/templates/base.html:111
 msgid "Admin"
 msgstr "Admin"
 
-#: note_kfet/templates/base.html:128
+#: note_kfet/templates/base.html:125
 msgid "My account"
 msgstr "Mon compte"
 
-#: note_kfet/templates/base.html:131
+#: note_kfet/templates/base.html:128
 msgid "Log out"
 msgstr "Se déconnecter"
 
-#: note_kfet/templates/base.html:139
+#: note_kfet/templates/base.html:136
 #: note_kfet/templates/registration/signup.html:6
 #: note_kfet/templates/registration/signup.html:11
 #: note_kfet/templates/registration/signup.html:28
 msgid "Sign up"
 msgstr "Inscription"
 
-#: note_kfet/templates/base.html:146
+#: note_kfet/templates/base.html:143
 #: note_kfet/templates/registration/login.html:6
 #: note_kfet/templates/registration/login.html:15
 #: note_kfet/templates/registration/login.html:38

locale/fr/LC_MESSAGES/djangojs.po

@@ -1,134 +0,0 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
-# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
-#, fuzzy
-msgid ""
-msgstr ""
-"Project-Id-Version: PACKAGE VERSION\n"
-"Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2020-11-15 23:21+0100\n"
-"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
-"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
-"Language-Team: LANGUAGE <LL@li.org>\n"
-"Language: \n"
-"MIME-Version: 1.0\n"
-"Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=2; plural=(n > 1);\n"
-
-#: apps/member/static/member/js/alias.js:17
-msgid "Alias successfully added"
-msgstr "Alias ajouté avec succès"
-
-#: apps/member/static/member/js/alias.js:33
-msgid "Alias successfully deleted"
-msgstr "Alias supprimé avec succès"
-
-#: apps/note/static/note/js/consos.js:225
-#, javascript-format
-msgid ""
-"Warning, the transaction from the note %s succeed, but the emitter note %s "
-"is very negative."
-msgstr ""
-"Attention, La transaction depuis la note %s a été réalisée avec succès, mais "
-"la note émettrice %s est en négatif sévère."
-
-#: apps/note/static/note/js/consos.js:228
-#, javascript-format
-msgid ""
-"Warning, the transaction from the note %s succeed, but the emitter note %s "
-"is negative."
-msgstr ""
-"Attention, La transaction depuis la note %s a été réalisée avec succès, mais "
-"la note émettrice %s est en négatif."
-
-#: apps/note/static/note/js/consos.js:232
-#: apps/note/static/note/js/transfer.js:298
-#: apps/note/static/note/js/transfer.js:401
-#, javascript-format
-msgid "Warning, the emitter note %s is no more a BDE member."
-msgstr "Attention, la note émettrice %s n'est plus adhérente."
-
-#: apps/note/static/note/js/consos.js:253
-msgid "The transaction couldn't be validated because of insufficient balance."
-msgstr ""
-"La transaction n'a pas pu être validée pour cause de solde insuffisant."
-
-#: apps/note/static/note/js/transfer.js:238
-msgid "This field is required and must contain a decimal positive number."
-msgstr ""
-"Ce champ est requis et doit comporter un nombre décimal strictement positif."
-
-#: apps/note/static/note/js/transfer.js:245
-msgid "The amount must stay under 21,474,836.47 €."
-msgstr "Le montant ne doit pas excéder 21 474 836.47 €."
-
-#: apps/note/static/note/js/transfer.js:251
-msgid "This field is required."
-msgstr "Ce champ est requis."
-
-#: apps/note/static/note/js/transfer.js:277
-#, javascript-format
-msgid ""
-"Warning: the transaction of %s from %s to %s was not made because it is the "
-"same source and destination note."
-msgstr ""
-"Attention : la transaction de %s de la note %s vers la note %s n'a pas été "
-"faite car il s'agit de la même note au départ et à l'arrivée."
-
-#: apps/note/static/note/js/transfer.js:301
-#, javascript-format
-msgid "Warning, the destination note %s is no more a BDE member."
-msgstr "Attention, la note de destination %s n'est plus adhérente."
-
-#: apps/note/static/note/js/transfer.js:307
-#, javascript-format
-msgid ""
-"Warning, the transaction of %s from the note %s to the note %s succeed, but "
-"the emitter note %s is very negative."
-msgstr ""
-"Attention, La transaction de %s depuis la note %s vers la note %s a été "
-"réalisée avec succès, mais la note émettrice %s est en négatif sévère."
-
-#: apps/note/static/note/js/transfer.js:312
-#, javascript-format
-msgid ""
-"Warning, the transaction of %s from the note %s to the note %s succeed, but "
-"the emitter note %s is negative."
-msgstr ""
-"Attention, La transaction de %s depuis la note %s vers la note %s a été "
-"réalisée avec succès, mais la note émettrice %s est en négatif."
-
-#: apps/note/static/note/js/transfer.js:318
-#, javascript-format
-msgid "Transfer of %s from %s to %s succeed!"
-msgstr ""
-"Le transfert de %s de la note %s vers la note %s a été fait avec succès !"
-
-#: apps/note/static/note/js/transfer.js:325
-#: apps/note/static/note/js/transfer.js:346
-#: apps/note/static/note/js/transfer.js:353
-#, javascript-format
-msgid "Transfer of %s from %s to %s failed: %s"
-msgstr "Le transfert de %s de la note %s vers la note %s a échoué : %s"
-
-#: apps/note/static/note/js/transfer.js:347
-msgid "insufficient funds"
-msgstr "solde insuffisant"
-
-#: apps/note/static/note/js/transfer.js:400
-msgid "Credit/debit succeed!"
-msgstr "Le crédit/retrait a bien été effectué !"
-
-#: apps/note/static/note/js/transfer.js:407
-#, javascript-format
-msgid "Credit/debit failed: %s"
-msgstr "Le crédit/retrait a échoué : %s"
-
-#: note_kfet/static/js/base.js:366
-msgid "An error occured while (in)validating this transaction:"
-msgstr ""
-"Une erreur est survenue lors de la validation/dévalidation de cette "
-"transaction :"

note_kfet/static/js/base.js

@@ -363,7 +363,8 @@ function de_validate (id, validated, resourcetype) {
       const errObj = JSON.parse(err.responseText)
       let error = errObj.detail ? errObj.detail : errObj.non_field_errors
       if (!error) { error = err.responseText }
-      addMsg(gettext('An error occured while (in)validating this transaction:') + ' ' + error, 'danger')
+      addMsg('Une erreur est survenue lors de la validation/dévalidation ' +
+                'de cette transaction : ' + error, 'danger')
 
       refreshBalance()
       // error if this method doesn't exist. Please define it.

note_kfet/static/js/jsi18n/_default.js

@@ -1,134 +0,0 @@
-/*
-* You should never see this file.
-* It is here only for compatibility reasons in case of the command `compilejsmessages` was never executed.
-* Please execute this command to generate translation strings.
-*/
-
-(function(globals) {
-
-  var django = globals.django || (globals.django = {});
-
-
-  django.pluralidx = function(n) {
-    var v=(n != 1);
-    if (typeof(v) == 'boolean') {
-      return v ? 1 : 0;
-    } else {
-      return v;
-    }
-  };
-
-
-  /* gettext library */
-
-  django.catalog = django.catalog || {};
-
-
-  if (!django.jsi18n_initialized) {
-    django.gettext = function(msgid) {
-      var value = django.catalog[msgid];
-      if (typeof(value) == 'undefined') {
-        return msgid;
-      } else {
-        return (typeof(value) == 'string') ? value : value[0];
-      }
-    };
-
-    django.ngettext = function(singular, plural, count) {
-      var value = django.catalog[singular];
-      if (typeof(value) == 'undefined') {
-        return (count == 1) ? singular : plural;
-      } else {
-        return value.constructor === Array ? value[django.pluralidx(count)] : value;
-      }
-    };
-
-    django.gettext_noop = function(msgid) { return msgid; };
-
-    django.pgettext = function(context, msgid) {
-      var value = django.gettext(context + '\x04' + msgid);
-      if (value.indexOf('\x04') != -1) {
-        value = msgid;
-      }
-      return value;
-    };
-
-    django.npgettext = function(context, singular, plural, count) {
-      var value = django.ngettext(context + '\x04' + singular, context + '\x04' + plural, count);
-      if (value.indexOf('\x04') != -1) {
-        value = django.ngettext(singular, plural, count);
-      }
-      return value;
-    };
-
-    django.interpolate = function(fmt, obj, named) {
-      if (named) {
-        return fmt.replace(/%\(\w+\)s/g, function(match){return String(obj[match.slice(2,-2)])});
-      } else {
-        return fmt.replace(/%s/g, function(match){return String(obj.shift())});
-      }
-    };
-
-
-    /* formatting library */
-
-    django.formats = {
-    "DATETIME_FORMAT": "j \\d\\e F \\d\\e Y \\a \\l\\a\\s H:i",
-    "DATETIME_INPUT_FORMATS": [
-      "%d/%m/%Y %H:%M:%S",
-      "%d/%m/%Y %H:%M:%S.%f",
-      "%d/%m/%Y %H:%M",
-      "%d/%m/%y %H:%M:%S",
-      "%d/%m/%y %H:%M:%S.%f",
-      "%d/%m/%y %H:%M",
-      "%Y-%m-%d %H:%M:%S",
-      "%Y-%m-%d %H:%M:%S.%f",
-      "%Y-%m-%d %H:%M",
-      "%Y-%m-%d"
-    ],
-    "DATE_FORMAT": "j \\d\\e F \\d\\e Y",
-    "DATE_INPUT_FORMATS": [
-      "%d/%m/%Y",
-      "%d/%m/%y",
-      "%Y-%m-%d"
-    ],
-    "DECIMAL_SEPARATOR": ",",
-    "FIRST_DAY_OF_WEEK": 1,
-    "MONTH_DAY_FORMAT": "j \\d\\e F",
-    "NUMBER_GROUPING": 3,
-    "SHORT_DATETIME_FORMAT": "d/m/Y H:i",
-    "SHORT_DATE_FORMAT": "d/m/Y",
-    "THOUSAND_SEPARATOR": ".",
-    "TIME_FORMAT": "H:i",
-    "TIME_INPUT_FORMATS": [
-      "%H:%M:%S",
-      "%H:%M:%S.%f",
-      "%H:%M"
-    ],
-    "YEAR_MONTH_FORMAT": "F \\d\\e Y"
-  };
-
-    django.get_format = function(format_type) {
-      var value = django.formats[format_type];
-      if (typeof(value) == 'undefined') {
-        return format_type;
-      } else {
-        return value;
-      }
-    };
-
-    /* add to global namespace */
-    globals.pluralidx = django.pluralidx;
-    globals.gettext = django.gettext;
-    globals.ngettext = django.ngettext;
-    globals.gettext_noop = django.gettext_noop;
-    globals.pgettext = django.pgettext;
-    globals.npgettext = django.npgettext;
-    globals.interpolate = django.interpolate;
-    globals.get_format = django.get_format;
-
-    django.jsi18n_initialized = true;
-  }
-
-}(this));
-

note_kfet/static/js/jsi18n/de.js

@@ -1 +0,0 @@
-_default.js

note_kfet/static/js/jsi18n/es.js

@@ -1 +0,0 @@
-_default.js

note_kfet/static/js/jsi18n/fr.js

@@ -1 +0,0 @@
-_default.js

note_kfet/templates/base.html

@@ -38,9 +38,6 @@ SPDX-License-Identifier: GPL-3.0-or-later
     <script src="{% static "js/base.js" %}"></script>
     <script src="{% static "js/konami.js" %}"></script>
 
-    {# Translation in javascript files #}
-    <script src="{% static "js/jsi18n/jsi18n."|add:LANGUAGE_CODE|add:".js" %}"></script>
-
     {# If extra ressources are needed for a form, load here #}
     {% if form.media %}
         {{ form.media }}

requirements.txt

@@ -7,7 +7,7 @@ django-extensions~=2.1.4
 django-filter~=2.1.0
 django-htcpcp-tea~=0.3.1
 django-mailer~=2.0.1
-django-oauth-toolkit~=1.3.3
+django-oauth-toolkit~=1.1.2
 django-phonenumber-field~=5.0.0
 django-polymorphic~=2.0.3
 djangorestframework~=3.9.0