From 6e735b71a7eb63703aadd2f7db7db219ffdc4329 Mon Sep 17 00:00:00 2001 From: Zahid Kizmaz Date: Sun, 21 Apr 2024 15:12:16 +0200 Subject: [PATCH 1/7] update python and django versions --- book.json | 194 +++++++++++++++++++++++++++--------------------------- 1 file changed, 97 insertions(+), 97 deletions(-) diff --git a/book.json b/book.json index 9ccdbbd8103..a467f36a5dc 100644 --- a/book.json +++ b/book.json @@ -1,99 +1,99 @@ { - "gitbook": ">=3.2.0", - "variables": { - "py_version": "3.8", - "py_release": "3.8.6", - "py_min_version": "3.6", - "py_min_release": "3.6.8", - "pa_py_version": "3.8", - "django_version": "3.2.10" - }, - "links": { - "sidebar": { - "Need help? Talk to us!": "https://gitter.im/DjangoGirls/tutorial" - } - }, - "pdf": { - "fontSize": 16 - }, - "plugins": [ - "heading-anchors@1.0.3", - "ga@1.0.1", - "richquotes@0.0.9", - "github@2.0.0", - "language-picker", - "sidebar-ads", - "codeblock-label", - "sectionx-ex", - "collapsible-menu" - ], - "pluginsConfig": { - "ga": { - "token": "UA-51680040-3" - }, - "richquotes": { - "default": false - }, - "github": { - "url": "https://github.com/DjangoGirls/tutorial" - }, - "language-picker": { - "grid-columns": 3 - }, - "sidebar-ads": { - "ads": [ - { - "imageUrl": "https://djangogirls.org/static/img/global/donate/lagos.jpg", - "url": "https://www.patreon.com/djangogirls", - "description": "💖 Support our work and donate to our project! ✨", - "btnText": "Donate now!" - }, - { - "imageUrl": "https://static.djangoproject.com/img/logos/django-logo-negative.png", - "url": "https://www.djangoproject.com/", - "description": "💖 The DSF supports the development of Django! ✨", - "btnText": "Learn more!" - }, - { - "imageUrl": "https://djangogirls.org/static/img/global/supporters/DO_Logo_Vertical_Blue.png", - "url": "https://www.digitalocean.com/", - "description": "💖 DigitalOcean simplifies cloud computing! ✨", - "btnText": "Learn more!" - }, - { - "imageUrl": "https://djangogirls.org/uploads/uploads/posthog.png", - "url": "https://posthog.com/", - "description": "💖 PostHog offers a suite of product analysis tools! ✨", - "btnText": "Learn more!" - }, - { - "imageUrl": "https://djangogirls.org/uploads/uploads/lincolnloop.png", - "url": "https://lincolnloop.com/", - "description": "💖 Lincoln Loop provides scalable content platforms! ✨", - "btnText": "Learn more!" - }, - { - "imageUrl": "https://djangogirls.org/uploads/uploads/torchbox.png", - "url": "https://torchbox.com/", - "description": "💖 Torchbox, the creators of Wagtail! ✨", - "btnText": "Learn more!" - }, - { - "imageUrl": "https://www.pythonanywhere.com/static/anywhere/images/PA-logo.svg", - "url": "https://www.pythonanywhere.com/", - "description": "💖 Host, run, and code Python in the cloud! ✨", - "btnText": "Learn more! " - }, - { - "imageUrl": "https://djangogirls.org/static/img/global/donate/tshirt.jpg", - "url": "https://djangogirls.org/en/contact/", - "description": "💖 Want to support our work? ✨", - "btnText": "Contact Us!" - } - ] - }, - "sectionx": { - "tag": "b" - } - } + "gitbook": ">=3.2.0", + "variables": { + "py_version": "3.12", + "py_release": "3.12.3", + "py_min_version": "3.9", + "py_min_release": "3.9.19", + "pa_py_version": "3.12", + "django_version": "4.2.11" + }, + "links": { + "sidebar": { + "Need help? Talk to us!": "https://gitter.im/DjangoGirls/tutorial" + } + }, + "pdf": { + "fontSize": 16 + }, + "plugins": [ + "heading-anchors@1.0.3", + "ga@1.0.1", + "richquotes@0.0.9", + "github@2.0.0", + "language-picker", + "sidebar-ads", + "codeblock-label", + "sectionx-ex", + "collapsible-menu" + ], + "pluginsConfig": { + "ga": { + "token": "UA-51680040-3" + }, + "richquotes": { + "default": false + }, + "github": { + "url": "https://github.com/DjangoGirls/tutorial" + }, + "language-picker": { + "grid-columns": 3 + }, + "sidebar-ads": { + "ads": [ + { + "imageUrl": "https://djangogirls.org/static/img/global/donate/lagos.jpg", + "url": "https://www.patreon.com/djangogirls", + "description": "💖 Support our work and donate to our project! ✨", + "btnText": "Donate now!" + }, + { + "imageUrl": "https://static.djangoproject.com/img/logos/django-logo-negative.png", + "url": "https://www.djangoproject.com/", + "description": "💖 The DSF supports the development of Django! ✨", + "btnText": "Learn more!" + }, + { + "imageUrl": "https://djangogirls.org/static/img/global/supporters/DO_Logo_Vertical_Blue.png", + "url": "https://www.digitalocean.com/", + "description": "💖 DigitalOcean simplifies cloud computing! ✨", + "btnText": "Learn more!" + }, + { + "imageUrl": "https://djangogirls.org/uploads/uploads/posthog.png", + "url": "https://posthog.com/", + "description": "💖 PostHog offers a suite of product analysis tools! ✨", + "btnText": "Learn more!" + }, + { + "imageUrl": "https://djangogirls.org/uploads/uploads/lincolnloop.png", + "url": "https://lincolnloop.com/", + "description": "💖 Lincoln Loop provides scalable content platforms! ✨", + "btnText": "Learn more!" + }, + { + "imageUrl": "https://djangogirls.org/uploads/uploads/torchbox.png", + "url": "https://torchbox.com/", + "description": "💖 Torchbox, the creators of Wagtail! ✨", + "btnText": "Learn more!" + }, + { + "imageUrl": "https://www.pythonanywhere.com/static/anywhere/images/PA-logo.svg", + "url": "https://www.pythonanywhere.com/", + "description": "💖 Host, run, and code Python in the cloud! ✨", + "btnText": "Learn more! " + }, + { + "imageUrl": "https://djangogirls.org/static/img/global/donate/tshirt.jpg", + "url": "https://djangogirls.org/en/contact/", + "description": "💖 Want to support our work? ✨", + "btnText": "Contact Us!" + } + ] + }, + "sectionx": { + "tag": "b" + } + } } From 3b508aa4f71849d2f87e55454913acd620459f31 Mon Sep 17 00:00:00 2001 From: Zahid Kizmaz Date: Sun, 21 Apr 2024 15:32:17 +0200 Subject: [PATCH 2/7] remove unnecessary comma --- en/django_forms/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/en/django_forms/README.md b/en/django_forms/README.md index 5bb3b83d4a0..3662e320937 100644 --- a/en/django_forms/README.md +++ b/en/django_forms/README.md @@ -27,7 +27,7 @@ class PostForm(forms.ModelForm): class Meta: model = Post - fields = ('title', 'text',) + fields = ('title', 'text') ``` We need to import Django forms first (`from django import forms`) and our `Post` model (`from .models import Post`). From 07fd6132dc50064f2dfcd1b6af13d4ea4b671faf Mon Sep 17 00:00:00 2001 From: Zahid Kizmaz Date: Sun, 21 Apr 2024 15:41:40 +0200 Subject: [PATCH 3/7] fix formatting on book.json --- book.json | 194 +++++++++++++++++++++++++++--------------------------- 1 file changed, 97 insertions(+), 97 deletions(-) diff --git a/book.json b/book.json index a467f36a5dc..979335d674c 100644 --- a/book.json +++ b/book.json @@ -1,99 +1,99 @@ { - "gitbook": ">=3.2.0", - "variables": { - "py_version": "3.12", - "py_release": "3.12.3", - "py_min_version": "3.9", - "py_min_release": "3.9.19", - "pa_py_version": "3.12", - "django_version": "4.2.11" - }, - "links": { - "sidebar": { - "Need help? Talk to us!": "https://gitter.im/DjangoGirls/tutorial" - } - }, - "pdf": { - "fontSize": 16 - }, - "plugins": [ - "heading-anchors@1.0.3", - "ga@1.0.1", - "richquotes@0.0.9", - "github@2.0.0", - "language-picker", - "sidebar-ads", - "codeblock-label", - "sectionx-ex", - "collapsible-menu" - ], - "pluginsConfig": { - "ga": { - "token": "UA-51680040-3" - }, - "richquotes": { - "default": false - }, - "github": { - "url": "https://github.com/DjangoGirls/tutorial" - }, - "language-picker": { - "grid-columns": 3 - }, - "sidebar-ads": { - "ads": [ - { - "imageUrl": "https://djangogirls.org/static/img/global/donate/lagos.jpg", - "url": "https://www.patreon.com/djangogirls", - "description": "💖 Support our work and donate to our project! ✨", - "btnText": "Donate now!" - }, - { - "imageUrl": "https://static.djangoproject.com/img/logos/django-logo-negative.png", - "url": "https://www.djangoproject.com/", - "description": "💖 The DSF supports the development of Django! ✨", - "btnText": "Learn more!" - }, - { - "imageUrl": "https://djangogirls.org/static/img/global/supporters/DO_Logo_Vertical_Blue.png", - "url": "https://www.digitalocean.com/", - "description": "💖 DigitalOcean simplifies cloud computing! ✨", - "btnText": "Learn more!" - }, - { - "imageUrl": "https://djangogirls.org/uploads/uploads/posthog.png", - "url": "https://posthog.com/", - "description": "💖 PostHog offers a suite of product analysis tools! ✨", - "btnText": "Learn more!" - }, - { - "imageUrl": "https://djangogirls.org/uploads/uploads/lincolnloop.png", - "url": "https://lincolnloop.com/", - "description": "💖 Lincoln Loop provides scalable content platforms! ✨", - "btnText": "Learn more!" - }, - { - "imageUrl": "https://djangogirls.org/uploads/uploads/torchbox.png", - "url": "https://torchbox.com/", - "description": "💖 Torchbox, the creators of Wagtail! ✨", - "btnText": "Learn more!" - }, - { - "imageUrl": "https://www.pythonanywhere.com/static/anywhere/images/PA-logo.svg", - "url": "https://www.pythonanywhere.com/", - "description": "💖 Host, run, and code Python in the cloud! ✨", - "btnText": "Learn more! " - }, - { - "imageUrl": "https://djangogirls.org/static/img/global/donate/tshirt.jpg", - "url": "https://djangogirls.org/en/contact/", - "description": "💖 Want to support our work? ✨", - "btnText": "Contact Us!" - } - ] - }, - "sectionx": { - "tag": "b" - } - } + "gitbook": ">=3.2.0", + "variables": { + "py_version": "3.12", + "py_release": "3.12.3", + "py_min_version": "3.9", + "py_min_release": "3.9.19", + "pa_py_version": "3.8.10", + "django_version": "4.2.11" + }, + "links": { + "sidebar": { + "Need help? Talk to us!": "https://gitter.im/DjangoGirls/tutorial" + } + }, + "pdf": { + "fontSize": 16 + }, + "plugins": [ + "heading-anchors@1.0.3", + "ga@1.0.1", + "richquotes@0.0.9", + "github@2.0.0", + "language-picker", + "sidebar-ads", + "codeblock-label", + "sectionx-ex", + "collapsible-menu" + ], + "pluginsConfig": { + "ga": { + "token": "UA-51680040-3" + }, + "richquotes": { + "default": false + }, + "github": { + "url": "https://github.com/DjangoGirls/tutorial" + }, + "language-picker": { + "grid-columns": 3 + }, + "sidebar-ads": { + "ads": [ + { + "imageUrl": "https://djangogirls.org/static/img/global/donate/lagos.jpg", + "url": "https://www.patreon.com/djangogirls", + "description": "💖 Support our work and donate to our project! ✨", + "btnText": "Donate now!" + }, + { + "imageUrl": "https://static.djangoproject.com/img/logos/django-logo-negative.png", + "url": "https://www.djangoproject.com/", + "description": "💖 The DSF supports the development of Django! ✨", + "btnText": "Learn more!" + }, + { + "imageUrl": "https://djangogirls.org/static/img/global/supporters/DO_Logo_Vertical_Blue.png", + "url": "https://www.digitalocean.com/", + "description": "💖 DigitalOcean simplifies cloud computing! ✨", + "btnText": "Learn more!" + }, + { + "imageUrl": "https://djangogirls.org/uploads/uploads/posthog.png", + "url": "https://posthog.com/", + "description": "💖 PostHog offers a suite of product analysis tools! ✨", + "btnText": "Learn more!" + }, + { + "imageUrl": "https://djangogirls.org/uploads/uploads/lincolnloop.png", + "url": "https://lincolnloop.com/", + "description": "💖 Lincoln Loop provides scalable content platforms! ✨", + "btnText": "Learn more!" + }, + { + "imageUrl": "https://djangogirls.org/uploads/uploads/torchbox.png", + "url": "https://torchbox.com/", + "description": "💖 Torchbox, the creators of Wagtail! ✨", + "btnText": "Learn more!" + }, + { + "imageUrl": "https://www.pythonanywhere.com/static/anywhere/images/PA-logo.svg", + "url": "https://www.pythonanywhere.com/", + "description": "💖 Host, run, and code Python in the cloud! ✨", + "btnText": "Learn more! " + }, + { + "imageUrl": "https://djangogirls.org/static/img/global/donate/tshirt.jpg", + "url": "https://djangogirls.org/en/contact/", + "description": "💖 Want to support our work? ✨", + "btnText": "Contact Us!" + } + ] + }, + "sectionx": { + "tag": "b" + } + } } From 16c509187dd339f3394a7b3ec41b80262bca06b5 Mon Sep 17 00:00:00 2001 From: Zahid Date: Sun, 21 Apr 2024 20:05:15 +0200 Subject: [PATCH 4/7] set python anywhere version to 3.10 --- book.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/book.json b/book.json index 979335d674c..00a82720e3f 100644 --- a/book.json +++ b/book.json @@ -5,7 +5,7 @@ "py_release": "3.12.3", "py_min_version": "3.9", "py_min_release": "3.9.19", - "pa_py_version": "3.8.10", + "pa_py_version": "3.10", "django_version": "4.2.11" }, "links": { From d8cf43268d6d3d515d80bd1c41280927262523c5 Mon Sep 17 00:00:00 2001 From: Zahid Kizmaz Date: Sun, 28 Apr 2024 11:14:38 +0200 Subject: [PATCH 5/7] update django version in docs to 4.2 --- en/django_admin/README.md | 2 +- en/django_forms/README.md | 2 +- en/django_start_project/README.md | 2 +- en/django_urls/README.md | 2 +- en/django_views/README.md | 2 +- en/whats_next/README.md | 2 +- sk/django_views/README.md | 3 ++- 7 files changed, 8 insertions(+), 7 deletions(-) diff --git a/en/django_admin/README.md b/en/django_admin/README.md index 5ed5e08cc62..3cd1c05a965 100644 --- a/en/django_admin/README.md +++ b/en/django_admin/README.md @@ -52,6 +52,6 @@ Make sure that at least two or three posts (but not all) have the publish date s ![Django admin](images/edit_post3.png) -If you want to know more about Django admin, you should check Django's documentation: https://docs.djangoproject.com/en/3.2/ref/contrib/admin/ +If you want to know more about Django admin, you should check Django's documentation: https://docs.djangoproject.com/en/4.2/ref/contrib/admin/ This is probably a good moment to grab a coffee (or tea) or something to eat to re-energize yourself. You created your first Django model – you deserve a little break! diff --git a/en/django_forms/README.md b/en/django_forms/README.md index 3662e320937..8645aaceb78 100644 --- a/en/django_forms/README.md +++ b/en/django_forms/README.md @@ -374,7 +374,7 @@ Feel free to change the title or the text and save the changes! Congratulations! Your application is getting more and more complete! -If you need more information about Django forms, you should read the documentation: https://docs.djangoproject.com/en/3.2/topics/forms/ +If you need more information about Django forms, you should read the documentation: https://docs.djangoproject.com/en/4.2/topics/forms/ ## Security diff --git a/en/django_start_project/README.md b/en/django_start_project/README.md index ce1ef96ca0c..9997ed3c538 100644 --- a/en/django_start_project/README.md +++ b/en/django_start_project/README.md @@ -88,7 +88,7 @@ In `settings.py`, find the line that contains `TIME_ZONE` and modify it to choos TIME_ZONE = 'Europe/Berlin' ``` -A language code consist of the language, e.g. `en` for English or `de` for German, and the country code, e.g. `de` for Germany or `ch` for Switzerland. If English is not your native language, you can add this to change the default buttons and notifications from Django to be in your language. So you would have "Cancel" button translated into the language you defined here. [Django comes with a lot of prepared translations](https://docs.djangoproject.com/en/3.2/ref/settings/#language-code). +A language code consist of the language, e.g. `en` for English or `de` for German, and the country code, e.g. `de` for Germany or `ch` for Switzerland. If English is not your native language, you can add this to change the default buttons and notifications from Django to be in your language. So you would have "Cancel" button translated into the language you defined here. [Django comes with a lot of prepared translations](https://docs.djangoproject.com/en/4.2/ref/settings/#language-code). If you want a different language, change the language code by changing the following line: diff --git a/en/django_urls/README.md b/en/django_urls/README.md index 058ffa74165..acb3a95c4d8 100644 --- a/en/django_urls/README.md +++ b/en/django_urls/README.md @@ -112,4 +112,4 @@ Your console is showing an error, but don't worry – it's actually pretty usefu If you see a different error message, try restarting your web server. To do that, in the console window that is running the web server, stop it by pressing Ctrl+C (the Control and C keys together). On Windows, you might have to press Ctrl+Break. Then you need to restart the web server by running a `python manage.py runserver` command. -> If you want to know more about Django URLconfs, look at the official documentation: https://docs.djangoproject.com/en/3.2/topics/http/urls/ +> If you want to know more about Django URLconfs, look at the official documentation: https://docs.djangoproject.com/en/4.2/topics/http/urls/ diff --git a/en/django_views/README.md b/en/django_views/README.md index 9a176329dad..340beb94026 100644 --- a/en/django_views/README.md +++ b/en/django_views/README.md @@ -39,4 +39,4 @@ Another error! Read what's going on now: This shows that the server is running again, at least, but it still doesn't look right, does it? Don't worry, it's just an error page, nothing to be scared of! Just like the error messages in the console, these are actually pretty useful. You can read that the *TemplateDoesNotExist*. Let's fix this bug and create a template in the next chapter! -> Learn more about Django views by reading the official documentation: https://docs.djangoproject.com/en/3.2/topics/http/views/ +> Learn more about Django views by reading the official documentation: https://docs.djangoproject.com/en/4.2/topics/http/views/ diff --git a/en/whats_next/README.md b/en/whats_next/README.md index b137fdc494a..e10f223a45f 100644 --- a/en/whats_next/README.md +++ b/en/whats_next/README.md @@ -14,7 +14,7 @@ Yes! There are a _lot_ of resources online for learning all kinds of programming #### Django - Our other book, [Django Girls Tutorial: Extensions](https://tutorial-extensions.djangogirls.org/) -- [Django's official tutorial](https://docs.djangoproject.com/en/3.2/intro/tutorial01/) +- [Django's official tutorial](https://docs.djangoproject.com/en/4.2/intro/tutorial01/) - [Getting Started With Django video lessons](http://www.gettingstartedwithdjango.com/) - [Django for Everybody Specialization](https://www.coursera.org/specializations/django) – some video lectures can be audited for free and you can earn a Coursera Certificate by taking these courses diff --git a/sk/django_views/README.md b/sk/django_views/README.md index b3c2bc100b6..93a627d07ed 100644 --- a/sk/django_views/README.md +++ b/sk/django_views/README.md @@ -41,4 +41,5 @@ Ulož súbor, prejdi na http://127.0.0.1:8000/ a pozri sa, čo sa udeje. Ukazuje, že server aspoň znovu beží, ale nie je to úplne ono, že? Neboj sa, je to len chybová stránka, nič, čoho sa treba báť! Podobne ako chyby v konzole nám tieto chyby napovedajú, čo treba robiť. Dočítaš sa, že *TemplateDoesNotExist* (šablóna neexistuje). Poďme opraviť túto chybu tým, že vytvoríme šablónu v nasledujúcej kapitole! -> Viac informácií o Django viewoch získaš v oficiálnej dokumentácii: https://docs.djangoproject.com/en/3.2/topics/http/views/ \ No newline at end of file +> Viac informácií o Django viewoch získaš v oficiálnej dokumentácii: https://docs.djangoproject.com/en/4.2/topics/http/views/ + From a74a64e9033801e06af1d5fa2f2f43825285a3bf Mon Sep 17 00:00:00 2001 From: Zahid Kizmaz Date: Sun, 28 Apr 2024 19:54:31 +0200 Subject: [PATCH 6/7] remove new line --- sk/django_views/README.md | 1 - 1 file changed, 1 deletion(-) diff --git a/sk/django_views/README.md b/sk/django_views/README.md index 93a627d07ed..9cf82a03f4e 100644 --- a/sk/django_views/README.md +++ b/sk/django_views/README.md @@ -42,4 +42,3 @@ Ulož súbor, prejdi na http://127.0.0.1:8000/ a pozri sa, čo sa udeje. Ukazuje, že server aspoň znovu beží, ale nie je to úplne ono, že? Neboj sa, je to len chybová stránka, nič, čoho sa treba báť! Podobne ako chyby v konzole nám tieto chyby napovedajú, čo treba robiť. Dočítaš sa, že *TemplateDoesNotExist* (šablóna neexistuje). Poďme opraviť túto chybu tým, že vytvoríme šablónu v nasledujúcej kapitole! > Viac informácií o Django viewoch získaš v oficiálnej dokumentácii: https://docs.djangoproject.com/en/4.2/topics/http/views/ - From f56c64d4640d22aa1d24982adef07ace31ac8bab Mon Sep 17 00:00:00 2001 From: Zahid Date: Sat, 25 May 2024 11:03:17 +0200 Subject: [PATCH 7/7] remove changes from sk/django_views/README.md Co-authored-by: Ewoud Kohl van Wijngaarden --- sk/django_views/README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sk/django_views/README.md b/sk/django_views/README.md index 9cf82a03f4e..b3c2bc100b6 100644 --- a/sk/django_views/README.md +++ b/sk/django_views/README.md @@ -41,4 +41,4 @@ Ulož súbor, prejdi na http://127.0.0.1:8000/ a pozri sa, čo sa udeje. Ukazuje, že server aspoň znovu beží, ale nie je to úplne ono, že? Neboj sa, je to len chybová stránka, nič, čoho sa treba báť! Podobne ako chyby v konzole nám tieto chyby napovedajú, čo treba robiť. Dočítaš sa, že *TemplateDoesNotExist* (šablóna neexistuje). Poďme opraviť túto chybu tým, že vytvoríme šablónu v nasledujúcej kapitole! -> Viac informácií o Django viewoch získaš v oficiálnej dokumentácii: https://docs.djangoproject.com/en/4.2/topics/http/views/ +> Viac informácií o Django viewoch získaš v oficiálnej dokumentácii: https://docs.djangoproject.com/en/3.2/topics/http/views/ \ No newline at end of file