⬆️(funmooc) upgrade to richie 2.31.0

https://github.com/openfun/richie/releases/tag/v2.31.0
openfun · Nov 21, 2024 · 6183d68 · 6183d68
1 parent 4c59ef6
commit 6183d68
Show file tree

Hide file tree

Showing 10 changed files with 1,827 additions and 1,923 deletions.
diff --git a/.circleci/config.yml b/.circleci/config.yml
@@ -359,7 +359,7 @@ jobs:
                 POSTGRES_DB: richie
                 POSTGRES_PASSWORD: pass
                 POSTGRES_USER: richie_user
-              image: cimg/postgres:12.10
+              image: cimg/postgres:16.4
             - environment:
                 ALLOW_EMPTY_PASSWORD: "yes"
                 REDIS_REPLICATION_MODE: master
@@ -431,142 +431,87 @@ workflows:
                 - << pipeline.schedule.name >>
     demo:
         jobs:
-            - check-changelog:
-                filters:
-                    branches:
-                        ignore: main
-                name: check-changelog-demo
-                site: demo
-            - lint-changelog:
-                filters:
-                    branches:
-                        ignore: main
-                    tags:
-                        only: /^demo-.*/
-                name: lint-changelog--demo
-                site: demo
-            - build-front-production:
-                filters:
-                    tags:
-                        only: /^demo-.*/
-                name: build-front-production-demo
-                site: demo
-            - lint-front:
-                filters:
-                    tags:
-                        only: /^demo-.*/
-                name: lint-front-demo
-                requires:
-                    - build-front-production-demo
-                site: demo
-            - build-back:
-                filters:
-                    tags:
-                        only: /^demo-.*/
-                name: build-back-demo
-                site: demo
-            - lint-back:
+            - no-change:
                 filters:
                     tags:
-                        only: /^demo-.*/
-                name: lint-back-demo
-                requires:
-                    - build-back-demo
-                site: demo
-            - test-back:
+                        only: /.*/
+                name: no-change-demo
+    funcampus:
+        jobs:
+            - no-change:
                 filters:
                     tags:
-                        only: /^demo-.*/
-                name: test-back-demo
-                requires:
-                    - build-back-demo
-                site: demo
-            - hub:
+                        only: /.*/
+                name: no-change-funcampus
+    funcorporate:
+        jobs:
+            - no-change:
                 filters:
                     tags:
-                        only: /^demo-.*/
-                image_name: richie-demo
-                name: hub-demo
-                requires:
-                    - lint-front-demo
-                    - lint-back-demo
-                site: demo
-    funcampus:
+                        only: /.*/
+                name: no-change-funcorporate
+    funmooc:
         jobs:
             - check-changelog:
                 filters:
                     branches:
                         ignore: main
-                name: check-changelog-funcampus
-                site: funcampus
+                name: check-changelog-funmooc
+                site: funmooc
             - lint-changelog:
                 filters:
                     branches:
                         ignore: main
                     tags:
-                        only: /^funcampus-.*/
-                name: lint-changelog--funcampus
-                site: funcampus
+                        only: /^funmooc-.*/
+                name: lint-changelog--funmooc
+                site: funmooc
             - build-front-production:
                 filters:
                     tags:
-                        only: /^funcampus-.*/
-                name: build-front-production-funcampus
-                site: funcampus
+                        only: /^funmooc-.*/
+                name: build-front-production-funmooc
+                site: funmooc
             - lint-front:
                 filters:
                     tags:
-                        only: /^funcampus-.*/
-                name: lint-front-funcampus
+                        only: /^funmooc-.*/
+                name: lint-front-funmooc
                 requires:
-                    - build-front-production-funcampus
-                site: funcampus
+                    - build-front-production-funmooc
+                site: funmooc
             - build-back:
                 filters:
                     tags:
-                        only: /^funcampus-.*/
-                name: build-back-funcampus
-                site: funcampus
+                        only: /^funmooc-.*/
+                name: build-back-funmooc
+                site: funmooc
             - lint-back:
                 filters:
                     tags:
-                        only: /^funcampus-.*/
-                name: lint-back-funcampus
+                        only: /^funmooc-.*/
+                name: lint-back-funmooc
                 requires:
-                    - build-back-funcampus
-                site: funcampus
+                    - build-back-funmooc
+                site: funmooc
             - test-back:
                 filters:
                     tags:
-                        only: /^funcampus-.*/
-                name: test-back-funcampus
+                        only: /^funmooc-.*/
+                name: test-back-funmooc
                 requires:
-                    - build-back-funcampus
-                site: funcampus
+                    - build-back-funmooc
+                site: funmooc
             - hub:
                 filters:
                     tags:
-                        only: /^funcampus-.*/
-                image_name: funcampus
-                name: hub-funcampus
+                        only: /^funmooc-.*/
+                image_name: funmooc
+                name: hub-funmooc
                 requires:
-                    - lint-front-funcampus
-                    - lint-back-funcampus
-                site: funcampus
-    funcorporate:
-        jobs:
-            - no-change:
-                filters:
-                    tags:
-                        only: /.*/
-                name: no-change-funcorporate
-    funmooc:
-        jobs:
-            - no-change:
-                filters:
-                    tags:
-                        only: /.*/
-                name: no-change-funmooc
+                    - lint-front-funmooc
+                    - lint-back-funmooc
+                site: funmooc
     site-factory:
         jobs:
             - lint-git:

diff --git a/sites/funmooc/CHANGELOG.md b/sites/funmooc/CHANGELOG.md
@@ -8,6 +8,10 @@ Versioning](https://semver.org/spec/v2.0.0.html).
 
 ## [Unreleased]
 
+### Changed
+
+- Upgrade to richie 2.31.0
+
 ## [1.36.0] - 2024-10-16
 
 ### Changed

diff --git a/sites/funmooc/requirements/base.txt b/sites/funmooc/requirements/base.txt
@@ -8,5 +8,5 @@ dockerflow==2024.4.2
 factory-boy==3.3.0
 gunicorn==22.0.0
 psycopg2-binary==2.9.9
-richie==2.30.0
+richie==2.31.0
 sentry-sdk==2.2.1
diff --git a/sites/funmooc/src/backend/locale/fr/LC_MESSAGES/django.po b/sites/funmooc/src/backend/locale/fr/LC_MESSAGES/django.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2024-05-22 18:52+0200\n"
+"POT-Creation-Date: 2024-11-20 16:58+0100\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <[email protected]>\n"
@@ -39,127 +39,131 @@ msgstr "Programme"
 msgid "Enter here the detailed program."
 msgstr "Détaillez ici le programme de la formation."
 
-#: funmooc/settings.py:125
+#: funmooc/settings.py:127
 msgid "Availability"
 msgstr "Disponibilité"
 
-#: funmooc/settings.py:134
+#: funmooc/settings.py:136
 msgid "Languages"
 msgstr "Langues"
 
-#: funmooc/settings.py:278 funmooc/settings.py:288
+#: funmooc/settings.py:280 funmooc/settings.py:290
 msgid "Dashboard"
 msgstr "Tableau de bord"
 
-#: funmooc/settings.py:279
+#: funmooc/settings.py:281
 msgid "{base_url:s}/dashboard"
 msgstr ""
 
-#: funmooc/settings.py:289
+#: funmooc/settings.py:291
 msgid "/dashboard"
 msgstr ""
 
-#: funmooc/settings.py:292
+#: funmooc/settings.py:294
 msgid "Administration dashboard"
 msgstr "Tableau de bord d'administration"
 
-#: funmooc/settings.py:293
+#: funmooc/settings.py:295
 msgid "/dashboard/teacher"
 msgstr ""
 
-#: funmooc/settings.py:315
+#: funmooc/settings.py:317
 msgid "Profile"
 msgstr "Profil"
 
-#: funmooc/settings.py:316
+#: funmooc/settings.py:318
 msgid "{base_url:s}/u/(username)"
 msgstr ""
 
-#: funmooc/settings.py:319
+#: funmooc/settings.py:321
 msgid "Account"
 msgstr "Compte"
 
-#: funmooc/settings.py:320
+#: funmooc/settings.py:322
 msgid "{base_url:s}/account/settings"
 msgstr ""
 
-#: funmooc/settings.py:404
+#: funmooc/settings.py:406
 msgid "Teaser"
 msgstr "Accroche"
 
-#: funmooc/settings.py:412
+#: funmooc/settings.py:414
 msgid "Professional training page"
 msgstr "Page de formation professionnelle"
 
-#: funmooc/settings.py:493 funmooc/settings.py:495
+#: funmooc/settings.py:495 funmooc/settings.py:497
 msgid "New courses"
 msgstr "Nouveaux cours"
 
-#: funmooc/settings.py:505
+#: funmooc/settings.py:507
 msgid "Types"
 msgstr "Types"
 
-#: funmooc/settings.py:516
+#: funmooc/settings.py:518
 msgid "Subjects"
 msgstr "Thématiques"
 
-#: funmooc/settings.py:527
+#: funmooc/settings.py:529
 msgid "Collections"
 msgstr "Collections"
 
-#: funmooc/settings.py:538
+#: funmooc/settings.py:540
 msgid "Organizations"
 msgstr "Établissements"
 
-#: funmooc/settings.py:549
+#: funmooc/settings.py:551
 msgid "Contributors"
 msgstr "Contributeurs"
 
-#: funmooc/settings.py:560
+#: funmooc/settings.py:562
 msgid "Licences"
 msgstr "Licences"
 
-#: funmooc/settings.py:577
+#: funmooc/settings.py:579
 msgid "Weekly pace"
 msgstr "Rythme hebdomadaire"
 
-#: funmooc/settings.py:581
+#: funmooc/settings.py:583
 msgid "Self-paced"
 msgstr "À son rythme"
 
-#: funmooc/settings.py:582
+#: funmooc/settings.py:584
 msgid "Less than one hour"
 msgstr "Moins d'une heure"
 
-#: funmooc/settings.py:583
+#: funmooc/settings.py:585
 msgid "One to two hours"
 msgstr "Une à deux heures"
 
-#: funmooc/settings.py:584
+#: funmooc/settings.py:586
 msgid "More than two hours"
 msgstr "Plus de deux heures"
 
-#: funmooc/settings.py:610 funmooc/settings.py:625
+#: funmooc/settings.py:612 funmooc/settings.py:627
 msgid "English"
 msgstr "Anglais"
 
-#: funmooc/settings.py:610 funmooc/settings.py:633
+#: funmooc/settings.py:612 funmooc/settings.py:635
 msgid "French"
 msgstr "Français"
 
-#: funmooc/settings.py:999
+#: funmooc/settings.py:1001
 msgid "Pashto"
 msgstr "Pachtoun"
 
-#: templates/richie/base.html:18
-msgid "FAQ"
-msgstr "FAQ"
+#: templates/richie/base.html:22
+msgid "Go to homepage"
+msgstr "Aller à la page d'accueil"
+
+#: templates/richie/base.html:32
+msgid "Menu"
+msgstr "Menu"
 
-#: templates/richie/base.html:33
+#: templates/richie/base.html:76
 msgid "https://www.france-universite-numerique.fr/en/"
 msgstr "https://www.france-universite-numerique.fr/fr/"
 
-#: templates/richie/base.html:42
+#: templates/richie/base.html:85
 msgid "powered by"
 msgstr "propulsé par"
 

diff --git a/sites/funmooc/src/frontend/cunningham.cjs b/sites/funmooc/src/frontend/cunningham.cjs
@@ -58,6 +58,7 @@ module.exports = {
           'mediumturquoise': '#becde1',
           'robin-egg-blue': '#4fd0e7',
           'ocean-blue': '#0069b3',
+          'tory-blue': '#0b51a1',
           'darkish-blue': '#002d7f',
           'navy-blue': '#001f50',
           'lipstick': '#e51a2d',