richie 3.1.3.dev8__py2.py3-none-any.whl → 3.1.3.dev11__py2.py3-none-any.whl

richie/apps/core/defaults.py

@@ -51,7 +51,20 @@ for site_language in LANGUAGES_DICT:
 # regions.
 RFC_5646_LOCALES = lazy(
     lambda: getattr(
-        settings, "RFC_5646_LOCALES", ["en-US", "es-ES", "pt-PT", "fr-FR", "fr-CA"]
+        settings,
+        "RFC_5646_LOCALES",
+        [
+            "en-US",
+            "es-ES",
+            "pt-PT",
+            "pt-BR",
+            "fr-FR",
+            "fr-CA",
+            "ru-RU",
+            "vi-VN",
+            "ar-SA",
+            "ko-KR",
+        ],
     ),
     list,
 )()

richie/apps/core/templatetags/language_name.py

@@ -5,7 +5,7 @@ from django.conf import settings
 from django.utils import translation
 
 # do not use the lazy
-from django.utils.translation import gettext as _
+from django.utils.translation import gettext_lazy as _
 
 register = template.Library()
 

richie/apps/demo/defaults.py

@@ -1,6 +1,8 @@
 """Parameters that define how the demo site will be built."""
 
 from django.conf import settings
+from django.utils import translation
+from django.utils.translation import gettext_lazy as _
 
 from .utils import pick_image
 
@@ -36,60 +38,82 @@ NB_OBJECTS = {
 }
 NB_OBJECTS.update(getattr(settings, "RICHIE_DEMO_NB_OBJECTS", {}))
 
+languages = getattr(settings, "LANGUAGES", ())
+
+
+def translate_message(code, label):
+    """Translate a message in a specific language."""
+
+    with translation.override(code):
+        new_label = str(_(label))
+        return new_label
+
+
+def set_labels_by_language(label):
+    """Set a label for all languages."""
+
+    labels = {}
+
+    for language in languages:
+        labels.update({str(language[0]): translate_message(language[0], label)})
+
+    return labels
+
+
 PAGES_INFO = {
     "home": {
-        "title": {"en": "Home", "fr": "Accueil"},
+        "title": set_labels_by_language("Home"),
         "in_navigation": False,
         "is_homepage": True,
         "template": "richie/homepage.html",
     },
     "blogposts": {
-        "title": {"en": "News", "fr": "Actualités"},
+        "title": set_labels_by_language("News"),
         "in_navigation": True,
         "template": "courses/cms/blogpost_list.html",
     },
     "courses": {
-        "title": {"en": "Courses", "fr": "Cours"},
+        "title": set_labels_by_language("Courses"),
         "in_navigation": True,
         "template": "search/search.html",
     },
     "categories": {
-        "title": {"en": "Categories", "fr": "Catégories"},
+        "title": set_labels_by_language("Categories"),
         "in_navigation": True,
         "template": "courses/cms/category_list.html",
     },
     "organizations": {
-        "title": {"en": "Organizations", "fr": "Établissements"},
+        "title": set_labels_by_language("Organizations"),
         "in_navigation": True,
         "template": "courses/cms/organization_list.html",
     },
     "persons": {
-        "title": {"en": "Persons", "fr": "Personnes"},
+        "title": set_labels_by_language("Persons"),
         "in_navigation": True,
         "template": "courses/cms/person_list.html",
     },
     "programs": {
-        "title": {"en": "Programs", "fr": "Parcours"},
+        "title": set_labels_by_language("Programs"),
         "in_navigation": True,
         "template": "courses/cms/program_list.html",
     },
     "annex": {
-        "title": {"en": "Annex", "fr": "Annexe"},
+        "title": set_labels_by_language("Annex"),
         "in_navigation": False,
         "template": "richie/single_column.html",
         "children": {
             "annex__about": {
-                "title": {"en": "About", "fr": "A propos"},
+                "title": set_labels_by_language("About"),
                 "in_navigation": True,
                 "template": "richie/single_column.html",
             },
             "annex__sitemap": {
-                "title": {"en": "Sitemap", "fr": "Plan de site"},
+                "title": set_labels_by_language("Sitemap"),
                 "in_navigation": True,
                 "template": "richie/single_column.html",
             },
             "login-error": {
-                "title": {"en": "Login error", "fr": "Erreur de connexion"},
+                "title": set_labels_by_language("Login error"),
                 "in_navigation": False,
                 "template": "richie/single_column.html",
             },
@@ -100,202 +124,136 @@ PAGES_INFO.update(getattr(settings, "RICHIE_DEMO_PAGES_INFO", {}))
 
 
 LEVELS_INFO = {
-    "page_title": {"en": "Level", "fr": "Niveau"},
+    "page_title": set_labels_by_language("Level"),
     "children": [
-        {"page_title": {"en": "Beginner", "fr": "Débutant"}},
-        {"page_title": {"en": "Advanced", "fr": "Avancé"}},
-        {"page_title": {"en": "Expert", "fr": "Expert"}},
+        {"page_title": set_labels_by_language("Beginner")},
+        {"page_title": set_labels_by_language("Advanced")},
+        {"page_title": set_labels_by_language("Expert")},
     ],
     "page_reverse_id": "levels",
 }
 LEVELS_INFO.update(getattr(settings, "RICHIE_DEMO_LEVELS_INFO", {}))
 
 PARTNERSHIPS_INFO = {
-    "page_title": {"en": "Partnership", "fr": "Partenariat"},
+    "page_title": set_labels_by_language("Partnership"),
     "children": [
-        {"page_title": {"en": "Gold", "fr": "Or"}},
-        {"page_title": {"en": "Silver", "fr": "Argent"}},
-        {"page_title": {"en": "Bronze", "fr": "Bronze"}},
+        {"page_title": set_labels_by_language("Gold")},
+        {"page_title": set_labels_by_language("Silver")},
+        {"page_title": set_labels_by_language("Bronze")},
     ],
     "page_reverse_id": "partnerships",
 }
 PARTNERSHIPS_INFO.update(getattr(settings, "RICHIE_DEMO_PARTNERSHIPS_INFO", {}))
 
 TAGS_INFO = {
-    "page_title": {"en": "Tag", "fr": "Etiquette"},
+    "page_title": set_labels_by_language("Tag"),
     "children": [
-        {"page_title": {"en": "Event", "fr": "Evénement"}},
-        {"page_title": {"en": "Feature", "fr": "Fonctionnalité"}},
-        {"page_title": {"en": "Around the course", "fr": "Autour du cours"}},
-        {"page_title": {"en": "Partner", "fr": "Partenaire"}},
-        {"page_title": {"en": "Portrait", "fr": "Portrait"}},
-        {"page_title": {"en": "Recruitment", "fr": "Recrutement"}},
+        {"page_title": set_labels_by_language("Event")},
+        {"page_title": set_labels_by_language("Feature")},
+        {"page_title": set_labels_by_language("Around the course")},
+        {"page_title": set_labels_by_language("Partner")},
+        {"page_title": set_labels_by_language("Portrait")},
+        {"page_title": set_labels_by_language("Recruitment")},
     ],
     "page_reverse_id": "tags",
 }
 TAGS_INFO.update(getattr(settings, "RICHIE_DEMO_TAGS_INFO", {}))
 
 SUBJECTS_INFO = {
-    "page_title": {"en": "Subject", "fr": "Sujet"},
+    "page_title": set_labels_by_language("Subject"),
     "children": [
         {
-            "page_title": {"en": "Science", "fr": "Sciences"},
+            "page_title": set_labels_by_language("Science"),
             "children": [
+                {"page_title": set_labels_by_language("Agronomy and Agriculture")},
+                {"page_title": set_labels_by_language("Chemistry")},
+                {"page_title": set_labels_by_language("Discovery of the Universe")},
+                {"page_title": set_labels_by_language("Environment")},
+                {"page_title": set_labels_by_language("Mathematics and Statistics")},
+                {"page_title": set_labels_by_language("Tools for Research")},
+                {"page_title": set_labels_by_language("Physics")},
+                {"page_title": set_labels_by_language("Cognitive science")},
                 {
-                    "page_title": {
-                        "en": "Agronomy and Agriculture",
-                        "fr": "Agronomie et Agriculture",
-                    }
-                },
-                {"page_title": {"en": "Chemistry", "fr": "Chimie"}},
-                {
-                    "page_title": {
-                        "en": "Discovery of the Universe",
-                        "fr": "Découverte de l'Univers",
-                    }
-                },
-                {"page_title": {"en": "Environment", "fr": "Environnement"}},
-                {
-                    "page_title": {
-                        "en": "Mathematics and Statistics",
-                        "fr": "Mathématiques et Statistiques",
-                    }
-                },
-                {
-                    "page_title": {
-                        "en": "Tools for Research",
-                        "fr": "Outils pour la Recherche",
-                    }
-                },
-                {"page_title": {"en": "Physics", "fr": "Physique"}},
-                {
-                    "page_title": {
-                        "en": "Cognitive science",
-                        "fr": "Sciences cognitives",
-                    }
-                },
-                {
-                    "page_title": {
-                        "en": "Earth science and science of the Universe",
-                        "fr": "Sciences de la Terre et de l'Univers",
-                    }
-                },
-                {"page_title": {"en": "Life science", "fr": "Sciences de la vie"}},
-                {
-                    "page_title": {
-                        "en": "Engineering science",
-                        "fr": "Sciences pour l'ingénieur",
-                    }
+                    "page_title": set_labels_by_language(
+                        "Earth science and science of the Universe"
+                    )
                 },
+                {"page_title": set_labels_by_language("Life science")},
+                {"page_title": set_labels_by_language("Engineering science")},
             ],
         },
         {
-            "page_title": {
-                "en": "Human and social sciences",
-                "fr": "Sciences humaines et social",
-            },
+            "page_title": set_labels_by_language("Human and social sciences"),
             "children": [
-                {"page_title": {"en": "Communication", "fr": "Communication"}},
-                {
-                    "page_title": {
-                        "en": "Creation, Arts and Design",
-                        "fr": "Création, Arts et Design",
-                    }
-                },
-                {
-                    "page_title": {
-                        "en": "Culture and Civilization",
-                        "fr": "Cultures et Civilisations",
-                    }
-                },
+                {"page_title": set_labels_by_language("Communication")},
+                {"page_title": set_labels_by_language("Creation, Arts and Design")},
+                {"page_title": set_labels_by_language("Culture and Civilization")},
                 {
-                    "page_title": {
-                        "en": "Social Issues and Social Policy",
-                        "fr": "Enjeux de société",
-                    }
+                    "page_title": set_labels_by_language(
+                        "Social Issues and Social Policy"
+                    )
                 },
-                {"page_title": {"en": "Geography", "fr": "Géographie"}},
-                {"page_title": {"en": "History", "fr": "Histoire"}},
-                {"page_title": {"en": "Innovation", "fr": "Innovation"}},
-                {"page_title": {"en": "Literature", "fr": "Lettres"}},
-                {"page_title": {"en": "Media", "fr": "Médias"}},
-                {"page_title": {"en": "Philosophy", "fr": "Philosophie"}},
-                {
-                    "page_title": {
-                        "en": "Political science",
-                        "fr": "Sciences politiques",
-                    }
-                },
-                {
-                    "page_title": {
-                        "en": "International relations",
-                        "fr": "Relations internationales",
-                    }
-                },
-                {"page_title": {"en": "Sports", "fr": "Sport"}},
+                {"page_title": set_labels_by_language("Geography")},
+                {"page_title": set_labels_by_language("History")},
+                {"page_title": set_labels_by_language("Innovation")},
+                {"page_title": set_labels_by_language("Literature")},
+                {"page_title": set_labels_by_language("Media")},
+                {"page_title": set_labels_by_language("Philosophy")},
+                {"page_title": set_labels_by_language("Political science")},
+                {"page_title": set_labels_by_language("International relations")},
+                {"page_title": set_labels_by_language("Sports")},
             ],
         },
-        {"page_title": {"en": "Law", "fr": "Droit et juridique"}},
-        {"page_title": {"en": "Economy and Finance", "fr": "Economie et Finance"}},
+        {"page_title": set_labels_by_language("Law")},
+        {"page_title": set_labels_by_language("Economy and Finance")},
+        {"page_title": set_labels_by_language("Education and Training")},
+        {"page_title": set_labels_by_language("Management")},
+        {"page_title": set_labels_by_language("Entrepreneurship")},
         {
-            "page_title": {
-                "en": "Education and Training",
-                "fr": "Education et formation",
-            }
-        },
-        {"page_title": {"en": "Management", "fr": "Management"}},
-        {"page_title": {"en": "Entrepreneurship", "fr": "Entreprenariat"}},
-        {
-            "page_title": {"en": "Computer science", "fr": "Informatique"},
+            "page_title": set_labels_by_language("Computer science"),
             "children": [
+                {"page_title": set_labels_by_language("Digital and Technology")},
                 {
-                    "page_title": {
-                        "en": "Digital and Technology",
-                        "fr": "Numérique et Technologie",
-                    }
-                },
-                {
-                    "page_title": {
-                        "en": "Telecommunication and Networks",
-                        "fr": "Télécommunications et Réseaux",
-                    }
+                    "page_title": set_labels_by_language(
+                        "Telecommunication and Networks"
+                    )
                 },
-                {"page_title": {"en": "Coding", "fr": "Programmation"}},
+                {"page_title": set_labels_by_language("Coding")},
             ],
         },
-        {"page_title": {"en": "Languages", "fr": "Langues"}},
-        {"page_title": {"en": "Education and career guidance", "fr": "Orientation"}},
-        {"page_title": {"en": "Health", "fr": "Santé"}},
+        {"page_title": set_labels_by_language("Languages")},
+        {"page_title": set_labels_by_language("Education and career guidance")},
+        {"page_title": set_labels_by_language("Health")},
     ],
     "page_reverse_id": "subjects",
 }
 SUBJECTS_INFO.update(getattr(settings, "RICHIE_DEMO_SUBJECTS_INFO", {}))
 
 ICONS_INFO = {
-    "page_title": {"en": "Icons", "fr": "Icônes"},
+    "page_title": set_labels_by_language("Icons"),
     "children": [
         {
-            "page_title": {"en": "Academic", "fr": "Diplomant"},
+            "page_title": set_labels_by_language("Academic"),
             "color": "#005c08",
             "fill_icon": pick_image("icons")("academic.png"),
         },
         {
-            "page_title": {"en": "Accessible", "fr": "Accessible"},
+            "page_title": set_labels_by_language("Accessible"),
             "color": "#00a1d6",
             "fill_icon": pick_image("icons")("accessible.png"),
         },
         {
-            "page_title": {"en": "Closed caption", "fr": "Malentendants"},
+            "page_title": set_labels_by_language("Closed caption"),
             "color": "#a11000",
             "fill_icon": pick_image("icons")("cc.png"),
         },
         {
-            "page_title": {"en": "Certificate", "fr": "Certifiant"},
+            "page_title": set_labels_by_language("Certificate"),
             "color": "#ffc400",
             "fill_icon": pick_image("icons")("certificate.png"),
         },
         {
-            "page_title": {"en": "Subtitles", "fr": "Sous-titres"},
+            "page_title": set_labels_by_language("Subtitles"),
             "color": "#6d00ba",
             "fill_icon": pick_image("icons")("subtitles.png"),
         },
@@ -305,113 +263,70 @@ ICONS_INFO = {
 ICONS_INFO.update(getattr(settings, "RICHIE_DEMO_ICONS_INFO", {}))
 
 HOMEPAGE_CONTENT = {
-    "en": {
-        "banner_title": "Welcome to Richie",
+    str(code): {
+        "banner_title": translate_message(str(code), "Welcome to Richie"),
         "banner_content": (
-            """<h1 class="hero-intro__title">Welcome <strong>to Richie</strong></h1>"""
-            """<p>It works! This is the default homepage for the Richie CMS.</p>"""
+            f"""
+<h1 class="hero-intro__title">{translate_message(str(code), "Welcome")}
+<strong>{translate_message(str(code), "to Richie")}</strong></h1>
+<p>{translate_message(str(code), "It works! This is the default homepage for the Richie CMS.")}</p>
+"""
         ),
         "banner_template": "richie/large_banner/hero-intro.html",
         "button_template_name": "button-caesura",
         "section_template": "richie/section/section.html",
-        "blogposts_title": "Last news",
-        "blogposts_button_title": "More news",
-        "courses_title": "Popular courses",
-        "courses_button_title": "More courses",
-        "organizations_title": "Universities",
-        "organizations_button_title": "More universities",
-        "persons_title": "Persons",
-        "persons_button_title": "More persons",
-        "programs_title": "Programs",
-        "programs_button_title": "More programs",
-        "subjects_title": "Subjects",
-        "subjects_button_title": "More subjects",
-    },
-    "fr": {
-        "banner_title": "Bienvenue sur Richie",
-        "banner_content": (
-            """<h1 class="hero-intro__title">Bienvenue <strong>sur Richie</strong></h1>"""
-            """<p>Ça marche ! Ceci est la page d'accueil par défaut du CMS Richie.</p>"""
-        ),
-        "banner_template": "richie/large_banner/hero-intro.html",
-        "button_template_name": "button-caesura",
-        "section_template": "richie/section/section.html",
-        "blogposts_title": "Actualités récentes",
-        "blogposts_button_title": "Plus d'actualités",
-        "courses_title": "Cours à la une",
-        "courses_button_title": "Plus de cours",
-        "organizations_title": "Universités",
-        "organizations_button_title": "Plus d'universités",
-        "subjects_title": "Thématiques",
-        "subjects_button_title": "Plus de thématiques",
-        "persons_title": "Personnes",
-        "persons_button_title": "Plus de personnes",
-        "programs_title": "Parcours",
-        "programs_button_title": "Plus de parcours",
-    },
+        "blogposts_title": translate_message(str(code), "Last news"),
+        "blogposts_button_title": translate_message(str(code), "More news"),
+        "courses_title": translate_message(str(code), "Popular courses"),
+        "courses_button_title": translate_message(str(code), "More courses"),
+        "organizations_title": translate_message(str(code), "Universities"),
+        "organizations_button_title": translate_message(str(code), "More universities"),
+        "persons_title": translate_message(str(code), "Persons"),
+        "persons_button_title": translate_message(str(code), "More persons"),
+        "programs_title": translate_message(str(code), "Programs"),
+        "programs_button_title": translate_message(str(code), "More programs"),
+        "subjects_title": translate_message(str(code), "Subjects"),
+        "subjects_button_title": translate_message(str(code), "More subjects"),
+    }
+    for code, _ in languages
 }
 HOMEPAGE_CONTENT.update(getattr(settings, "RICHIE_DEMO_HOMEPAGE_CONTENT", {}))
 
 SINGLECOLUMN_CONTENT = {
-    "en": {
-        "banner_title": "Single column template sample",
-        "banner_content": "It works! This is a single column page.",
-        "banner_template": "richie/large_banner/hero-intro.html",
-        "button_template_name": "button-caesura",
-        "section_sample_title": "A sample section",
-        "section_sample_button_title": "More!",
-        "section_sample_template": "richie/section/section.html",
-    },
-    "fr": {
-        "banner_title": "Exemple de template avec une colonne unique",
-        "banner_content": "Ça marche ! Ceci est une page d'une colonne.",
+    str(code): {
+        "banner_title": translate_message(str(code), "Single column template sample"),
+        "banner_content": translate_message(
+            str(code), "It works! This is a single column page."
+        ),
         "banner_template": "richie/large_banner/hero-intro.html",
         "button_template_name": "button-caesura",
-        "section_sample_title": "Une section d'exemple",
-        "section_sample_button_title": "Plus !",
+        "section_sample_title": translate_message(str(code), "A sample section"),
+        "section_sample_button_title": translate_message(str(code), "More"),
         "section_sample_template": "richie/section/section.html",
-    },
+    }
+    for code, _ in languages
 }
 SINGLECOLUMN_CONTENT.update(getattr(settings, "RICHIE_DEMO_SINGLECOLUMN_CONTENT", {}))
 
 FOOTER_CONTENT = {
-    "en": [
-        {"name": "About", "link": {"internal_link": "annex__about"}},
-        {"name": "Sitemap", "link": {"internal_link": "annex__sitemap"}},
-        {"name": "Style guide", "link": {"external_link": "/styleguide/"}},
+    str(code): [
         {
-            "title": "Richie community",
-            "items": [
-                {
-                    "name": "Website",
-                    "link": {"external_link": "https://richie.education"},
-                },
-                {
-                    "name": "Github",
-                    "link": {"external_link": "https://github.com/openfun/richie"},
-                },
-                {
-                    "name": "Site factory",
-                    "link": {
-                        "external_link": "https://github.com/openfun/richie-site-factory"
-                    },
-                },
-                {
-                    "name": "Example site",
-                    "link": {"external_link": "https://www.fun-campus.fr"},
-                },
-            ],
+            "name": translate_message(str(code), "About"),
+            "link": {"internal_link": "annex__about"},
+        },
+        {
+            "name": translate_message(str(code), "Sitemap"),
+            "link": {"internal_link": "annex__sitemap"},
+        },
+        {
+            "name": translate_message(str(code), "Style guide"),
+            "link": {"external_link": "/styleguide/"},
         },
-    ],
-    "fr": [
-        {"name": "A propos", "link": {"internal_link": "annex__about"}},
-        {"name": "Plan du site", "link": {"internal_link": "annex__sitemap"}},
-        {"name": "Style guide", "link": {"external_link": "/styleguide/"}},
         {
-            "title": "Communauté Richie",
+            "title": translate_message(str(code), "Richie community"),
             "items": [
                 {
-                    "name": "Site web",
+                    "name": translate_message(str(code), "Website"),
                     "link": {"external_link": "https://richie.education"},
                 },
                 {
@@ -419,24 +334,28 @@ FOOTER_CONTENT = {
                     "link": {"external_link": "https://github.com/openfun/richie"},
                 },
                 {
-                    "name": "Usine à sites",
+                    "name": translate_message(str(code), "Site factory"),
                     "link": {
                         "external_link": "https://github.com/openfun/richie-site-factory"
                     },
                 },
                 {
-                    "name": "Site exemple",
+                    "name": translate_message(str(code), "Example site"),
                     "link": {"external_link": "https://www.fun-campus.fr"},
                 },
             ],
         },
-    ],
+    ]
+    for code, _ in languages
 }
 FOOTER_CONTENT.update(getattr(settings, "RICHIE_DEMO_FOOTER_CONTENT", {}))
 
 COURSE_CONTENT = {
-    "en": {"partners_title": "Partners", "sponsors_title": "Sponsors"},
-    "fr": {"partners_title": "Partenaires", "sponsors_title": "Sponsors"},
+    str(code): {
+        "partners_title": translate_message(str(code), "Partners"),
+        "sponsors_title": translate_message(str(code), "Sponsors"),
+    }
+    for code, _ in languages
 }
 COURSE_CONTENT.update(getattr(settings, "RICHIE_DEMO_COURSE_CONTENT", {}))
 

richie/apps/demo/management/commands/create_demo_site.py

@@ -18,13 +18,12 @@ from cms.models import StaticPlaceholder
 from richie.apps.core.factories import create_text_plugin, image_getter
 from richie.apps.core.helpers import recursive_page_creation
 from richie.apps.courses import factories, models
+from richie.apps.demo import defaults
+from richie.apps.demo.helpers import create_categories
+from richie.apps.demo.utils import pick_image
 from richie.plugins.glimpse import defaults as glimpse_defaults
 from richie.plugins.glimpse.factories import GlimpseFactory
 
-from ... import defaults
-from ...helpers import create_categories
-from ...utils import pick_image
-
 logger = logging.getLogger("richie.commands.demo.create_demo_site")
 
 
@@ -73,6 +72,9 @@ def create_demo_site():
     site.name = "Richie demonstration"
     site.save()
 
+    languages = getattr(settings, "LANGUAGES", ())
+    languages = [language_code for language_code, _ in languages]
+
     lms_endpoint = (
         getattr(settings, "RICHIE_LMS_BACKENDS", None)
         or [{"BASE_URL": defaults.DEFAULT_LMS_ENDPOINT}]
@@ -179,12 +181,14 @@ def create_demo_site():
 
     # Create organizations under the `Organizations` page
     organizations = []
+
     for i in range(defaults.NB_OBJECTS["organizations"]):
         # Randomly assign each organization to a partnership level category
+
         organizations.append(
             factories.OrganizationFactory(
                 page_in_navigation=True,
-                page_languages=["en", "fr"],
+                page_languages=languages,
                 page_parent=pages_created["organizations"],
                 fill_banner=pick_image("banner"),
                 fill_categories=(
@@ -206,9 +210,10 @@ def create_demo_site():
             organizations,
             random.randint(1, defaults.NB_OBJECTS["person_organizations"]),  # nosec
         )
+
         person = factories.PersonFactory(
             page_in_navigation=True,
-            page_languages=["en", "fr"],
+            page_languages=languages,
             page_parent=pages_created["persons"],
             fill_categories=random.sample(
                 subjects,
@@ -255,10 +260,9 @@ def create_demo_site():
             if licences
             else []
         )
-
         course = factories.CourseFactory(
             page_in_navigation=True,
-            page_languages=["en", "fr"],
+            page_languages=languages,
             page_parent=pages_created["courses"],
             fill_licences=course_licences,
             fill_team=random.sample(
@@ -367,17 +371,12 @@ def create_demo_site():
 
         # Add a random number of course runs to the course
         nb_course_runs = get_number_of_course_runs()
-        # pick a subset of languages for this course (otherwise all courses will have more or
-        # less all the languages across their course runs!)
-        languages_subset = random.sample(
-            ["de", "en", "es", "fr", "it", "nl"], random.randint(1, 4)  # nosec
-        )
         # only half the courses have an enrollment count defined
         for i in range(nb_course_runs):
             course_run = factories.CourseRunFactory(
                 __sequence=i,
                 languages=random.sample(
-                    languages_subset, random.randint(1, len(languages_subset))  # nosec
+                    languages, random.randint(1, len(languages))  # nosec
                 ),
                 direct_course=course,
                 resource_link=f"{lms_endpoint}/courses/course-v1:edX+DemoX+Demo_Course/info",
@@ -400,7 +399,7 @@ def create_demo_site():
     for _i in range(defaults.NB_OBJECTS["blogposts"]):
         post = factories.BlogPostFactory.create(
             page_in_navigation=True,
-            page_languages=["en", "fr"],
+            page_languages=languages,
             page_parent=pages_created["blogposts"],
             fill_cover=pick_image("cover"),
             fill_excerpt=True,
@@ -416,10 +415,11 @@ def create_demo_site():
 
     # Create programs under the `Programs` page
     programs = []
+
     for _i in range(defaults.NB_OBJECTS["programs"]):
         program = factories.ProgramFactory.create(
             page_in_navigation=True,
-            page_languages=["en", "fr"],
+            page_languages=languages,
             page_parent=pages_created["programs"],
             fill_cover=pick_image("cover"),
             fill_excerpt=True,

richie/apps/search/filter_definitions/courses.py

@@ -8,7 +8,7 @@ from django.core.cache import caches
 from django.core.cache.backends.base import InvalidCacheBackendError
 from django.core.exceptions import ImproperlyConfigured
 from django.utils import translation
-from django.utils.translation import gettext as _
+from django.utils.translation import gettext_lazy as _
 
 import arrow
 from cms.api import Page

{richie-3.1.3.dev8.dist-info → richie-3.1.3.dev11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: richie
-Version: 3.1.3.dev8
+Version: 3.1.3.dev11
 Summary: A CMS to build learning portals for open education
 Author-email: "Open FUN (France Université Numérique)" <fun.dev@fun-mooc.fr>
 License: MIT License

{richie-3.1.3.dev8.dist-info → richie-3.1.3.dev11.dist-info}/RECORD

@@ -843,7 +843,7 @@ richie/apps/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,
 richie/apps/core/admin.py,sha256=pbzLrvlzU32RTLDkCZ3BKU90nrRlMaQfvB5aOzup89s,2247
 richie/apps/core/cache.py,sha256=ruC2kg0JsZJ44lOggAfPGLQmJYzuhIkdBGag3LraiQ0,12245
 richie/apps/core/context_processors.py,sha256=jYleYykJhOJ1BNRjBfZHSdDT6E8aWpWUByNkn4bIAsw,9780
-richie/apps/core/defaults.py,sha256=E3GNwzXjnDSL-umVsCsGVPXbdN601dVD6_VLtJti30w,2586
+richie/apps/core/defaults.py,sha256=q7WPE53h4lmv7RKNTCMSlK_YYZjoh_i7djILDGQ9Ba8,2779
 richie/apps/core/factories.py,sha256=fjEC2bnMLWY6AYvaUs4gq41aFGXzB86wCLB-_Mb-DZI,11377
 richie/apps/core/helpers.py,sha256=PsbWYgUbP215WEjj44lpqEeYb09dgJ-K_vYZwRxnlh0,5658
 richie/apps/core/models.py,sha256=dugl4pnEe9DImoxJVEU7lfhYrVBfgFkgt8i_VF7wje0,11275
@@ -933,7 +933,7 @@ richie/apps/core/templatetags/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5N
 richie/apps/core/templatetags/feature_flags.py,sha256=eqgFmdYvEsQYboiXtsUY1IYOU1fsl-EwjEOcOj6KFFE,389
 richie/apps/core/templatetags/full_static_tags.py,sha256=t7bFniPf6KjglHN7_v9-apoBmqXdH8IyhluWeFP4S5Q,623
 richie/apps/core/templatetags/joanie.py,sha256=N3gZBMxdbsIQkLP0Ra1UjHDcPBAEyZjkJ8mQAL1Ahd4,437
-richie/apps/core/templatetags/language_name.py,sha256=vyKEHHhZXMGnLwn6GxWZuWxwzQmKXzyBOBxLZoNJlfI,619
+richie/apps/core/templatetags/language_name.py,sha256=IpjzG91b632XmMsV64mRP06kYmHFwPd45AvIWgA_qq8,624
 richie/apps/core/templatetags/rfc_5646_locale.py,sha256=rgmub6cp_NtxjngpWUq0hnHvBFtBjFK7JWYGDGqSZJo,1026
 richie/apps/core/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 richie/apps/core/tests/test_cache.py,sha256=WVW_F_SIpdG6TNsdqNJyehGZDiDLIleaGKE03bUlYtU,5841
@@ -1053,7 +1053,7 @@ richie/apps/courses/templatetags/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRk
 richie/apps/courses/templatetags/category_tags.py,sha256=cSwWFtxiubAPgx9kTdDoOe3XOoPNfYirxA4xjAQjOk0,2147
 richie/apps/courses/templatetags/extra_tags.py,sha256=RGEnTj4M4IfUvnrZFc6Gob5Xjjt9ErnjEUru3kp0Fw0,13546
 richie/apps/demo/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-richie/apps/demo/defaults.py,sha256=nh3_SZ2eE9GBsjZR4ptWAJ0m489A8HBwr2ISkbTiwQ0,16574
+richie/apps/demo/defaults.py,sha256=LcwaIFlgfMidwOIdCzxkiU-__Tcv6dVTkOSk_gMhcJ8,13746
 richie/apps/demo/helpers.py,sha256=bg8RPWA-ZZme99pDswWHCpoPGZfWoFwe85fL7nv9FNA,2221
 richie/apps/demo/utils.py,sha256=P91d0Ex0COMFNEXYChVdibd5HXaAIEsqQgufml253LA,1446
 richie/apps/demo/fixtures/banner/banner1.jpg,sha256=I2zL-PU6I1_encvPajqW1tdYDYQ4zZSaDB1V2xuRjiw,99758
@@ -1110,7 +1110,7 @@ richie/apps/demo/fixtures/portrait/portrait-7.png,sha256=76tK5-lMED4mW8TN8JFRlOF
 richie/apps/demo/fixtures/portrait/portrait-8.png,sha256=BvA5je_9wioCgz56GxRIWX9XrcKQdGzCPi8xHvxF7O8,9370
 richie/apps/demo/management/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 richie/apps/demo/management/commands/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-richie/apps/demo/management/commands/create_demo_site.py,sha256=8GdmyHymtPVkN86zmvJ00Lx52F9P1wNNGOIQA_jEJY4,31642
+richie/apps/demo/management/commands/create_demo_site.py,sha256=0A3_zjKvGzxdRf_rMa-ZLtLOCFSta0AsFi1FIXfDBFk,31488
 richie/apps/search/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 richie/apps/search/apps.py,sha256=npt71JLONMn4-BY5pJm8IAlAKZhKqzYC8sCOaCV9phY,1575
 richie/apps/search/cms_toolbars.py,sha256=z7n3QDSPIQks2NvmGRBWd58cbJq0lqEsBJmhK9eTKns,1272
@@ -1130,7 +1130,7 @@ richie/apps/search/fields/array.py,sha256=Ukfg-viKEZdk3NunS0lqCI2XDMs1lthsK78irS
 richie/apps/search/fields/datetimerange.py,sha256=Fj02Y4B0DVC4amHNaEa9cV7r5hhS0Qb5uQvOOU1NEEA,2500
 richie/apps/search/filter_definitions/__init__.py,sha256=HSRB17H9Y76Y7QpqBuxJZ5a06slxZz-J4h2_KHGY51k,627
 richie/apps/search/filter_definitions/base.py,sha256=YUk8nucv5Ceuvos5mepsyoKZaSrhHfgTwtnUI5x8evE,23513
-richie/apps/search/filter_definitions/courses.py,sha256=RiQRChczwqROdk8CFVS6ENliUoWwpsuXSmBcpoq6pCc,20321
+richie/apps/search/filter_definitions/courses.py,sha256=FXu-gvMgljhI5my9uTvyyBZ7_JceBukr2x5ArpcgSkU,20326
 richie/apps/search/filter_definitions/helpers.py,sha256=Buyf0EJzYnlM3S8QrPWPhgRhKVL1098g_2J7aHhMYB0,838
 richie/apps/search/filter_definitions/mixins.py,sha256=EEcYVu426reDfeCaeVzNEzj7z40KjPB_yz3FthAIN-c,5669
 richie/apps/search/indexers/__init__.py,sha256=RcrvJGdyUBxcuWY9OnZ2G-G0YEcDb55n3_otj2JqWWg,655
@@ -2483,9 +2483,9 @@ richie/static/richie/js/build/99870.1973586060a86306e1e7.index.js,sha256=bX6Qwnj
 richie/static/richie/js/build/99895.1973586060a86306e1e7.index.js,sha256=N9A0976u752Fx2mP9x3Ag9XpI05rCDmUtNKeUgHlpKU,2570
 richie/static/richie/js/build/99953.1973586060a86306e1e7.index.js,sha256=OWoLPJnHrmvF3HBQPgXooAGo5E0yJpJ7QTFHFghJpI8,135
 richie/static/richie/js/build/index.js,sha256=PvnOnobN_2rGipe6B8KyE1v3CI3D9-3Kcb906C9J0Ws,1332827
-richie-3.1.3.dev8.dist-info/licenses/LICENSE,sha256=5LKjFIE1kpKzBfR2iwq_RGHhHM5XawdlfZrcHTsCLpA,1079
-richie-3.1.3.dev8.dist-info/METADATA,sha256=59QaQzAA61hizJmf809TnFwx9mSqTXy7imd4N1_lk_0,7033
-richie-3.1.3.dev8.dist-info/WHEEL,sha256=JNWh1Fm1UdwIQV075glCn4MVuCRs0sotJIq-J6rbxCU,109
-richie-3.1.3.dev8.dist-info/top_level.txt,sha256=WJvFAAHtUQ5T5MOuG6jRynDJG9kVfl4jtuf1qxIXND8,16
-richie-3.1.3.dev8.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
-richie-3.1.3.dev8.dist-info/RECORD,,
+richie-3.1.3.dev11.dist-info/licenses/LICENSE,sha256=5LKjFIE1kpKzBfR2iwq_RGHhHM5XawdlfZrcHTsCLpA,1079
+richie-3.1.3.dev11.dist-info/METADATA,sha256=zJ8KxBZJa6QEC5sxn7ocC2nL_8D5t2o1HUCDBKQh-oo,7034
+richie-3.1.3.dev11.dist-info/WHEEL,sha256=JNWh1Fm1UdwIQV075glCn4MVuCRs0sotJIq-J6rbxCU,109
+richie-3.1.3.dev11.dist-info/top_level.txt,sha256=WJvFAAHtUQ5T5MOuG6jRynDJG9kVfl4jtuf1qxIXND8,16
+richie-3.1.3.dev11.dist-info/zip-safe,sha256=AbpHGcgLb-kRsJGnwFEktk7uzpZOCcBY74-YBdrKVGs,1
+richie-3.1.3.dev11.dist-info/RECORD,,