diff --git a/src/accounts/templates/accounts/profile.html b/src/accounts/templates/accounts/profile.html index 969b29e..c80fe1f 100644 --- a/src/accounts/templates/accounts/profile.html +++ b/src/accounts/templates/accounts/profile.html @@ -18,7 +18,7 @@ {% for s in solves %} - {{ s.ctf.name }} + {{ s.ctf.name }} {{ s.ctf.category.name}} {{ s.ctf.points }} {{ s.flag_date|date:"Y-m-d H:i:s" }} diff --git a/src/change_lang.py b/src/change_lang.py new file mode 100644 index 0000000..78f17ee --- /dev/null +++ b/src/change_lang.py @@ -0,0 +1,26 @@ +from django.template import Library +from django.core.urlresolvers import resolve, reverse +from django.utils.translation import activate, get_language + +register = Library() + +@register.simple_tag(takes_context=True) +def change_lang(context, lang=None, *args, **kwargs): + """ + Get active page's url by a specified language + Usage: {% change_lang 'en' %} + """ + + path = context['request'].path + url_parts = resolve( path ) + + url = path + cur_language = get_language() + try: + activate(lang) + url = reverse( url_parts.view_name, kwargs=url_parts.kwargs ) + finally: + activate(cur_language) + + + return "%s" % url diff --git a/src/ctfs/migrations/0004_auto_20210907_1407.py b/src/ctfs/migrations/0004_auto_20210907_1407.py new file mode 100644 index 0000000..ed6825d --- /dev/null +++ b/src/ctfs/migrations/0004_auto_20210907_1407.py @@ -0,0 +1,28 @@ +# Generated by Django 3.2.7 on 2021-09-07 14:07 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('ctfs', '0003_auto_20191003_1947'), + ] + + operations = [ + migrations.AddField( + model_name='ctf', + name='description_de', + field=models.TextField(blank=True), + ), + migrations.AddField( + model_name='ctf', + name='description_en', + field=models.TextField(blank=True), + ), + migrations.AddField( + model_name='ctf', + name='description_ru', + field=models.TextField(blank=True), + ), + ] diff --git a/src/ctfs/models.py b/src/ctfs/models.py index a9a41ce..4958f77 100644 --- a/src/ctfs/models.py +++ b/src/ctfs/models.py @@ -12,6 +12,9 @@ class CTF(models.Model): name = models.CharField(max_length=200) flag = models.CharField(max_length=100) description = models.TextField(blank=True) + description_en = models.TextField(blank=True) + description_ru = models.TextField(blank=True) + description_de = models.TextField(blank=True) file = models.FileField(blank=True, upload_to='challenges') ctf_url = models.URLField(blank=True) points = models.PositiveSmallIntegerField() diff --git a/src/ctfs/templates/ctfs/.ctfs_list.html.swp b/src/ctfs/templates/ctfs/.ctfs_list.html.swp deleted file mode 100644 index de31984..0000000 Binary files a/src/ctfs/templates/ctfs/.ctfs_list.html.swp and /dev/null differ diff --git a/src/ctfs/templates/ctfs/ctf_info.html b/src/ctfs/templates/ctfs/ctf_info.html index 1e5243c..70043c6 100644 --- a/src/ctfs/templates/ctfs/ctf_info.html +++ b/src/ctfs/templates/ctfs/ctf_info.html @@ -9,7 +9,11 @@ {% trans "Published date" %} : {{ ctf.pub_date }}
- {{ ctf.description|safe }} + {% if description %} + {{ description|safe }} + {% else %} + {% trans "No translation available for this challenge. Try another lang (French or English)." %} + {% endif %}
{% if request.user.is_authenticated %} @@ -56,7 +60,7 @@ {% for s in solved_list %} - {{ s.user.username }} + {{ s.user.username }} {{ s.user.userprofileinfo.portfolio_site }} {{ s.user.userprofileinfo.score }} {{ s.flag_date }} diff --git a/src/ctfs/templates/ctfs/ctfs_list.html b/src/ctfs/templates/ctfs/ctfs_list.html old mode 100644 new mode 100755 index 3356b15..68d1982 --- a/src/ctfs/templates/ctfs/ctfs_list.html +++ b/src/ctfs/templates/ctfs/ctfs_list.html @@ -26,7 +26,7 @@ {% else %} {% endif %} - {{ ctf.name }} + {{ ctf.name }} {{ ctf.points }} {{ ctf.solved_num }} @@ -42,7 +42,7 @@
  • {% trans "Categories" %}
    • {% if cats %} {% for c in cats %} -     {{ c.name }} + {{ c.name }} {% endfor %} {% else %}
  • {% trans "No category available." %}
    • diff --git a/src/ctfs/templates/templates/ctfs/ctf_info.html b/src/ctfs/templates/templates/ctfs/ctf_info.html deleted file mode 100755 index 1e5243c..0000000 --- a/src/ctfs/templates/templates/ctfs/ctf_info.html +++ /dev/null @@ -1,81 +0,0 @@ -{% extends 'base.html' %} -{% block content %} -{% load i18n %} -
    -
    -
    -
    -

    {{ ctf.name }}

    - {% trans "Published date" %} : {{ ctf.pub_date }} -
    -
    - {{ ctf.description|safe }} -
    -
    - {% if request.user.is_authenticated %} - {% if valitated == True %} -

    {% trans "Congratulation !" %}

    - {% elif alvalitated == True %} -

    {% trans "Already flagged" %}

    - {% if ctf.ctf_url %} - {% trans "Start the challenge" %}
    - {% elif ctf.file %} - {% trans "Download" %}
    - {% endif %} - {% else %} - {% if failed %} -

    {% trans "Wrong flag ! You can do it !" %}

    - {% endif %} - {% if ctf.ctf_url %} - {% trans "Start the challenge" %}
    - {% elif ctf.file %} - {% trans "Download" %}
    - {% endif %} -
    - {% csrf_token %} - - -
    - - {% endif %} - {% endif %} -
    -
    -
    -

    {% trans "Solved by" %}

    - {% if solved_list %} - - - - - - - - - - - {% for s in solved_list %} - - - - - - - {% endfor %} - -
    {% trans "Username" %}{% trans "Website" %}{% trans "Score" %}{% trans "Date" %}
    {{ s.user.username }}{{ s.user.userprofileinfo.portfolio_site }}{{ s.user.userprofileinfo.score }}{{ s.flag_date }}
    - {% else %} -

    {% trans "Nobody have solved this CTF." %}

    - {% endif %} -
    -
    -
    -
      -
    • {% trans "Author" %} : {{ ctf.author.username }}
      • -
    • {% trans "Point reward" %} : {{ ctf.points }}
      • - -
    -
    -
    -{% endblock %} - diff --git a/src/ctfs/templates/templates/ctfs/ctfs_list.html b/src/ctfs/templates/templates/ctfs/ctfs_list.html deleted file mode 100755 index 3356b15..0000000 --- a/src/ctfs/templates/templates/ctfs/ctfs_list.html +++ /dev/null @@ -1,53 +0,0 @@ -{% extends 'base.html' %} -{% block content %} -{% load i18n %} -
    -
    -

    {{ cat.name }}

    - {% if ctfs %} - - - - - - - - - - - {% for ctf in ctfs %} - - {% if request.user.is_authenticated %} - {% if ctf.solved %} - - {% else %} - - {% endif %} - {% else %} - - {% endif %} - - - - - {% endfor %} - -
    {% trans "Username" %}{% trans "Score" %}{% trans "Solved" %}
    ✓✕ {{ ctf.name }}{{ ctf.points }}{{ ctf.solved_num }}
    - {% else %} -

    {% trans "No ctf available for this category." %}

    - {% endif %} -
    -
    -
      -
    • {% trans "Categories" %}
      • - {% if cats %} - {% for c in cats %} - {{ c.name }} - {% endfor %} - {% else %} -
    • {% trans "No category available." %}
      • - {% endif %} -
    -
    -
    -{% endblock %} diff --git a/src/ctfs/views.py b/src/ctfs/views.py index 203ef27..78c62df 100644 --- a/src/ctfs/views.py +++ b/src/ctfs/views.py @@ -4,6 +4,20 @@ from django.contrib.auth.models import timezone from .models import Category, CTF, CTF_flags from .forms import submit_flag from accounts.models import UserProfileInfo +from django.utils.translation import get_language + +def get_description_by_lang(ctf): + lang = get_language() + ret = None + if lang == "fr": + ret = ctf.description + elif lang == "en": + ret = ctf.description_en + elif lang == "de": + ret = ctf.description_de + elif lang == "ru": + ret = ctf.description_ru + return ret def category(request, cat_slug): cat = get_object_or_404(Category, slug=cat_slug) @@ -17,6 +31,7 @@ def ctf(request, cat_slug, ctf_slug): ctf_info = get_object_or_404(CTF, slug=ctf_slug) flagged = False solved_list = CTF_flags.objects.filter(ctf=ctf_info).order_by('flag_date') + description = get_description_by_lang(ctf_info) if request.user.is_authenticated: if CTF_flags.objects.filter(user=request.user, ctf=ctf_info): flagged = True @@ -31,18 +46,18 @@ def ctf(request, cat_slug, ctf_slug): profil.last_submission_date = timezone.now() profil.score += ctf_info.points profil.save() - return render(request, 'ctfs/ctf_info.html', {'form' : form, 'ctf' : ctf_info, 'solved_list': solved_list, 'valitated': True}) + return render(request, 'ctfs/ctf_info.html', {'form' : form, 'ctf' : ctf_info, 'solved_list': solved_list, 'valitated': True, 'description': description}) else: - return render(request, 'ctfs/ctf_info.html', {'form' : form, 'ctf' : ctf_info, 'solved_list': solved_list, 'failed': True}) + return render(request, 'ctfs/ctf_info.html', {'form' : form, 'ctf' : ctf_info, 'solved_list': solved_list, 'failed': True, 'description': description}) else: form = submit_flag() - return render(request, 'ctfs/ctf_info.html', {'form' : form, 'ctf' : ctf_info, 'solved_list': solved_list, 'alvalitated': True}) + return render(request, 'ctfs/ctf_info.html', {'form' : form, 'ctf' : ctf_info, 'solved_list': solved_list, 'alvalitated': True, 'description': description}) else: form = submit_flag() - return render(request, 'ctfs/ctf_info.html', {'form' : form, 'ctf' : ctf_info, 'solved_list': solved_list}) + return render(request, 'ctfs/ctf_info.html', {'form' : form, 'ctf' : ctf_info, 'solved_list': solved_list, 'description': description}) else: form = submit_flag() - return render(request, 'ctfs/ctf_info.html', {'form' : form, 'ctf' : ctf_info, 'solved_list': solved_list, 'alvalitated': flagged}) + return render(request, 'ctfs/ctf_info.html', {'form' : form, 'ctf' : ctf_info, 'solved_list': solved_list, 'alvalitated': flagged, 'description': description}) # Create your views here. diff --git a/src/home/templates/home/home.html b/src/home/templates/home/home.html index 3d2eb36..208cadb 100644 --- a/src/home/templates/home/home.html +++ b/src/home/templates/home/home.html @@ -24,7 +24,7 @@
  • {% trans "Latest challenges added" %}
    • {% if ctfs %} {% for ctf in ctfs %} - {{ ctf.name }} + {{ ctf.name }} {% endfor %} {% else %}
  • {% trans "No ctf available." %}
    • @@ -33,7 +33,7 @@