From 62b3b7e5cd5d8a2da9675c8171512083b4f2c6c2 Mon Sep 17 00:00:00 2001 From: ix <0x00fi@protonmail.com> Date: Tue, 7 Sep 2021 21:13:30 +0200 Subject: [PATCH] internationalization for news --- src/ctfs/templates/ctfs/ctf_info.html | 2 +- .../migrations/0002_auto_20210907_1912.py | 33 +++++++++++++++++++ src/home/models.py | 5 ++- src/home/templates/home/home.html | 15 ++++++++- src/home/views.py | 13 ++++++++ src/locale/de/LC_MESSAGES/django.po | 23 +++++++------ src/locale/en/LC_MESSAGES/django.po | 23 +++++++------ src/locale/es/LC_MESSAGES/django.po | 23 +++++++------ src/locale/fr/LC_MESSAGES/django.po | 23 +++++++------ src/locale/it/LC_MESSAGES/django.po | 23 +++++++------ src/locale/ru/LC_MESSAGES/django.po | 23 +++++++------ 11 files changed, 131 insertions(+), 75 deletions(-) create mode 100644 src/home/migrations/0002_auto_20210907_1912.py diff --git a/src/ctfs/templates/ctfs/ctf_info.html b/src/ctfs/templates/ctfs/ctf_info.html index 70043c6..4d08e8b 100644 --- a/src/ctfs/templates/ctfs/ctf_info.html +++ b/src/ctfs/templates/ctfs/ctf_info.html @@ -12,7 +12,7 @@ {% if description %} {{ description|safe }} {% else %} - {% trans "No translation available for this challenge. Try another lang (French or English)." %} + {% trans "No translation available. Please try another language (English or French)." %} {% endif %}
diff --git a/src/home/migrations/0002_auto_20210907_1912.py b/src/home/migrations/0002_auto_20210907_1912.py new file mode 100644 index 0000000..872a90c --- /dev/null +++ b/src/home/migrations/0002_auto_20210907_1912.py @@ -0,0 +1,33 @@ +# Generated by Django 3.2.7 on 2021-09-07 19:12 + +from django.db import migrations, models + + +class Migration(migrations.Migration): + + dependencies = [ + ('home', '0001_initial'), + ] + + operations = [ + migrations.AddField( + model_name='new', + name='content_de', + field=models.TextField(blank=True), + ), + migrations.AddField( + model_name='new', + name='content_en', + field=models.TextField(blank=True), + ), + migrations.AddField( + model_name='new', + name='content_ru', + field=models.TextField(blank=True), + ), + migrations.AlterField( + model_name='new', + name='content', + field=models.TextField(blank=True), + ), + ] diff --git a/src/home/models.py b/src/home/models.py index 0f7cfe7..5fc2856 100644 --- a/src/home/models.py +++ b/src/home/models.py @@ -2,7 +2,10 @@ from django.db import models class new(models.Model): name = models.CharField(max_length=100) - content = models.TextField() + content = models.TextField(blank=True) + content_en = models.TextField(blank=True) + content_ru = models.TextField(blank=True) + content_de = models.TextField(blank=True) slug = models.SlugField(max_length=55) pub_date = models.DateTimeField('Date published') def __str__(self): diff --git a/src/home/templates/home/home.html b/src/home/templates/home/home.html index 208cadb..bcc5ee3 100644 --- a/src/home/templates/home/home.html +++ b/src/home/templates/home/home.html @@ -1,6 +1,7 @@ {% extends 'base.html' %} {% block content %} {% load i18n %} +{% get_current_language as lang %}
{% if news %} @@ -8,7 +9,19 @@
{{ n.name|safe }}
-

{{ n.content|safe }}

+

+ {% if lang == "fr" and n.content %} + {{ n.content|safe }} + {% elif lang == "en" and n.content_en %} + {{ n.content_en|safe }} + {% elif lang == "de" and n.content_de %} + {{ n.content_de|safe }} + {% elif lang == "ru" and n.content_ru %} + {{ n.content_ru|safe }} + {% else %} + {% trans "No translation available. Please try another language (English or French)." %} + {% endif %} +

{{ n.pub_date }} diff --git a/src/home/views.py b/src/home/views.py index a31b52e..c5809a5 100644 --- a/src/home/views.py +++ b/src/home/views.py @@ -9,6 +9,19 @@ from django.utils.translation import ( LANGUAGE_SESSION_KEY, check_for_language, get_language, ) +def get_content_by_lang(news): + lang = get_language() + ret = None + if lang == "fr": + ret = news.content + elif lang == "en": + ret = news.content_en + elif lang == "de": + ret = news.content_de + elif lang == "ru": + ret = news.content_ru + return ret + def home(request): lang_code = get_language() if hasattr(request, 'session') and LANGUAGE_SESSION_KEY in request.session: diff --git a/src/locale/de/LC_MESSAGES/django.po b/src/locale/de/LC_MESSAGES/django.po index 73b0b36..be59b1a 100644 --- a/src/locale/de/LC_MESSAGES/django.po +++ b/src/locale/de/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-09-07 19:50+0200\n" +"POT-Creation-Date: 2021-09-07 21:12+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -166,10 +166,9 @@ msgstr "" msgid "Published date" msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:15 +#: ctfs/templates/ctfs/ctf_info.html:15 home/templates/home/home.html:22 msgid "" -"No translation available for this challenge. Try another lang (French or " -"English)." +"No translation available. Please try another language (English or French)." msgstr "" #: ctfs/templates/ctfs/ctf_info.html:21 @@ -224,35 +223,35 @@ msgstr "" msgid "No category available." msgstr "" -#: home/templates/home/home.html:19 +#: home/templates/home/home.html:32 msgid "No article available." msgstr "" -#: home/templates/home/home.html:24 +#: home/templates/home/home.html:37 msgid "Latest challenges added" msgstr "" -#: home/templates/home/home.html:30 +#: home/templates/home/home.html:43 msgid "No ctf available." msgstr "" -#: home/templates/home/home.html:40 +#: home/templates/home/home.html:53 msgid "Flags counter" msgstr "" -#: project/settings.py:111 +#: project/settings.py:113 msgid "English" msgstr "" -#: project/settings.py:112 +#: project/settings.py:114 msgid "German" msgstr "" -#: project/settings.py:113 +#: project/settings.py:115 msgid "French" msgstr "" -#: project/settings.py:114 +#: project/settings.py:116 msgid "Russian" msgstr "" diff --git a/src/locale/en/LC_MESSAGES/django.po b/src/locale/en/LC_MESSAGES/django.po index 73b0b36..be59b1a 100644 --- a/src/locale/en/LC_MESSAGES/django.po +++ b/src/locale/en/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-09-07 19:50+0200\n" +"POT-Creation-Date: 2021-09-07 21:12+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -166,10 +166,9 @@ msgstr "" msgid "Published date" msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:15 +#: ctfs/templates/ctfs/ctf_info.html:15 home/templates/home/home.html:22 msgid "" -"No translation available for this challenge. Try another lang (French or " -"English)." +"No translation available. Please try another language (English or French)." msgstr "" #: ctfs/templates/ctfs/ctf_info.html:21 @@ -224,35 +223,35 @@ msgstr "" msgid "No category available." msgstr "" -#: home/templates/home/home.html:19 +#: home/templates/home/home.html:32 msgid "No article available." msgstr "" -#: home/templates/home/home.html:24 +#: home/templates/home/home.html:37 msgid "Latest challenges added" msgstr "" -#: home/templates/home/home.html:30 +#: home/templates/home/home.html:43 msgid "No ctf available." msgstr "" -#: home/templates/home/home.html:40 +#: home/templates/home/home.html:53 msgid "Flags counter" msgstr "" -#: project/settings.py:111 +#: project/settings.py:113 msgid "English" msgstr "" -#: project/settings.py:112 +#: project/settings.py:114 msgid "German" msgstr "" -#: project/settings.py:113 +#: project/settings.py:115 msgid "French" msgstr "" -#: project/settings.py:114 +#: project/settings.py:116 msgid "Russian" msgstr "" diff --git a/src/locale/es/LC_MESSAGES/django.po b/src/locale/es/LC_MESSAGES/django.po index 73b0b36..be59b1a 100644 --- a/src/locale/es/LC_MESSAGES/django.po +++ b/src/locale/es/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-09-07 19:50+0200\n" +"POT-Creation-Date: 2021-09-07 21:12+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -166,10 +166,9 @@ msgstr "" msgid "Published date" msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:15 +#: ctfs/templates/ctfs/ctf_info.html:15 home/templates/home/home.html:22 msgid "" -"No translation available for this challenge. Try another lang (French or " -"English)." +"No translation available. Please try another language (English or French)." msgstr "" #: ctfs/templates/ctfs/ctf_info.html:21 @@ -224,35 +223,35 @@ msgstr "" msgid "No category available." msgstr "" -#: home/templates/home/home.html:19 +#: home/templates/home/home.html:32 msgid "No article available." msgstr "" -#: home/templates/home/home.html:24 +#: home/templates/home/home.html:37 msgid "Latest challenges added" msgstr "" -#: home/templates/home/home.html:30 +#: home/templates/home/home.html:43 msgid "No ctf available." msgstr "" -#: home/templates/home/home.html:40 +#: home/templates/home/home.html:53 msgid "Flags counter" msgstr "" -#: project/settings.py:111 +#: project/settings.py:113 msgid "English" msgstr "" -#: project/settings.py:112 +#: project/settings.py:114 msgid "German" msgstr "" -#: project/settings.py:113 +#: project/settings.py:115 msgid "French" msgstr "" -#: project/settings.py:114 +#: project/settings.py:116 msgid "Russian" msgstr "" diff --git a/src/locale/fr/LC_MESSAGES/django.po b/src/locale/fr/LC_MESSAGES/django.po index f8ad031..24440f6 100644 --- a/src/locale/fr/LC_MESSAGES/django.po +++ b/src/locale/fr/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-09-07 19:50+0200\n" +"POT-Creation-Date: 2021-09-07 21:12+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -168,10 +168,9 @@ msgstr "Mis à jour." msgid "Published date" msgstr "Date de publication" -#: ctfs/templates/ctfs/ctf_info.html:15 +#: ctfs/templates/ctfs/ctf_info.html:15 home/templates/home/home.html:22 msgid "" -"No translation available for this challenge. Try another lang (French or " -"English)." +"No translation available. Please try another language (English or French)." msgstr "" #: ctfs/templates/ctfs/ctf_info.html:21 @@ -226,35 +225,35 @@ msgstr "Catégories" msgid "No category available." msgstr "Il n'y a pas de catégorie disponible." -#: home/templates/home/home.html:19 +#: home/templates/home/home.html:32 msgid "No article available." msgstr "Il n'y a pas d'article disponible." -#: home/templates/home/home.html:24 +#: home/templates/home/home.html:37 msgid "Latest challenges added" msgstr "Derniers challenges ajoutés" -#: home/templates/home/home.html:30 +#: home/templates/home/home.html:43 msgid "No ctf available." msgstr "Pas de challenge disponible" -#: home/templates/home/home.html:40 +#: home/templates/home/home.html:53 msgid "Flags counter" msgstr "Compteur de flags" -#: project/settings.py:111 +#: project/settings.py:113 msgid "English" msgstr "Anglais" -#: project/settings.py:112 +#: project/settings.py:114 msgid "German" msgstr "Allemand" -#: project/settings.py:113 +#: project/settings.py:115 msgid "French" msgstr "Français" -#: project/settings.py:114 +#: project/settings.py:116 msgid "Russian" msgstr "Russe" diff --git a/src/locale/it/LC_MESSAGES/django.po b/src/locale/it/LC_MESSAGES/django.po index 73b0b36..be59b1a 100644 --- a/src/locale/it/LC_MESSAGES/django.po +++ b/src/locale/it/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-09-07 19:50+0200\n" +"POT-Creation-Date: 2021-09-07 21:12+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -166,10 +166,9 @@ msgstr "" msgid "Published date" msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:15 +#: ctfs/templates/ctfs/ctf_info.html:15 home/templates/home/home.html:22 msgid "" -"No translation available for this challenge. Try another lang (French or " -"English)." +"No translation available. Please try another language (English or French)." msgstr "" #: ctfs/templates/ctfs/ctf_info.html:21 @@ -224,35 +223,35 @@ msgstr "" msgid "No category available." msgstr "" -#: home/templates/home/home.html:19 +#: home/templates/home/home.html:32 msgid "No article available." msgstr "" -#: home/templates/home/home.html:24 +#: home/templates/home/home.html:37 msgid "Latest challenges added" msgstr "" -#: home/templates/home/home.html:30 +#: home/templates/home/home.html:43 msgid "No ctf available." msgstr "" -#: home/templates/home/home.html:40 +#: home/templates/home/home.html:53 msgid "Flags counter" msgstr "" -#: project/settings.py:111 +#: project/settings.py:113 msgid "English" msgstr "" -#: project/settings.py:112 +#: project/settings.py:114 msgid "German" msgstr "" -#: project/settings.py:113 +#: project/settings.py:115 msgid "French" msgstr "" -#: project/settings.py:114 +#: project/settings.py:116 msgid "Russian" msgstr "" diff --git a/src/locale/ru/LC_MESSAGES/django.po b/src/locale/ru/LC_MESSAGES/django.po index 40a03c2..6b6fe3d 100644 --- a/src/locale/ru/LC_MESSAGES/django.po +++ b/src/locale/ru/LC_MESSAGES/django.po @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2021-09-07 19:50+0200\n" +"POT-Creation-Date: 2021-09-07 21:12+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -168,10 +168,9 @@ msgstr "" msgid "Published date" msgstr "" -#: ctfs/templates/ctfs/ctf_info.html:15 +#: ctfs/templates/ctfs/ctf_info.html:15 home/templates/home/home.html:22 msgid "" -"No translation available for this challenge. Try another lang (French or " -"English)." +"No translation available. Please try another language (English or French)." msgstr "" #: ctfs/templates/ctfs/ctf_info.html:21 @@ -226,35 +225,35 @@ msgstr "" msgid "No category available." msgstr "" -#: home/templates/home/home.html:19 +#: home/templates/home/home.html:32 msgid "No article available." msgstr "Нет доступных статей." -#: home/templates/home/home.html:24 +#: home/templates/home/home.html:37 msgid "Latest challenges added" msgstr "" -#: home/templates/home/home.html:30 +#: home/templates/home/home.html:43 msgid "No ctf available." msgstr "" -#: home/templates/home/home.html:40 +#: home/templates/home/home.html:53 msgid "Flags counter" msgstr "" -#: project/settings.py:111 +#: project/settings.py:113 msgid "English" msgstr "" -#: project/settings.py:112 +#: project/settings.py:114 msgid "German" msgstr "" -#: project/settings.py:113 +#: project/settings.py:115 msgid "French" msgstr "" -#: project/settings.py:114 +#: project/settings.py:116 msgid "Russian" msgstr ""