Skip to content

Commit 3886adb

Browse files
fltfxfltfx
authored
Merge pull request #1820 from dennybiasiolli/updating-tutorial
Updating tutorial
2 parents 00794e2 + cfaabfa commit 3886adb

File tree

44 files changed

+55
-55
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

44 files changed

+55
-55
lines changed

‎book.json

+3-3
Original file line numberDiff line numberDiff line change
@@ -3,10 +3,10 @@
33
"variables": {
44
"py_version": "3.12",
55
"py_release": "3.12.3",
6-
"py_min_version": "3.9",
7-
"py_min_release": "3.9.19",
6+
"py_min_version": "3.10",
7+
"py_min_release": "3.10.13",
88
"pa_py_version": "3.10",
9-
"django_version": "4.2.11"
9+
"django_version": "5.1.2"
1010
},
1111
"links": {
1212
},

‎de/deploy/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@ Um eine Web App auf PythonAnywhere publizieren zu können, muss dein Code von Gi
171171

172172
{% filename %}PythonAnywhere command-line{% endfilename %}
173173

174-
$ pip3.8 install --user pythonanywhere
174+
$ pip install --user pythonanywhere
175175

176176

177177
Nach diesem Befehl solltest du in etwa Folgendes sehen: `Collecting pythonanywhere`, und irgendwann den Schluss `Successfully installed (...) pythonanywhere- (...)`.
@@ -180,7 +180,7 @@ Nun können wir mit dem Hilfstool unsere App von GitHub automatisch konfiguriere
180180

181181
{% filename %}PythonAnywhere command-line{% endfilename %}
182182

183-
$ pa_autoconfigure_django.py --python=3.8 https://github.com/<your-github-username>/my-first-blog.git
183+
$ pa_autoconfigure_django.py --python=3.10 https://github.com/<your-github-username>/my-first-blog.git
184184

185185

186186
Während du die Ausführung verfolgst, wirst du sehen, was passiert:

‎de/django_forms/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ Es ist an der Zeit, `blog/templates/blog/base.html` im Code-Editor zu öffnen. J
6060

6161
Beachte, dass wir unsere neue View `post_new` nennen wollen. Das [SVG-Icon](https://icons.getbootstrap.com/icons/file-earmark-plus/) wird von [Bootstrap Icons](https://icons.getbootstrap.com/) zur Verfügung gestellt und zeigt ein Seitensymbol mit Pluszeichen an. Wir verwenden eine Django-Template-Direktive namens `include`. Dadurch wird der Inhalt der Datei in das Django-Template eingefügt. Der Web-Browser weiß, wie man diese Art von Inhalt ohne weitere Verarbeitung handhabt.
6262

63-
> Alle Bootstrap-Icons kannst du [hier herunterladen](https://github.com/twbs/icons/releases/download/v1.1.0/bootstrap-icons-1.1.0.zip). Entpacke die Datei und kopiere alle SVG-Bilddateien in einen neuen Ordner namens `icons` innerhalb von `blog/templates/blog/`. So kannst du auf ein Symbol wie `pencil-fill.svg` mit dem Dateipfad `blog/templates/blog/icons/pencil-fill.svg` zugreifen
63+
> Alle Bootstrap-Icons kannst du [hier herunterladen](https://github.com/twbs/icons/releases/download/v1.11.3/bootstrap-icons-1.11.3.zip). Entpacke die Datei und kopiere alle SVG-Bilddateien in einen neuen Ordner namens `icons` innerhalb von `blog/templates/blog/`. So kannst du auf ein Symbol wie `pencil-fill.svg` mit dem Dateipfad `blog/templates/blog/icons/pencil-fill.svg` zugreifen
6464
6565
Nach dem Bearbeiten der Zeile sieht deine HTML-Datei so aus:
6666

‎en/css/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ To install Bootstrap, open up your `.html` file in the code editor and add this
2020

2121
{% filename %}blog/templates/blog/post_list.html{% endfilename %}
2222
```html
23-
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous">
23+
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous">
2424
```
2525

2626
This doesn't add any files to your project. It just points to files that exist on the Internet. So go ahead, open your website and refresh the page. Here it is!
@@ -119,7 +119,7 @@ Your file should now look like this:
119119
<html>
120120
<head>
121121
<title>Django Girls blog</title>
122-
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous">
122+
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous">
123123
<link rel="stylesheet" href="{% static 'css/blog.css' %}">
124124
</head>
125125
<body>

‎en/deploy/images/new_github_repo.png

72.4 KB
Loading

‎en/deploy/pythonanywhere.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@ You can also go to the "Files" page and navigate around using PythonAnywhere's b
6868
Your site should now be live on the public Internet! Click through to the PythonAnywhere "Web" page to get a link to it. You can share this with anyone you want. :)
6969

7070

71-
> **Note** This is a beginners' tutorial, and in deploying this site we've taken a few shortcuts which aren't ideal from a security point of view. If and when you decide to build on this project, or start a new project, you should review the [Django deployment checklist](https://docs.djangoproject.com/en/3.2/howto/deployment/checklist/) for some tips on securing your site.
71+
> **Note** This is a beginners' tutorial, and in deploying this site we've taken a few shortcuts which aren't ideal from a security point of view. If and when you decide to build on this project, or start a new project, you should review the [Django deployment checklist](https://docs.djangoproject.com/en/5.1/howto/deployment/checklist/) for some tips on securing your site.
7272
7373
## Debugging tips
7474

‎en/django_admin/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -52,6 +52,6 @@ Make sure that at least two or three posts (but not all) have the publish date s
5252

5353
![Django admin](images/edit_post3.png)
5454

55-
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/
55+
If you want to know more about Django admin, you should check Django's documentation: https://docs.djangoproject.com/en/5.1/ref/contrib/admin/
5656

5757
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!

‎en/django_forms/README.md

+3-3
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ It's time to open `blog/templates/blog/base.html` in the code editor. Now we can
5959

6060
Note that we want to call our new view `post_new`. The [SVG icon](https://icons.getbootstrap.com/icons/file-earmark-plus/) is provided by the [Bootstrap Icons](https://icons.getbootstrap.com/) and it will display a page icon with plus sign. We use a Django template directive called `include`. This will inject the file's content into the Django template. The web browser knows how to handle this type of content without any further processing.
6161

62-
> You can download all the Bootstrap icons [here](https://github.com/twbs/icons/releases/download/v1.1.0/bootstrap-icons-1.1.0.zip). Unzip the file and copy all the SVG image files into a new folder inside `blog/templates/blog/` called `icons`. That way you can access an icon like `pencil-fill.svg` using the file path `blog/templates/blog/icons/pencil-fill.svg`
62+
> You can download all the Bootstrap icons [here](https://github.com/twbs/icons/releases/download/v1.11.3/bootstrap-icons-1.11.3.zip). Unzip the file and copy all the SVG image files into a new folder inside `blog/templates/blog/` called `icons`. That way you can access an icon like `pencil-fill.svg` using the file path `blog/templates/blog/icons/pencil-fill.svg`
6363
6464
After editing the line, your HTML file should now look like this:
6565

@@ -70,7 +70,7 @@ After editing the line, your HTML file should now look like this:
7070
<html>
7171
<head>
7272
<title>Django Girls blog</title>
73-
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous">
73+
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous">
7474
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Lobster&subset=latin,latin-ext">
7575
<link rel="stylesheet" href="{% static 'css/blog.css' %}">
7676
</head>
@@ -374,7 +374,7 @@ Feel free to change the title or the text and save the changes!
374374

375375
Congratulations! Your application is getting more and more complete!
376376

377-
If you need more information about Django forms, you should read the documentation: https://docs.djangoproject.com/en/4.2/topics/forms/
377+
If you need more information about Django forms, you should read the documentation: https://docs.djangoproject.com/en/5.1/topics/forms/
378378

379379
## Security
380380

‎en/django_models/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ Now we define the properties we were talking about: `title`, `text`, `created_da
164164
- `models.DateTimeField` – this is a date and time.
165165
- `models.ForeignKey` – this is a link to another model.
166166

167-
We will not explain every bit of code here since it would take too much time. You should take a look at Django's documentation if you want to know more about Model fields and how to define things other than those described above (https://docs.djangoproject.com/en/3.2/ref/models/fields/#field-types).
167+
We will not explain every bit of code here since it would take too much time. You should take a look at Django's documentation if you want to know more about Model fields and how to define things other than those described above (https://docs.djangoproject.com/en/5.1/ref/models/fields/#field-types).
168168

169169
What about `def publish(self):`? This is exactly the `publish` method we were talking about before. `def` means that this is a function/method and `publish` is the name of the method. You can change the name of the method if you want. The naming rule is that we use lowercase and underscores instead of spaces. For example, a method that calculates average price could be called `calculate_average_price`.
170170

‎en/django_start_project/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ In `settings.py`, find the line that contains `TIME_ZONE` and modify it to choos
8888
TIME_ZONE = 'Europe/Berlin'
8989
```
9090

91-
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).
91+
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/5.1/ref/settings/#language-code).
9292

9393
If you want a different language, change the language code by changing the following line:
9494

‎en/django_urls/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -112,4 +112,4 @@ Your console is showing an error, but don't worry – it's actually pretty usefu
112112
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.
113113

114114

115-
> If you want to know more about Django URLconfs, look at the official documentation: https://docs.djangoproject.com/en/4.2/topics/http/urls/
115+
> If you want to know more about Django URLconfs, look at the official documentation: https://docs.djangoproject.com/en/5.1/topics/http/urls/

‎en/django_views/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -39,4 +39,4 @@ Another error! Read what's going on now:
3939

4040
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!
4141

42-
> Learn more about Django views by reading the official documentation: https://docs.djangoproject.com/en/4.2/topics/http/views/
42+
> Learn more about Django views by reading the official documentation: https://docs.djangoproject.com/en/5.1/topics/http/views/

‎en/dynamic_data_in_templates/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -75,4 +75,4 @@ def post_list(request):
7575

7676
That's it! Time to go back to our template and display this QuerySet!
7777

78-
Want to read a little bit more about QuerySets in Django? You should look here: https://docs.djangoproject.com/en/3.2/ref/models/querysets/
78+
Want to read a little bit more about QuerySets in Django? You should look here: https://docs.djangoproject.com/en/5.1/ref/models/querysets/

‎en/python_installation/images/python-installation-options.png

66.6 KB
Loading

‎en/template_extending/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -27,7 +27,7 @@ Then open it up in the code editor and copy everything from `post_list.html` to
2727
<html>
2828
<head>
2929
<title>Django Girls blog</title>
30-
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.1.3/dist/css/bootstrap.min.css" integrity="sha384-1BmE4kWBq78iYhFldvKuhfTAU6auU8tT94WrHftjDbrCEXSU1oBoqyl2QvZ6jIW3" crossorigin="anonymous">
30+
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/bootstrap@5.3.3/dist/css/bootstrap.min.css" integrity="sha384-QWTKZyjpPEjISv5WaRU9OFeRpok6YctnYmDr5pNlyT2bRjXh0JMhjY6hW+ALEwIH" crossorigin="anonymous">
3131
<link rel="stylesheet" href="https://fonts.googleapis.com/css?family=Lobster&subset=latin,latin-ext">
3232
<link rel="stylesheet" href="{% static 'css/blog.css' %}">
3333
</head>

‎en/whats_next/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ Yes! There are a _lot_ of resources online for learning all kinds of programming
1414

1515
#### Django
1616
- Our other book, [Django Girls Tutorial: Extensions](https://tutorial-extensions.djangogirls.org/)
17-
- [Django's official tutorial](https://docs.djangoproject.com/en/4.2/intro/tutorial01/)
17+
- [Django's official tutorial](https://docs.djangoproject.com/en/5.1/intro/tutorial01/)
1818
- [Getting Started With Django video lessons](http://www.gettingstartedwithdjango.com/)
1919
- [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
2020

‎fa/deploy/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -171,7 +171,7 @@
171171

172172
{% filename %}خط فرمان PythonAnywhere {% endfilename %}
173173

174-
$ pip3.8 install --user pythonanywhere
174+
$ pip install --user pythonanywhere
175175

176176

177177
این دستور باید چیزهایی شبیه به `Collecting pythonanywhere` بر روی صفحه نشان دهد و در انتها نیز این پیغام `Successfully installed (...) pythonanywhere- (...)` نمایش داده خواهد شد.
@@ -180,7 +180,7 @@
180180

181181
{% filename %}خط فرمان PythonAnywhere {% endfilename %}
182182

183-
$ pa_autoconfigure_django.py --python=3.8 https://github.com/<your-github-username>/my-first-blog.git
183+
$ pa_autoconfigure_django.py --python=3.10 https://github.com/<your-github-username>/my-first-blog.git
184184

185185

186186
همینطور که به اجراشدن آن نگاه می‌کنید می‌توانید بفهمید که چه کاری انجام می‌دهد:

‎fa/django_forms/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ class PostForm(forms.ModelForm):
6060

6161
توجه داشته باشید که ما می‌خواهیم نام ویو جدید را `post_new` بگذاریم. آیتم [SVG icon](https://icons.getbootstrap.com/icons/file-earmark-plus/) توسط [Bootstrap Icons](https://icons.getbootstrap.com/) ارائه می‌شود و علامتی مانند یک صفحه به همراه یک علامت به اضافه، نشان خواهد داد. ما از یک هدایت‌کننده جنگو یا Django template directive، به اسم `include` استفاده می‌کنیم. این هدایت‌کننده محتوای یک فایل را به تمپلیت جنگو تزریق می‌کند. مرورگر وب به خوبی می‌تواند این نوع از محتوا را بدون پردازش‌های اضافه، مدیریت کند.
6262

63-
> شما می‌توانید تمام آیکون‌های بوتسترپ را از [اینجا](https://github.com/twbs/icons/releases/download/v1.1.0/bootstrap-icons-1.1.0.zip) دانلود کنید. فایل را از حالت زیپ خارج کنید و همه تصاویر را در پوشه‌ای به نام `icons` در داخل پوشه `blog/templates/blog/` قرار دهید. به این روش شما می‌توانید به آیکونی مانند `pencil-fill.svg` از طریق آدرس `blog/templates/blog/icons/pencil-fill.svg`، دسترسی داشته باشید
63+
> شما می‌توانید تمام آیکون‌های بوتسترپ را از [اینجا](https://github.com/twbs/icons/releases/download/v1.11.3/bootstrap-icons-1.11.3.zip) دانلود کنید. فایل را از حالت زیپ خارج کنید و همه تصاویر را در پوشه‌ای به نام `icons` در داخل پوشه `blog/templates/blog/` قرار دهید. به این روش شما می‌توانید به آیکونی مانند `pencil-fill.svg` از طریق آدرس `blog/templates/blog/icons/pencil-fill.svg`، دسترسی داشته باشید
6464
6565
بعد از اصلاح این خط، فایل شما باید به این شکل باشد:
6666

‎fr/deploy/README.md

+2-2
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,7 @@ Pour déployer une application sur PythonAnywhere, vous devez y télécharger vo
175175

176176
{% filename %}PythonAnywhere command-line{% endfilename %}
177177

178-
$ pip3.8 install --user pythonanywhere
178+
$ pip install --user pythonanywhere
179179

180180

181181
Vous devriez voir quelque chose comme `Collecting pythonanywhere`, et au bout d'un moment une dernière ligne disant `Successfully installed (...) pythonanywhere-(...)`.
@@ -184,7 +184,7 @@ Maintenant, nous exécutez l'assistant pour configurer automatiquement votre app
184184

185185
{% filename %}PythonAnywhere command-line{% endfilename %}
186186

187-
$ pa_autoconfigure_django.py --python=3.8 https://github.com/<your-github-username>/my-first-blog.git
187+
$ pa_autoconfigure_django.py --python=3.10 https://github.com/<your-github-username>/my-first-blog.git
188188

189189

190190
En regardant la commande s'exécuter, vous devriez voir ce qui ce passe:

‎fr/django_forms/README.md

+1-1
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ Il est temps d'ouvrir `blog/templates/blog/base.html` dans l'éditeur de code. M
6060

6161
Remarquez que notre nouvelle vue s'appelle `post_new`. L'icône [SVG](https://icons.getbootstrap.com/icons/file-earmark-plus/) est fournie par les [icônes Bootstrap](https://icons.getbootstrap.com/) et elle affichera une icône de page avec le signe plus. Nous utilisons une directive de modèle Django appelée `include`. Cela injectera le contenu du fichier dans le template Django. Le navigateur web sait comment gérer ce type de contenu sans aucun traitement supplémentaire.
6262

63-
> Vous pouvez télécharger toutes les icônes Bootstrap [ici](https://github.com/twbs/icons/releases/download/v1.1.0/bootstrap-icons-1.1.0.zip). Décompressez le fichier et copiez tous les fichiers image SVG vers un nouveau dossier dans `blog/templates/blog/` intitulé `icons`. De cette façon, vous pouvez accéder à une icône comme `pencil-fill.svg` en référençant le chemin du fichier `blog/templates/blog/icons/pencil-fill.svg`
63+
> Vous pouvez télécharger toutes les icônes Bootstrap [ici](https://github.com/twbs/icons/releases/download/v1.11.3/bootstrap-icons-1.11.3.zip). Décompressez le fichier et copiez tous les fichiers image SVG vers un nouveau dossier dans `blog/templates/blog/` intitulé `icons`. De cette façon, vous pouvez accéder à une icône comme `pencil-fill.svg` en référençant le chemin du fichier `blog/templates/blog/icons/pencil-fill.svg`
6464
6565
Après avoir ajouté cette ligne, votre fichier HTML devrait maintenant ressembler à ceci :
6666

0 commit comments

Comments
 (0)