Merge branch 'refs/heads/master' into powersync

extras/docker/development/entrypoint.sh

@@ -68,7 +68,7 @@ fi
 if [[ "$LOAD_ONLINE_FIXTURES_ON_STARTUP" == "True" ]];
 then
     echo "Loading online fixtures"
-    python3 manage.py load-online-fixtures
+    wger load-online-fixtures
 fi
 
 # Sync ingredients

wger/core/static/react/locales/es/translation.json

@@ -201,7 +201,8 @@
         "gramShort": "g",
         "searchIngredientName": "Búsqueda por nombre de ingrediente",
         "sodium": "Sodio",
-        "pseudoMealTitle": "Otros registros"
+        "pseudoMealTitle": "Otros registros",
+        "goalFiber": "Objetivo de fibra"
     },
     "downloadAsPdf": "Descargar como un PDF",
     "total": "Total",

wger/core/templates/template.html

@@ -55,8 +55,12 @@
     {% endcompress %}
 
     {# this needs to be outside of the compress block! #}
-    <link rel="stylesheet" type="text/css" href="{% static 'css/react-simple-wysiwyg.css' %}"
-          id="react-css">
+    <link
+        rel="stylesheet"
+        type="text/css"
+        href="{% static 'css/react-simple-wysiwyg.css' %}"
+        id="react-css"
+    >
 
     <link rel="icon" href="{% static 'images/favicon.png' %}" type="image/png">
 
@@ -71,9 +75,11 @@
         <script src="{% static 'yarn/masonry-layout/dist/masonry.pkgd.min.js' %}"></script>
         <script src="{% static 'js/wger-core.js' %}"></script>
         <script src="{% static 'js/nutrition.js' %}"></script>
-        <script src="{% static 'react/main.js' %}" defer="defer"></script>
     {% endcompress %}
 
+    {# this needs to be outside of the compress block! #}
+    <script src="{% static 'react/main.js' %}" type="module" defer="defer"></script>
+
     {% block header %}{% endblock %}
 
     <script>

wger/locale/ca/LC_MESSAGES/django.po

@@ -8,15 +8,15 @@ msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-07-14 15:59+0200\n"
-"PO-Revision-Date: 2022-02-08 01:58+0000\n"
-"Last-Translator: guillem <[email protected]>\n"
+"PO-Revision-Date: 2024-08-04 23:09+0000\n"
+"Last-Translator: Zixu Sun <[email protected]>\n"
 "Language-Team: Catalan <https://hosted.weblate.org/projects/wger/web/ca/>\n"
 "Language: ca\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
-"X-Generator: Weblate 4.11-dev\n"
+"X-Generator: Weblate 5.7-dev\n"
 
 #: config/models/gym_config.py:46 gym/templates/gym/list.html:53
 msgid "Default gym"
@@ -473,7 +473,7 @@ msgstr "Prohibit!"
 
 #: core/templates/403.html:7
 msgid "You are not allowed to access this page"
-msgstr ""
+msgstr "No tens permís per accedir a aquesta pàgina"
 
 #: core/templates/404.html:4
 msgid "Page not found"
@@ -493,6 +493,10 @@ msgid ""
 "refreshing your browser and if that doesn't help, please try again at a "
 "later time. If the problem persists, you can seek help in ways listed below:"
 msgstr ""
+"S'ha produït un error al servidor mentre s'estava processant la vostra sol·"
+"licitud. Proveu d'actualitzar el navegador i, si això no funciona, torneu-ho "
+"a intentar més tard. Si el problema persisteix, podeu buscar ajuda de les "
+"maneres que s'indiquen a continuació:"
 
 #: core/templates/base.html:10 core/templates/base_wide.html:7
 #, fuzzy, python-format
@@ -530,24 +534,21 @@ msgstr "Configuració"
 #: core/templates/email_verification/confirm_template.html:18
 #, python-format
 msgid "%(username)s, your email was verified"
-msgstr ""
+msgstr "%(username)s, el teu correu electrònic ha estat verificat"
 
 #: core/templates/email_verification/confirm_template.html:22
 msgid "Error, invalid verification token"
-msgstr ""
+msgstr "Error, token de verificació invàlid"
 
 #: core/templates/email_verification/email_body_html.tpl:6
-#, fuzzy
-#| msgid "Configuration"
 msgid "Email Confirmation"
-msgstr "Configuració"
+msgstr "Confirmació de correu electrònic"
 
 #: core/templates/email_verification/email_body_html.tpl:9
 #: core/templates/email_verification/email_body_txt.tpl:3
-#, fuzzy, python-format
-#| msgid "Calendar for %(username)s"
+#, python-format
 msgid "You are almost there, %(username)s!"
-msgstr "Calendari per a %(username)s"
+msgstr "Et queda poc, %(username)s!"
 
 #: core/templates/email_verification/email_body_html.tpl:11
 #, python-format

wger/locale/pl/LC_MESSAGES/django.po

@@ -15,17 +15,17 @@ msgstr ""
 "Project-Id-Version: wger Workout Manager\n"
 "Report-Msgid-Bugs-To: \n"
 "POT-Creation-Date: 2024-07-14 15:59+0200\n"
-"PO-Revision-Date: 2024-05-10 11:24+0000\n"
-"Last-Translator: Marcin Schoenknecht <[email protected]>\n"
+"PO-Revision-Date: 2024-08-07 11:09+0000\n"
+"Last-Translator: Dawid Panyło <[email protected]>\n"
 "Language-Team: Polish <https://hosted.weblate.org/projects/wger/web/pl/>\n"
 "Language: pl\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && "
-"(n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && "
+"Plural-Forms: nplurals=4; plural=(n==1 ? 0 : (n%10>=2 && n%10<=4) && ("
+"n%100<12 || n%100>14) ? 1 : n!=1 && (n%10>=0 && n%10<=1) || (n%10>=5 && "
 "n%10<=9) || (n%100>=12 && n%100<=14) ? 2 : 3);\n"
-"X-Generator: Weblate 5.5.4-rc\n"
+"X-Generator: Weblate 5.7-dev\n"
 
 #: config/models/gym_config.py:46 gym/templates/gym/list.html:53
 msgid "Default gym"
@@ -2856,7 +2856,7 @@ msgstr "Tłuszcze nasycone"
 #: nutrition/models/ingredient.py:169
 #: nutrition/templates/ingredient/view.html:108 nutrition/views/plan.py:279
 msgid "Fiber"
-msgstr ""
+msgstr "Błonnik"
 
 #: nutrition/models/ingredient.py:179
 #: nutrition/templates/ingredient/view.html:118 nutrition/views/plan.py:285
@@ -3251,11 +3251,13 @@ msgstr ""
 
 #: software/templates/about_us.html:33
 msgid "Mastodon"
-msgstr ""
+msgstr "Mastodon"
 
 #: software/templates/about_us.html:35
 msgid "Follow us on mastodon for updates and news about the project"
 msgstr ""
+"Obserwuj nas na Mastodonie, aby otrzymywać aktualizacje i informacje o "
+"projekcie"
 
 #: software/templates/about_us.html:40 software/templates/features.html:503
 msgid "Translation"
@@ -3286,18 +3288,14 @@ msgstr "Wspomóż"
 msgid ""
 "Buy us a coffee to help the project, pay for server costs, and keep us fueled"
 msgstr ""
+"Wesprzyj, aby pomóc projektowi, pokryj koszty serwera i zapewnij nam dalszy "
+"rozwój"
 
 #: software/templates/about_us.html:68
 msgid "Our goal"
 msgstr "Nasz cel"
 
 #: software/templates/about_us.html:71
-#, fuzzy
-#| msgid ""
-#| "The goal is to build an awesome\n"
-#| "                and flexible fitness manager, along with a comprehensive "
-#| "and complete list of exercises and\n"
-#| "                ingredients, all released under a free license."
 msgid ""
 "The goal is to build an awesome\n"
 "                and flexible fitness manager, along with a comprehensive and "
@@ -3307,7 +3305,8 @@ msgid ""
 msgstr ""
 "Celem jest zbudowanie świetnego\n"
 "                i elastycznego programu do zarządzania treningiem, wraz z "
-"wyczerpującą listą ćwiczeń i\n"
+"wyczerpującą listą\n"
+"                ćwiczeń i\n"
 "                składników żywieniowych, wszystko na wolnej licencji."
 
 #: software/templates/features.html:11