diff --git a/equipment/models.py b/equipment/models.py index e93cbd3..9233787 100644 --- a/equipment/models.py +++ b/equipment/models.py @@ -47,7 +47,7 @@ class EquipmentAttribution(models.Model): equipment = models.ForeignKey(AbstractEquipment) activity = models.ForeignKey(Activity) amount = models.PositiveSmallIntegerField(_("Quantité attribuée")) - remarks = models.TextField("Remarques concernant l'attribution") + remarks = models.TextField(_("Remarques concernant l'attribution")) class Meta: verbose_name = _("attribution de matériel") @@ -60,7 +60,7 @@ class EquipmentAttribution(models.Model): class EquipmentRemark(models.Model): - remark = models.TextField("Remarque sur le matériel") + remark = models.TextField(_("Remarque sur le matériel")) equipment = models.ForeignKey( AbstractEquipment, related_name="remarks", diff --git a/evenementiel/settings/common.py b/evenementiel/settings/common.py index 691730d..b5620bb 100644 --- a/evenementiel/settings/common.py +++ b/evenementiel/settings/common.py @@ -44,7 +44,7 @@ BASE_DIR = os.path.dirname( INSTALLED_APPS = [ 'equipment.apps.EquipmentConfig', 'event.apps.EventConfig', - 'user.apps.UserConfig', + 'users.apps.UsersConfig', 'shared.apps.SharedConfig', 'django.contrib.admin', 'django.contrib.auth', diff --git a/evenementiel/urls.py b/evenementiel/urls.py index df8afe0..d83241d 100644 --- a/evenementiel/urls.py +++ b/evenementiel/urls.py @@ -8,7 +8,7 @@ from django.contrib import admin urlpatterns = [ url(r'^admin/', admin.site.urls), url(r'^event/', include('event.urls')), - url(r'^user/', include('user.urls')), + url(r'^user/', include('users.urls')), url(r'^', include('shared.urls')), ] diff --git a/event/models.py b/event/models.py index 7723796..aaad757 100644 --- a/event/models.py +++ b/event/models.py @@ -66,14 +66,14 @@ class ActivityTag(models.Model): ) color_regex = RegexValidator( regex=r'^#(?:[0-9a-fA-F]{3}){1,2}$', - message="La chaîne de caractère rentrée n'est pas" - "une couleur en hexadécimal.", + message=_("La chaîne de caractère rentrée n'est pas" + " une couleur en hexadécimal."), ) color = models.CharField( _('Couleur'), max_length=7, validators=[color_regex], - help_text="Rentrer une couleur en hexadécimal", + help_text=_("Rentrer une couleur en hexadécimal"), ) class Meta: diff --git a/provisioning/bootstrap.sh b/provisioning/bootstrap.sh index 15f76d6..6526c86 100644 --- a/provisioning/bootstrap.sh +++ b/provisioning/bootstrap.sh @@ -28,7 +28,7 @@ function fill_template { # --- # System packages -apt-get update && apt-get upgrade +apt-get update && apt-get upgrade -y apt-get install -y python3-pip python3-dev python3-venv libpq-dev postgresql \ postgresql-contrib libjpeg-dev nginx redis-server diff --git a/shared/templates/base.html b/shared/templates/base.html index ac763ba..fe950b6 100644 --- a/shared/templates/base.html +++ b/shared/templates/base.html @@ -1,5 +1,6 @@ {% extends "base_html.html" %} {% load staticfiles %} +{% load i18n %} {% block title %}GestionÉvènementiel{% block sub_title %}{% endblock %}{% endblock %} @@ -12,7 +13,7 @@ {% if user.is_authenticated %}
{{ user.username }}
{% else %} -
non connecté·e
+
{% trans "non connecté·e" %}
{% endif %}
@@ -20,35 +21,35 @@ {% block sidenav %} {% if not user.is_authenticated %}
  • - + - Se connecter + {% trans "Se connecter" %}
  • - + - Créer un compte + {% trans "Créer un compte" %}
  • - + - Mot de passe oublié + {% trans "Mot de passe oublié" %}
    • {% endif %} {% if user.is_authenticated %}
  • - + - Changer de mot de passe + {% trans "Changer de mot de passe" %}
  • - + - Se déconnecter + {% trans "Se déconnecter" %}
    • {% endif %} @@ -66,4 +67,3 @@ {% endblock %} - diff --git a/shared/templates/base_error.html b/shared/templates/base_error.html index 841b576..88fb504 100644 --- a/shared/templates/base_error.html +++ b/shared/templates/base_error.html @@ -1,5 +1,3 @@ {% extends "base.html" %} -{% block page_title %}Erreur !{% endblock %} - - +{% block page_title %}{% trans "Erreur !" %}{% endblock %} diff --git a/shared/templates/base_footer.html b/shared/templates/base_footer.html index 331c9e4..ca69991 100644 --- a/shared/templates/base_footer.html +++ b/shared/templates/base_footer.html @@ -1,5 +1,8 @@ +{% load i18n %} diff --git a/shared/templates/base_nav.html b/shared/templates/base_nav.html index 57a059a..65a0f67 100644 --- a/shared/templates/base_nav.html +++ b/shared/templates/base_nav.html @@ -1,3 +1,4 @@ +{% load i18n %}