From 9a6812367df13b1a2fa90bd65149f7998f3651c9 Mon Sep 17 00:00:00 2001 From: Étienne Loks Date: Fri, 31 Jan 2025 18:11:11 +0100 Subject: 🐛 fix no translations for homepage on new instances (refs #6136) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../migrations/0251_data_default_welcome.py | 8 ++++---- .../templates/ishtar/homepage_default.html | 22 +++++++++++++++++++++ ishtar_common/utils_migrations.py | 23 ---------------------- ishtar_common/views.py | 6 +++--- 4 files changed, 29 insertions(+), 30 deletions(-) create mode 100644 ishtar_common/templates/ishtar/homepage_default.html diff --git a/ishtar_common/migrations/0251_data_default_welcome.py b/ishtar_common/migrations/0251_data_default_welcome.py index df1f10a5e..cf7723de1 100644 --- a/ishtar_common/migrations/0251_data_default_welcome.py +++ b/ishtar_common/migrations/0251_data_default_welcome.py @@ -2,17 +2,18 @@ from django.conf import settings from django.db import migrations -from django.template import Context, Template +from django.template import loader from django.utils import translation -from ishtar_common.utils_migrations import HOMEPAGE_DEFAULT, HOMEPAGE_TITLE +from ishtar_common.utils_migrations import HOMEPAGE_TITLE def default_welcome(apps, __): IshtarSiteProfile = apps.get_model("ishtar_common", "IshtarSiteProfile") old_language = translation.get_language() translation.activate(settings.LANGUAGE_CODE) - homepage = Template(HOMEPAGE_DEFAULT).render(Context({}, use_l10n=True)) + + homepage = loader.render_to_string("ishtar/homepage_default.html") title = str(HOMEPAGE_TITLE) translation.activate(old_language) for profile in IshtarSiteProfile.objects.all(): @@ -27,7 +28,6 @@ def default_welcome(apps, __): profile.save() - class Migration(migrations.Migration): dependencies = [ diff --git a/ishtar_common/templates/ishtar/homepage_default.html b/ishtar_common/templates/ishtar/homepage_default.html new file mode 100644 index 000000000..8e9a680d0 --- /dev/null +++ b/ishtar_common/templates/ishtar/homepage_default.html @@ -0,0 +1,22 @@ +{% load i18n %} +

{% trans "Some useful links:" %}

+ + diff --git a/ishtar_common/utils_migrations.py b/ishtar_common/utils_migrations.py index 3400e1738..21de2fefa 100644 --- a/ishtar_common/utils_migrations.py +++ b/ishtar_common/utils_migrations.py @@ -12,29 +12,6 @@ from django.utils.translation import ugettext_lazy HOMEPAGE_TITLE = ugettext_lazy("Welcome in Ishtar, open source software for management and inventory of archaeological data") -HOMEPAGE_DEFAULT = """{% load i18n %} -

{% trans "Some useful links:" %}

- -""" - def migrations_load_data(module_name, migration_filename): json_path = os.sep.join(os.path.abspath(__file__).split(os.sep)[:-2] + [ diff --git a/ishtar_common/views.py b/ishtar_common/views.py index 56cf97aa6..1f7ffede7 100644 --- a/ishtar_common/views.py +++ b/ishtar_common/views.py @@ -53,7 +53,6 @@ from django.http import ( JsonResponse, ) from django.shortcuts import redirect, render, get_object_or_404 -from django.template import Context, Template from django.urls import reverse, NoReverseMatch from django.utils import translation from django.utils.decorators import method_decorator @@ -75,7 +74,7 @@ from ishtar_common.data_importer import ImporterError from ishtar_common.forms import FinalForm, FinalDeleteForm, reverse_lazy from ishtar_common.models import get_current_profile from ishtar_common.templatetags.link_to_window import simple_link_to_window -from ishtar_common.utils_migrations import HOMEPAGE_DEFAULT, HOMEPAGE_TITLE +from ishtar_common.utils_migrations import HOMEPAGE_TITLE from ishtar_common.utils import ( clean_session_cache, CSV_OPTIONS, @@ -224,7 +223,8 @@ def index(request): else: old_language = translation.get_language() translation.activate(settings.LANGUAGE_CODE) - dct["homepage"] = Template(HOMEPAGE_DEFAULT).render(Context({}, use_l10n=True)) + + dct["homepage"] = loader.render_to_string("ishtar/homepage_default.html") translation.activate(old_language) dct["homepage"] = dct["homepage"].replace("ISHTAR_DOCUMENT_VERSION", settings.ISHTAR_DOCUMENT_VERSION) -- cgit v1.2.3