From d6968a0bd761e1a0372b2f967725c7d0aa4b5440 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden
Date: Thu, 1 Dec 2022 20:08:32 +0100
Subject: [PATCH 01/70] Ignore the default branch name problem
With older versions of git the command to rename the branch fails if
there is no branch yet. We're also making the tutorial harder than it
needs to be.
This ignores it and simply uses the default by pushing HEAD instead of
main. GitHub is then smart enough to use that as default. Future clones
will also simply copy the default branch from GitHub.
---
en/deploy/README.md | 19 +------------------
en/deploy/install_git.md | 31 -------------------------------
2 files changed, 1 insertion(+), 49 deletions(-)
diff --git a/en/deploy/README.md b/en/deploy/README.md
index fbc01880e53..d191c1645ee 100644
--- a/en/deploy/README.md
+++ b/en/deploy/README.md
@@ -31,23 +31,6 @@ $ git config --global user.email you@example.com
```
Initializing the git repository is something we need to do only once per project (and you won't have to re-enter the username and email ever again).
-### Adjusting your branch name
-
-If the version of Git that you are using is older than **2.28**, you will need to change the name of your branch to "main". To determine the version of Git, please enter the following command:
-
-{% filename %}command-line{% endfilename %}
-```
-$ git --version
-git version 2.xx...
-```
-
-Only if the second number of the version, shown as "xx" above, is less than 28, will you need to enter the following command to rename your branch. If it is 28 or higher, please continue to "Ignoring files". As in "Initializing", this is something we need to do only once per project, as well as only when your version of Git is less than 2.28:
-
-{% filename %}command-line{% endfilename %}
-```
-$ git branch -M main
-```
-
### Ignoring files
Git will track changes to all the files and folders in this directory, but there are some files we want it to ignore. We do this by creating a file called `.gitignore` in the base directory. Open up your editor and create a new file with the following contents:
@@ -153,7 +136,7 @@ Type the following into your console (replace `` with the
{% filename %}command-line{% endfilename %}
```
$ git remote add origin https://github.com//my-first-blog.git
-$ git push -u origin main
+$ git push -u origin HEAD
```
When you push to GitHub, you'll be asked for your GitHub username and password (either right there in the command-line window or in a pop-up window), and after entering credentials you should see something like this:
diff --git a/en/deploy/install_git.md b/en/deploy/install_git.md
index 9dbf5c43566..0208d483d93 100644
--- a/en/deploy/install_git.md
+++ b/en/deploy/install_git.md
@@ -7,8 +7,6 @@ data-collapse=true ces-->
You can download Git from [git-scm.com](https://git-scm.com/). You can hit "next" on all steps except for two: in the step where it asks to choose your editor, you should pick Nano, and in the step entitled "Adjusting your PATH environment", choose "Use Git and optional Unix tools from the Windows Command Prompt" (the bottom option). Other than that, the defaults are fine. Checkout Windows-style, commit Unix-style line endings is good.
-During installation, if you are presented with the option of "Adjusting the name of the initial branch in new repositories", please choose to "Override the default" and use "main". This will align your installation of Git with the broad direction of the global developer community, and the "main" branch will be used through the remainder of this tutorial. Please see https://sfconservancy.org/news/2020/jun/23/gitbranchname/ and https://github.com/github/renaming for further discussion of this subject.
-
Do not forget to restart the command prompt or PowerShell after the installation finished successfully.
@@ -17,8 +15,6 @@ data-collapse=true ces-->
Download Git from [git-scm.com](https://git-scm.com/) and follow the instructions.
-During installation, if you are presented with the option of "Adjusting the name of the initial branch in new repositories", please choose to "Override the default" and use "main". This will align your installation of Git with the broad direction of the global developer community, and the "main" branch will be used through the remainder of this tutorial. Please see https://sfconservancy.org/news/2020/jun/23/gitbranchname/ and https://github.com/github/renaming for further discussion of this subject.
-
> **Note** If you are running OS X 10.6, 10.7, or 10.8, you will need to install the version of git from here: [Git installer for OS X Snow Leopard](https://sourceforge.net/projects/git-osx-installer/files/git-2.3.5-intel-universal-snow-leopard.dmg/download)
@@ -31,15 +27,6 @@ data-collapse=true ces-->
$ sudo apt install git
```
-### Adjusting your default branch name
-
-This will align your installation of Git with the broad direction of the global developer community, and the "main" branch will be used through the remainder of this tutorial. Please see https://sfconservancy.org/news/2020/jun/23/gitbranchname/ and https://github.com/github/renaming for further discussion of this subject.
-
-{% filename %}command-line{% endfilename %}
-```
-$ git config --global --add init.defaultBranch main
-```
-
$ sudo dnf install git
```
-### Adjusting your default branch name
-
-This will align your installation of Git with the broad direction of the global developer community, and the "main" branch will be used through the remainder of this tutorial. Please see https://sfconservancy.org/news/2020/jun/23/gitbranchname/ and https://github.com/github/renaming for further discussion of this subject.
-
-{% filename %}command-line{% endfilename %}
-```
-$ git config --global --add init.defaultBranch main
-```
-
$ sudo zypper install git
```
-### Adjusting your default branch name
-
-This will align your installation of Git with the broad direction of the global developer community, and the "main" branch will be used through the remainder of this tutorial. Please see https://sfconservancy.org/news/2020/jun/23/gitbranchname/ and https://github.com/github/renaming for further discussion of this subject.
-
-{% filename %}command-line{% endfilename %}
-```
-$ git config --global --add init.defaultBranch main
-```
-
From 564152a4fb149c841966d76b1692598cd56ac282 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden
Date: Thu, 6 Apr 2023 12:35:07 +0200
Subject: [PATCH 02/70] Switch to actions/deploy-pages
This uses the currently beta feature of using GitHub Actions to deploy
GitHub Pages, rather than using a gh-pages branch. This keeps the
repository size smaller.
---
.github/workflows/deploy.yml | 40 +++++++++++++++++++++++++++---------
1 file changed, 30 insertions(+), 10 deletions(-)
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 2e39cbda04b..26085e3df72 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -1,27 +1,47 @@
+---
name: Build and Deploy
+
on:
push:
branches:
- master
+permissions:
+ contents: read
+ pages: write
+ id-token: write
+
+concurrency:
+ group: "pages"
+ cancel-in-progress: true
+
jobs:
- build-and-deploy:
+ build:
runs-on: ubuntu-latest
- if: github.repository == 'djangogirls/tutorial'
steps:
- name: Checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@v3
with:
persist-credentials: false
-
- name: Install and Build
run: |
npm install
npx honkit build
-
- - name: Deploy
- uses: JamesIves/github-pages-deploy-action@releases/v3
+ - name: Upload artifact
+ uses: actions/upload-pages-artifact@v1
with:
- GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
- BRANCH: gh-pages
- FOLDER: _book
+ path: _book
+
+ deploy:
+ needs: build
+ permissions:
+ pages: write
+ id-token: write
+ environment:
+ name: github-pages
+ url: ${{ steps.deployment.outputs.page_url }}
+ runs-on: ubuntu-latest
+ steps:
+ - name: Deploy to GitHub Pages
+ id: deployment
+ uses: actions/deploy-pages@v2
From 07b9f94575be9be40a0428c11e3d5bf99b4f8682 Mon Sep 17 00:00:00 2001
From: Anna Makarudze
Date: Wed, 19 Apr 2023 00:25:08 +0200
Subject: [PATCH 03/70] Add contributing guide for restructuring tutorial
---
README.md | 27 ++++++++++++++++++++++++---
1 file changed, 24 insertions(+), 3 deletions(-)
diff --git a/README.md b/README.md
index 3bf6cdbde25..01efc466fb1 100644
--- a/README.md
+++ b/README.md
@@ -26,7 +26,7 @@ For contributing to the tutorial the following is needed to get started:
* a [GitHub account](https://github.com)
* in the case of complex edits familiarity with [Git command line basics](https://help.github.com/articles/set-up-git) or familiarity with an app ([Windows](https://windows.github.com/), [Mac](https://mac.github.com/)) to push your edits made on your computer to GitHub.
-## Fork the repository
+## Fork the repository {#fork-the-repository}
First fork the [DjangoGirls/tutorial](https://github.com/DjangoGirls/tutorial) repository to your personal GitHub account:
@@ -60,7 +60,7 @@ Markdown syntax is used to edit the individual pages of the tutorial.
Save your changes and create a pull request as explained below.
-## New content and complex changes
+## New content and complex changes {#new-content-and-complex-changes}
For adding new chapters, writing longer snippets of text or adding images, you need to get a copy of the tutorial to your local computer.
@@ -114,7 +114,28 @@ Example:
To git@github.com:miohtama/tutorial.git
b37ca59..fe36152 contributing -> contributing
-# Making a pull request
+# Restructuring the tutorial {#restructuring-the-tutorial}
+Restructuring the tutorial is a major change that takes time so we have created a separate branch for these changes.
+
+To make contributions that address issues
+[1777](https://github.com/DjangoGirls/tutorial/issues/1777) and [1792](https://github.com/DjangoGirls/tutorial/issues/1792),
+[fork](#fork-the-repository) the repository your repository.
+
+Next you need to follow instructions for [cloning and setting up locally given in the section above](#new-content-and-complex-changes).
+
+Please make use of ["semantic linefeeds"](https://rhodesmill.org/brandon/2012/one-sentence-per-line/) a.k.a.
+["semantic line breaks"](https://sembr.org/) for all paragraphs.
+Though most of the Django Girls tutorial wasn't originally written that way, placing source line breaks at semantically meaningful spots in the text (and especially between sentences) facilitates both, commenting on individual statements or thoughts in the text as part of the review process, as well as future editing and diff-ing.
+
+As we restructure the tutorial, this would be a great change to introduce to the tutorial so please make sure the chapter you work on follow this pattern.
+
+All pull requests for changes aimed at restructuring the tutorial which address the issues
+[1777](https://github.com/DjangoGirls/tutorial/issues/1777) and [1792](https://github.com/DjangoGirls/tutorial/issues/1792)
+should be made to the `restructure-tutorial`.
+
+All other steps for creating a pull request are the same as those outlined in the section on [making a pull request below](#making-a-pull-request), just make sure you make the pull request against the `restructure-tutorial` branch.
+
+# Making a pull request {#making-a-pull-request}
After you have finished your changes you need to create [a pull request](https://help.github.com/articles/using-pull-requests) on GitHub. DjangoGirls will get notified about the pull request, review your changes, suggest any corrections if needed and then *pull* your changes to the master version.
From f1054228382124b323d65ff99e6c3a054e279615 Mon Sep 17 00:00:00 2001
From: Raphael Borun Das Gupta
Date: Sat, 29 Apr 2023 14:09:37 +0200
Subject: [PATCH 04/70] build and deploy ePub e-book files
---
.github/workflows/deploy.yml | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 26085e3df72..272cf55f1c1 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -23,10 +23,15 @@ jobs:
uses: actions/checkout@v3
with:
persist-credentials: false
+ - uses: awalsh128/cache-apt-pkgs-action@v1
+ with:
+ packages: calibre
- name: Install and Build
run: |
npm install
npx honkit build
+ npx honkit epub
+ mv book_*.epub _book/
- name: Upload artifact
uses: actions/upload-pages-artifact@v1
with:
From 06833a6745280ef7cf6bae0756af3fd3ef8a1073 Mon Sep 17 00:00:00 2001
From: Raphael Borun Das Gupta
Date: Thu, 4 May 2023 00:29:06 +0200
Subject: [PATCH 05/70] name ePub files sensibly
---
.github/workflows/deploy.yml | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 272cf55f1c1..96210bfd3c6 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -25,13 +25,14 @@ jobs:
persist-credentials: false
- uses: awalsh128/cache-apt-pkgs-action@v1
with:
- packages: calibre
+ packages: calibre rename
- name: Install and Build
run: |
npm install
npx honkit build
npx honkit epub
- mv book_*.epub _book/
+ rename 's/^book/django-girls-tutorial/' book_*.epub
+ mv *.epub _book/
- name: Upload artifact
uses: actions/upload-pages-artifact@v1
with:
From 68cb21a8df66bedd88aa3b1396bb3749642cbd69 Mon Sep 17 00:00:00 2001
From: Elena Williams
Date: Fri, 25 Aug 2023 20:56:22 +1000
Subject: [PATCH 06/70] Update README add Quickstart
Based on my experience trying to get started.
---
README.md | 24 +++++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
diff --git a/README.md b/README.md
index 3bf6cdbde25..6de6ede6299 100644
--- a/README.md
+++ b/README.md
@@ -1,7 +1,25 @@
# Django Girls Tutorial
-This is the source code repository for the Django Girls Tutorial. Django Girls Tutorial is used on [tutorial.djangogirls.org](http://tutorial.djangogirls.org) so if you want to read it, please go there. If you want to contribute please do go further with this file.
+~ 🖥 Source Code 🖥 ~
+**NOT** intended for reading here. To read go to: [📖 tutorial.djangogirls.org 📖](http://tutorial.djangogirls.org)
+
+# Contribution QUICKSTART
+
+1. Fork this repo [[fork](#fork-the-repository)]
+
+> 2. **[Small changes](#simple-changes)**: you can now edit your fork on the github website, do this! Make a change, then [create a pull request](#making-a-pull-request)!
+
+2. **[Big changes](#new-content-and-complex-changes)**: clone your fork locally.
+3. [CLI](#cli-for-development) run `make dev` in repo.
+
+```
+$ make dev
+...
+Serving book on http://localhost:4000
+```
+
+Note: we have many changes under way we maybe working on your request already! Refer to existing [Pull requests](https://github.com/DjangoGirls/tutorial/pulls).
# How to contribute
@@ -114,9 +132,9 @@ Example:
To git@github.com:miohtama/tutorial.git
b37ca59..fe36152 contributing -> contributing
-# Making a pull request
+# Making a [pull request](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/about-pull-requests)
-After you have finished your changes you need to create [a pull request](https://help.github.com/articles/using-pull-requests) on GitHub. DjangoGirls will get notified about the pull request, review your changes, suggest any corrections if needed and then *pull* your changes to the master version.
+After you have finished your changes you need to [create a pull request](https://docs.github.com/en/pull-requests/collaborating-with-pull-requests/proposing-changes-to-your-work-with-pull-requests/creating-a-pull-request) on GitHub. DjangoGirls will get notified about the pull request, review your changes, suggest any corrections if needed and then *pull* your changes to the master version.
In your own repository on GitHub press do *Compare & pull request*
From 41474fec3fa754331c23cc34a363f1dab54ff5cc Mon Sep 17 00:00:00 2001
From: Elena Williams
Date: Fri, 6 Oct 2023 09:19:50 +1100
Subject: [PATCH 07/70] Update README.md fix url to `https`
Thanks to @ekohl review
---
README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 6de6ede6299..e9d64416f77 100644
--- a/README.md
+++ b/README.md
@@ -2,7 +2,7 @@
~ 🖥 Source Code 🖥 ~
-**NOT** intended for reading here. To read go to: [📖 tutorial.djangogirls.org 📖](http://tutorial.djangogirls.org)
+**NOT** intended for reading here. To read go to: [📖 tutorial.djangogirls.org 📖](https://tutorial.djangogirls.org)
# Contribution QUICKSTART
From 5c3a5a923dab32c2fd2636201a086f1eb3d79f21 Mon Sep 17 00:00:00 2001
From: Thibaud Colas
Date: Sun, 8 Oct 2023 08:10:42 +0100
Subject: [PATCH 08/70] Swap the order of href and rel for Google Fonts loading
---
en/css/README.md | 2 +-
en/django_forms/README.md | 2 +-
en/template_extending/README.md | 2 +-
3 files changed, 3 insertions(+), 3 deletions(-)
diff --git a/en/css/README.md b/en/css/README.md
index 7769a2fcd1b..a20b1f372f0 100644
--- a/en/css/README.md
+++ b/en/css/README.md
@@ -159,7 +159,7 @@ Maybe we can customize the font in our header? Paste this into your `` in
{% filename %}blog/templates/blog/post_list.html{% endfilename %}
```html
-
+
```
As before, check the order and place before the link to `blog/static/css/blog.css`. This line will import a font called *Lobster* from Google Fonts (https://www.google.com/fonts).
diff --git a/en/django_forms/README.md b/en/django_forms/README.md
index 475f6e3f5dc..5bb3b83d4a0 100644
--- a/en/django_forms/README.md
+++ b/en/django_forms/README.md
@@ -71,7 +71,7 @@ After editing the line, your HTML file should now look like this:
Django Girls blog
-
+
diff --git a/en/template_extending/README.md b/en/template_extending/README.md
index a5c74f347d1..8211bd3ff38 100644
--- a/en/template_extending/README.md
+++ b/en/template_extending/README.md
@@ -28,7 +28,7 @@ Then open it up in the code editor and copy everything from `post_list.html` to
Django Girls blog
-
+
From eddd8201f6e3cba764895eee348b2d3426b7ab0e Mon Sep 17 00:00:00 2001
From: Thibaud Colas
Date: Sun, 8 Oct 2023 08:31:57 +0100
Subject: [PATCH 09/70] Tell RunCode users which terminal to use
---
en/cloud_development_setup/instructions.md | 2 +-
en/intro_to_command_line/open_instructions.md | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/en/cloud_development_setup/instructions.md b/en/cloud_development_setup/instructions.md
index 9e89fcc288d..0a8fe2d6cb0 100644
--- a/en/cloud_development_setup/instructions.md
+++ b/en/cloud_development_setup/instructions.md
@@ -13,7 +13,7 @@ which you can sign up with.
{% include "/deploy/signup_pythonanywhere.md" %}
## Command Line
-To open the Ubuntu terminal on RunCode, go to Workspaces → New Workspace → Blank. This will open a new Visual Studio Code workspace which has an Ubuntu terminal in the bottom pane.
+To open the Ubuntu terminal on RunCode, go to Workspaces → New Workspace → Blank, and select the “Tiny” Workspace Type. After waiting for it to start, this will open a new Visual Studio Code workspace which has an Ubuntu terminal in the bottom pane.
Altenatively, you can go to Workspaces → New Workspace → Jupyter Lab. This will open a Python prompt which is depicted by `>>>`, you can type `exit()` to get back to the Ubuntu terminal.
diff --git a/en/intro_to_command_line/open_instructions.md b/en/intro_to_command_line/open_instructions.md
index a6fdaa4a67a..1bee55ef3e8 100644
--- a/en/intro_to_command_line/open_instructions.md
+++ b/en/intro_to_command_line/open_instructions.md
@@ -29,7 +29,7 @@ It's probably under Applications → Accessories → Terminal, or Applications
> **NOTE** If you followed [RunCode setup instructions](../cloud_development_setup/README.md) follow these steps to open command line.
-To open the Ubuntu terminal on RunCode, go to Workspaces → New Workspace → Blank. This will open a new Visual Studio Code workspace which has an Ubuntu terminal in the bottom pane.
+If you already created a Workspace on RunCode, access it again from the Dashobard. To open a new workspace with the the Ubuntu terminal on RunCode, go to Workspaces → New Workspace → Blank, and select the “Tiny” Workspace Type. This will open a new Visual Studio Code workspace which has an Ubuntu terminal in the bottom pane.
Altenatively, you can go to Workspaces → New Workspace → Jupyter Lab. This will open a Python prompt which is depicted by `>>>`, you can type `exit()` to get back to the Ubuntu terminal.
From 70960bd752dd28cb7c99192be6e3dac0b975a9b1 Mon Sep 17 00:00:00 2001
From: Thibaud Colas
Date: Sun, 8 Oct 2023 09:11:41 +0100
Subject: [PATCH 10/70] Simplify RunCode virtual environment installation and
usage instructions
---
en/cloud_development_setup/instructions.md | 26 +++++++++-------------
1 file changed, 10 insertions(+), 16 deletions(-)
diff --git a/en/cloud_development_setup/instructions.md b/en/cloud_development_setup/instructions.md
index 9e89fcc288d..a1f51e259d5 100644
--- a/en/cloud_development_setup/instructions.md
+++ b/en/cloud_development_setup/instructions.md
@@ -34,30 +34,24 @@ $ mkdir djangogirls
$ cd djangogirls
```
-We will make a virtualenv called `myvenv`.
+We will make a virtualenv called `myvenv` by running `python3 -m venv myvenv`.
+It will look like this:
-To create a new `virtualenv` on RunCode, you first need to install the `virtualenv` module. To do so, first you need to update
-the packages in your environment
->```
->$ sudo apt-get update -y
->```
-> then install `virtualenv` by running the command:
->```
->$ sudo apt-get install -y virtualenv
->```
+{% filename %}command-line{% endfilename %}
+```
+$ python3 -m venv myvenv
+```
-> After this you can create the `virtualenv` run the command:
->```
->$ virtualenv -p python myvenv
->```
-> and a new `virtualenv` with the name `myvenv` or whatever name you chose should be created in your `djangogirls` folder.
+`myvenv` is the name of your `virtualenv`. You can use any other name, but stick to lowercase and use no spaces. It is also a good idea to keep the name short as you'll be referencing it a lot!
## Working with a Virtual Environment
>Start your virtual environment by running:
>```
->$ . myvenv/bin/activate
+>$ source myvenv/bin/activate
>```
+Remember to replace `myvenv` with your chosen `virtualenv` name!
+
### Installing packages with requirements
A requirements file keeps a list of dependencies to be installed using
From 3276ac7999aa76f039bdc14ca69b4f5d06bf4da1 Mon Sep 17 00:00:00 2001
From: Raphael Borun Das Gupta
Date: Sun, 8 Oct 2023 10:31:19 +0200
Subject: [PATCH 11/70] remove suggestions to use Jupyter Lab workspace
as well as all mentions of how to open
a command line window or Python prompt in it,
as (for this tutorial) there's probably no advantage
to use Jupyter Lab in RunCode
over using RunCode's default VSCode based workspaces,
but indeed some disadvantages, as #1805 mentions.
(Fewer unneeded options to choose from also simplifies
the work of coaches and of those maintaining the tutorial.)
Also, completely remove the special case for RunCode users
in the "Python prompt" section, as at that point,
they've already been told to follow Linux instructions.
fixes #1805
---
en/cloud_development_setup/instructions.md | 2 --
en/intro_to_command_line/open_instructions.md | 2 --
en/python_introduction/prompt.md | 9 ---------
3 files changed, 13 deletions(-)
diff --git a/en/cloud_development_setup/instructions.md b/en/cloud_development_setup/instructions.md
index 9e89fcc288d..c65654ac791 100644
--- a/en/cloud_development_setup/instructions.md
+++ b/en/cloud_development_setup/instructions.md
@@ -15,8 +15,6 @@ which you can sign up with.
## Command Line
To open the Ubuntu terminal on RunCode, go to Workspaces → New Workspace → Blank. This will open a new Visual Studio Code workspace which has an Ubuntu terminal in the bottom pane.
-Altenatively, you can go to Workspaces → New Workspace → Jupyter Lab. This will open a Python prompt which is depicted by `>>>`, you can type `exit()` to get back to the Ubuntu terminal.
-
Ubuntu is a version of Linux so for all command line instructions later in the tutorial you can follow Linux instructions.
## Virtual Environment
diff --git a/en/intro_to_command_line/open_instructions.md b/en/intro_to_command_line/open_instructions.md
index a6fdaa4a67a..82a39e14064 100644
--- a/en/intro_to_command_line/open_instructions.md
+++ b/en/intro_to_command_line/open_instructions.md
@@ -31,8 +31,6 @@ It's probably under Applications → Accessories → Terminal, or Applications
To open the Ubuntu terminal on RunCode, go to Workspaces → New Workspace → Blank. This will open a new Visual Studio Code workspace which has an Ubuntu terminal in the bottom pane.
-Altenatively, you can go to Workspaces → New Workspace → Jupyter Lab. This will open a Python prompt which is depicted by `>>>`, you can type `exit()` to get back to the Ubuntu terminal.
-
Ubuntu is a version of Linux so from now on you can follow Linux instructions.
\ No newline at end of file
diff --git a/en/python_introduction/prompt.md b/en/python_introduction/prompt.md
index 20ff92b9173..27f422934c0 100644
--- a/en/python_introduction/prompt.md
+++ b/en/python_introduction/prompt.md
@@ -15,12 +15,3 @@ Python {{ book.py_release }} (...)
Type "help", "copyright", "credits" or "license" for more information.
>>>
```
-
-
-
-To open the Python terminal on RunCode, go to Workspaces → New Workspace → Jupyter Lab. This will open a Python prompt
-which is depicted by `>>>`. If you already opened an Ubuntu terminal open, in the [Intro to Command Line](../intro_to_command_line/README.md) chapter, you can just type `python3` in the prompt as shown below to open a Python prompt.
-
-`ubuntu@runcode:~$ python3`
-
-
\ No newline at end of file
From cb56296b1c1ff19d8054ca5ead80a68fde12b491 Mon Sep 17 00:00:00 2001
From: Raphael Borun Das Gupta
Date: Sun, 8 Oct 2023 11:46:54 +0200
Subject: [PATCH 12/70] link to ePub e-book in HTML (web) version
(In the English version, for now.
Translations can be contributed via Crowdin.)
---
en/README.md | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/en/README.md b/en/README.md
index 147df99bf89..fdac73cbf1d 100644
--- a/en/README.md
+++ b/en/README.md
@@ -9,6 +9,11 @@ Welcome to the Django Girls Tutorial! We are happy to see you here. :) In this t
As with all unknown things, this is going to be an adventure - but no worries, since you already worked up the courage to be here, you'll be just fine. :)
+{% if output.name != "ebook" %}
+> Do you want to read this tutorial on your e-reader?
+> Then [download the Django Girls Tutorial as an e-book in ePub format](../django-girls-tutorial_{{ book.language }}.epub).
+{% endif %}
+
## Introduction
Have you ever felt that the world is more and more about technology to which you cannot (yet) relate? Have you ever wondered how to create a website but have never had enough motivation to start? Have you ever thought that the software world is too complicated for you to even try doing something on your own?
From 6751790a3b16abed51bd3556c592ad6e77136ed1 Mon Sep 17 00:00:00 2001
From: Pavel Bitiukov
Date: Fri, 13 Oct 2023 14:16:03 +0100
Subject: [PATCH 13/70] Replaced python versions by variables in the python and
django installation instructions (ru)
---
ru/django_installation/instructions.md | 4 ++--
ru/python_installation/instructions.md | 26 +++++++++++++-------------
ru/python_introduction/README.md | 2 +-
3 files changed, 16 insertions(+), 16 deletions(-)
diff --git a/ru/django_installation/instructions.md b/ru/django_installation/instructions.md
index 3f66514caf6..7455c3306b4 100755
--- a/ru/django_installation/instructions.md
+++ b/ru/django_installation/instructions.md
@@ -80,7 +80,7 @@ $ python3 -m venv myvenv
>{% filename %}command-line{% endfilename %}
>```
>$ sudo apt install python-virtualenv
->$ virtualenv --python=python3.6 myvenv
+>$ virtualenv --python=python{{ book.py_version }} myvenv
>```
> __Примечание:__ Если ты получаешь следующую ошибку
@@ -94,7 +94,7 @@ $ python3 -m venv myvenv
>
>{% filename %}command-line{% endfilename %}
>```
->sudo apt install python3.6-venv
+>sudo apt install python{{ book.py_version }}-venv
>```
diff --git a/ru/python_installation/instructions.md b/ru/python_installation/instructions.md
index 7db74d65550..fee72c68850 100755
--- a/ru/python_installation/instructions.md
+++ b/ru/python_installation/instructions.md
@@ -2,7 +2,7 @@
> Этот подраздел основан на руководстве Geek Girls Carrots (https://github.com/ggcarrots/django-carrots)
-Django написан на Python. Нам нужен Python, чтобы сделать что-нибудь в Django. Давай начнем с его установки! Мы хотим, чтобы ты установила самую свежую версию Python 3, поэтому, если у тебя уже есть более ранняя версия, то её придется обновить. Если у тебя уже установлена версия 3.4 или более высокая, она должна подойти.
+Django написан на Python. Нам нужен Python, чтобы сделать что-нибудь в Django. Давай начнем с его установки! Мы хотим, чтобы ты установила самую свежую версию Python 3, поэтому, если у тебя уже есть более ранняя версия, то её придется обновить. Если у тебя уже установлена версия {{ book.py_min_version }} или более высокая, она должна подойти.
@@ -12,16 +12,16 @@ Django написан на Python. Нам нужен Python, чтобы сдел
* Открой панель управления из меню Windows, оттуда перейди в «Система и безопасность», затем в «Система»
* Нажми клавишу Windows, затем перейди по разделам Настройки > Система > О системе
-Ты можешь загрузить Python для Windows с официального веб-сайта: https://www.python.org/downloads/windows/. Перейди по ссылке «Latest Python 3 Release - Python x.x.x». Если у тебя установлена **64-битная** версия Windows, скачай **Windows x86-64 executable installer**. Если нет — скачай **Windows x86 executable installer**. После загрузки дистрибутива ты должна запустить его (двойным щелчком) и следовать инструкциям.
+Ты можешь загрузить Python для Windows с официального веб-сайта: https://www.python.org/downloads/windows/. Перейди по ссылке «Latest Python 3 Release - Python x.x.x». Если у тебя установлена **64-битная** версия Windows, скачай **Windows installer (64-bit)**. Если нет — скачай **Windows installer (32-bit)**. После загрузки дистрибутива ты должна запустить его (двойным щелчком) и следовать инструкциям.
-Обрати внимание на экран мастера установки, который называется «Setup» (Настройка): тебе нужно пролистать его вниз и выбрать опцию «Add Python 3.6 to the PATH» (Добавить Python 3.6 к системной переменной PATH), как на рисунке (это может выглядеть по-разному в зависимости от версии, которую ты устанавливаешь):
+Обрати внимание на экран мастера установки, который называется «Setup» (Настройка): тебе нужно пролистать его вниз и выбрать опцию «Add Python {{ book.py_version }} to the PATH» (Добавить Python {{ book.py_version }} к системной переменной PATH), как на рисунке (это может выглядеть по-разному в зависимости от версии, которую ты устанавливаешь):

Когда установка закончится, ты можешь увидеть предложение узнать больше о Python или об установленной тобой версии. Закрой это окно — ты узнаешь намного больше в этом руководстве!
-Примечание: если ты используешь старую версию Windows (7, Vista или ещё более старую версию), и установка Python 3.6.x завершается выводом сообщения об ошибке, ты можешь попробовать:
-1. либо установить все доступные обновления Windows и попробовать установить Python 3.6 заново;
+Примечание: если ты используешь старую версию Windows (7, Vista или ещё более старую версию), и установка Python {{ book.py_version }} завершается выводом сообщения об ошибке, ты можешь попробовать:
+1. либо установить все доступные обновления Windows и попробовать установить Python {{ book.py_version }} заново;
2. либо установить [более раннюю версию Python](https://www.python.org/downloads/windows/), например, [3.4.6](https://www.python.org/downloads/release/python-346/).
Если тебе пришлось установить раннюю версию Python, экран установки может выглядеть чуть иначе, чем показано выше. Не забудь прокрутить окно до строки «Add python.exe to Path», затем нажми кнопку слева от неё и выбери пункт «Will be installed on local hard drive»:
@@ -35,10 +35,10 @@ data-collapse=true ces-->
> **Примечание:** перед установкой Python в OS X тебе нужно проверить, что в настройках твоего Mac разрешено устанавливать пакеты, загруженные не из App Store. Перейди в Системные настройки (в папке «Программы»), нажми «Защита и безопасность» и выбери вкладку «Общие». Если в разделе «Разрешать загрузки из:» выбран вариант «App Store для Mac», смени его на «App Store для Mac и от установленных разработчиков».
-Тебе нужно перейти по ссылке https://www.python.org/downloads/release/python-361/ и скачать дистрибутив Python:
+Тебе нужно перейти по ссылке https://www.python.org/downloads/macos/ и скачать дистрибутив Python:
- * Скачай файл *Mac OS X 64-bit/32-bit installer*,
- * Сделай двойной щелчок на *python-3.6.1-macosx10.6.pkg* для запуска установщика.
+ * Скачай файл *macOS 64-bit universal2 installer*,
+ * Сделай двойной щелчок на *python-{{ book.py_release }}-macosx11.pkg* для запуска установщика.
@@ -50,10 +50,10 @@ data-collapse=true ces-->
{% filename %}command-line{% endfilename %}
```
$ python3 --version
-Python 3.6.1
+Python {{ book.py_release }}
```
-Если у тебя установлена другая версия Python, не меньше чем 3.4.0 (например, 3.6.0), то нет необходимости обновляться.
+Если у тебя установлена другая версия Python, не меньше чем {{ book.py_min_version }} (например, {{ book.py_min_release }}), то нет необходимости обновляться.
Если Python не установлен, или ты хочешь использовать другую версию языка, то можешь установить его следующим образом:
@@ -102,11 +102,11 @@ $ sudo zypper install python3
{% filename %}command-line{% endfilename %}
```
$ python3 --version
-Python 3.6.1
+Python {{ book.py_release }}
```
-Версия, которую ты увидишь, может быть и не 3.6.1 — там будет такая версия, которую ты установила.
+Версия, которую ты увидишь, может быть и не {{ book.py_release }} — там будет такая версия, которую ты установила.
-**ПРИМЕЧАНИЕ:** если ты используешь Windows и получила ошибку с сообщением, что `python3` не найден, попробуй ввести `python` (без `3`) и проверь, будет ли это версия Python 3.4.0 или выше.
+**ПРИМЕЧАНИЕ:** если ты используешь Windows и получила ошибку с сообщением, что `python3` не найден, попробуй ввести `python` (без `3`) и проверь, будет ли это версия Python {{ book.py_min_version }} или выше.
----
diff --git a/ru/python_introduction/README.md b/ru/python_introduction/README.md
index ebc74cca8b1..7c43347bdf4 100755
--- a/ru/python_introduction/README.md
+++ b/ru/python_introduction/README.md
@@ -21,7 +21,7 @@
{% filename %}command-line{% endfilename %}
```
$ python3
-Python 3.6.1 (...)
+Python {{ book.py_release }} (...)
Type "help", "copyright", "credits" or "license" for more information.
>>>
```
From 703584ea57418898341a7455a38c5f624dcbfece Mon Sep 17 00:00:00 2001
From: Marcus Weiner
Date: Tue, 12 Dec 2023 19:38:44 +0100
Subject: [PATCH 14/70] Fix variable substitution in German tutorial
It seems variable substitution only works in fenced not indented code blocks.
---
de/python_installation/instructions.md | 18 +++++++++---------
1 file changed, 9 insertions(+), 9 deletions(-)
diff --git a/de/python_installation/instructions.md b/de/python_installation/instructions.md
index c27dcfb7ff7..58cde1b0e09 100644
--- a/de/python_installation/instructions.md
+++ b/de/python_installation/instructions.md
@@ -47,10 +47,10 @@ data-collapse=true ces-->
Es ist ziemlich wahrscheinlich, dass du Python schon automatisch installiert hast. Um herauszufinden, ob das so ist (und wenn ja, welche Version du hast), öffne eine Konsole und gib das folgende Kommando ein:
{% filename %}command-line{% endfilename %}
-
- $ python3 --version
- Python {{ book.py_release }}
-
+```
+$ python3 --version
+Python {{ book.py_release }}
+```
Wenn du eine andere Version von Python installiert hast, die {{ book.py_min_version }} oder höher ist, z.B. {{ book.py_min_release }}, dann musst du die Version nicht aktualisieren. Wenn du Python noch nicht installiert hast oder wenn du eine andere Python-Version willst, prüfe zuerst mit folgendem Befehl, welche Linux-Distribution du benutzt:
@@ -103,10 +103,10 @@ Gib diesen Befehl in die Konsole ein:
Prüfe, ob die Installation erfolgreich war, indem du ein Kommandozeilenfenster öffnest und den `python3`-Befehl ausführst:
{% filename %}command-line{% endfilename %}
-
- $ python3 --version
- Python {{ book.py_release }}
-
+```
+$ python3 --version
+Python {{ book.py_release }}
+```
Die angezeigte Version kann bei dir eine andere sein als {{ book.py_release }} -- sie sollte aber der entsprechen, die du installiert hast.
@@ -114,4 +114,4 @@ Die angezeigte Version kann bei dir eine andere sein als {{ book.py_release }} -
* * *
-Wenn es Unklarheiten gibt oder wenn etwas schief ging und du nicht weiter weißt, frage bitte deinen Coach! Manchmal laufen die Dinge einfach nicht so glatt und dann ist es besser, jemanden mit mehr Erfahrung um Hilfe zu bitten.
\ No newline at end of file
+Wenn es Unklarheiten gibt oder wenn etwas schief ging und du nicht weiter weißt, frage bitte deinen Coach! Manchmal laufen die Dinge einfach nicht so glatt und dann ist es besser, jemanden mit mehr Erfahrung um Hilfe zu bitten.
From cc6291749a788daa87eea6b9f6004e263e1921d0 Mon Sep 17 00:00:00 2001
From: Aidan Feldman
Date: Tue, 20 Feb 2024 22:08:38 -0500
Subject: [PATCH 15/70] add note about editing commands
I imagine it's confusing for folks that are new to the command line as to why their mouse isn't working when they try to move the cursor.
---
en/intro_to_command_line/README.md | 6 +++++-
1 file changed, 5 insertions(+), 1 deletion(-)
diff --git a/en/intro_to_command_line/README.md b/en/intro_to_command_line/README.md
index b7c67bb6f03..ab53abbcec7 100644
--- a/en/intro_to_command_line/README.md
+++ b/en/intro_to_command_line/README.md
@@ -94,7 +94,11 @@ As you can see, the computer has just printed your username. Neat, huh? :)
## Basics
-Each operating system has a slightly different set of commands for the command line, so make sure to follow instructions for your operating system. Let's try this, shall we?
+Each operating system has a slightly different set of commands for the command line, so make sure to follow instructions for your operating system.
+
+If you make a typo, you can use the left and right arrow keys to move your cursor, backspace and delete to edit the command. Most command lines don't support using the mouse to move the cursor.
+
+Let's try this, shall we?
### Current directory
From 2a0ba31565808f578cb232c886ddb34d3b41a05f Mon Sep 17 00:00:00 2001
From: Anna Makarudze
Date: Wed, 10 Apr 2024 13:48:39 +0200
Subject: [PATCH 16/70] Add DigitalOcean to sponsors
---
book.json | 18 ++++++++++++------
1 file changed, 12 insertions(+), 6 deletions(-)
diff --git a/book.json b/book.json
index fd642089c8e..9ccdbbd8103 100644
--- a/book.json
+++ b/book.json
@@ -48,18 +48,24 @@
"description": "💖 Support our work and donate to our project! ✨",
"btnText": "Donate now!"
},
- {
- "imageUrl": "https://posthog.com/static/1cf376d3f6ea36d7fafb9b1c50110603/0b2f4/hosthog-banner.webp",
- "url": "https://posthog.com/",
- "description": "💖 PostHog offers a suite of product analysis tools! ✨",
- "btnText": "Learn more!"
- },
{
"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/",
From eed20d51eeaa224b8eb0db3d4845be0780816925 Mon Sep 17 00:00:00 2001
From: Laura Ceconi
Date: Sun, 21 Apr 2024 09:57:57 +0200
Subject: [PATCH 17/70] Fix typo "mand" to "man"
---
pt/intro_to_command_line/README.md | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/pt/intro_to_command_line/README.md b/pt/intro_to_command_line/README.md
index 13d41cac3ea..086f513437b 100755
--- a/pt/intro_to_command_line/README.md
+++ b/pt/intro_to_command_line/README.md
@@ -132,7 +132,7 @@ Muitos comandos que você digita no Prompt de comand possuem um painel de ajuda
-SO X e Linux tem um comando `man`, que ajuda você nos comandos. Tente `mand pwd` e veja o que ele diz, ou coloque `man` antes de outros comandos para ver seus menus de ajuda. A saída `man` é normalmente paginada. Use a barra de espaço para ir para a próxima página, e `q` para sair do menu de ajuda.
+SO X e Linux tem um comando `man`, que ajuda você nos comandos. Tente `man pwd` e veja o que ele diz, ou coloque `man` antes de outros comandos para ver seus menus de ajuda. A saída `man` é normalmente paginada. Use a barra de espaço para ir para a próxima página, e `q` para sair do menu de ajuda.
@@ -438,4 +438,4 @@ Se estiver com curiosidade, [ss64.com](http://ss64.com) contém uma referência
## Pronta?
-Vamos mergulhar no mundo do Python!
\ No newline at end of file
+Vamos mergulhar no mundo do Python!
From d884efb24e08ca6160559e4164b48743d39bd2fa Mon Sep 17 00:00:00 2001
From: Zahid Kizmaz
Date: Sun, 21 Apr 2024 14:38:07 +0200
Subject: [PATCH 18/70] fix some typos
---
README.md | 2 +-
en/css/README.md | 2 +-
en/installation/README.md | 6 +++---
3 files changed, 5 insertions(+), 5 deletions(-)
diff --git a/README.md b/README.md
index e9d64416f77..1131903b568 100644
--- a/README.md
+++ b/README.md
@@ -52,7 +52,7 @@ First fork the [DjangoGirls/tutorial](https://github.com/DjangoGirls/tutorial) r
## CLI for Development
-This command line tool use `make` to create development environment. It is optional to use this tool. While building the document, it builds the document for every language. The build process can be limited to any one language using this tool and reduce build time considerbly. Afterwards, the translation to other languages are done from crowdin localization process.
+This command line tool use `make` to create development environment. It is optional to use this tool. While building the document, it builds the document for every language. The build process can be limited to any one language using this tool and reduce build time considerably. Afterwards, the translation to other languages are done from crowdin localization process.
Usage instructions are available though `make help` command.
diff --git a/en/css/README.md b/en/css/README.md
index a20b1f372f0..4c984e00ac0 100644
--- a/en/css/README.md
+++ b/en/css/README.md
@@ -107,7 +107,7 @@ Between the `` and `` tags, after the links to the Bootstrap CSS fi
```html
```
-The browser reads the files in the order they're given, so we need to make sure this is in the right place. Otherwise the code in our file may be overriden by code in Bootstrap files.
+The browser reads the files in the order they're given, so we need to make sure this is in the right place. Otherwise the code in our file may be overridden by code in Bootstrap files.
We just told our template where our CSS file is located.
Your file should now look like this:
diff --git a/en/installation/README.md b/en/installation/README.md
index cf171ef63e1..41c8e7b74a5 100644
--- a/en/installation/README.md
+++ b/en/installation/README.md
@@ -20,7 +20,7 @@ install various software on your computer and set up some online accounts as nee
# Cloud Development
In this tutorial, the cloud development platform we will be using will be [RunCode](https://runcode.io/). RunCode is a cloud development environment which people can use without the need to install Python, Django and Visual Studio Code editor locally on their machines. This cloud environment enables anyone to work from any device that has an internet connection, including cellphones, tablets, laptop or desktop.
-This removes the need for you to install packages on a borrowed laptop or the need for you to own a laptop to attend the workshop or follow this tutorial from home as you only need to set up three online accounts. This will also save you time required for setting up your development environment. You can always do the [installation](installation/README.md#command-line) later own as a follow-up after finishing the tutorial. However, loading the development enviroment requires good and fast internet for this solution to work for you.
+This removes the need for you to install packages on a borrowed laptop or the need for you to own a laptop to attend the workshop or follow this tutorial from home as you only need to set up three online accounts. This will also save you time required for setting up your development environment. You can always do the [installation](installation/README.md#command-line) later on as a follow-up after finishing the tutorial. However, loading the development environment requires good and fast internet for this solution to work for you.
> **Note** There are sections of this tutorial which depend on the platform you are working on. If you follow the local installation steps for Windows, Linux, OS X or Chromebook, you will need to follow instructions for your operating system. If you follow RunCode Cloud Environment setup instructions, then you will need to follow instructions for RunCode development environment. Where no specific instructions are provided for RunCode Cloud Environment, follow the Linux instructions as RunCode runs on Ubuntu Linux.
@@ -28,7 +28,7 @@ This removes the need for you to install packages on a borrowed laptop or the ne
# RunCode Cloud Development Setup
To set up RunCode Cloud development, follow the instructions below:
-
{% include "/cloud_development_setup/instructions.md" %}
@@ -43,7 +43,7 @@ data-id="chromebook_setup" data-collapse=true ces-->
# OS X, Windows, Linux Installation {#osx-windows-linux}
-> __NOTE:__ You can skip right over this section if you have followed [RunCode Cloud Development](cloud_development_setup/README.md) or [ChromeBook](chromebook_setup/README.md) installation steps.
+> __NOTE:__ You can skip right over this section if you have followed [RunCode Cloud Development](cloud_development_setup/README.md) or [ChromeBook](chromebook_setup/README.md) installation steps.
If you are not using RunCode or Chromebook, your experience will be a little different as you need to download and install some software locally as well as set up online accounts.
From 6e735b71a7eb63703aadd2f7db7db219ffdc4329 Mon Sep 17 00:00:00 2001
From: Zahid Kizmaz
Date: Sun, 21 Apr 2024 15:12:16 +0200
Subject: [PATCH 19/70] 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 20/70] 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 0431f7635a91a605e98ec55a6676754368122334 Mon Sep 17 00:00:00 2001
From: Oorja Majgaonkar
Date: Sun, 21 Apr 2024 15:42:39 +0200
Subject: [PATCH 21/70] instructions to create github access token
---
en/deploy/README.md | 8 ++++++++
1 file changed, 8 insertions(+)
diff --git a/en/deploy/README.md b/en/deploy/README.md
index d191c1645ee..a2561b9171b 100644
--- a/en/deploy/README.md
+++ b/en/deploy/README.md
@@ -151,6 +151,14 @@ To https://github.com/ola/my-first-blog.git
Branch main set up to track remote branch main from origin.
```
+> **Note** You might encounter the following error when trying to push to GitHub:
+```
+remote: Support for password authentication was removed on August 13, 2021.
+remote: Please see https://docs.github.com/get-started/getting-started-with-git/about-remote-repositories#cloning-with-https-urls for information on currently recommended modes of authentication.
+fatal: Authentication failed for 'https://github.com//my-first-blog.git/'
+```
+In this case, follow the instructions from GitHub to [create a personal access token](https://docs.github.com/en/authentication/keeping-your-account-and-data-secure/managing-your-personal-access-tokens#creating-a-personal-access-token-classic). The token should have the 'repo' scope. Copy the value of the token, then try the git push command again. When you are prompted to enter your username and password, enter the access token instead of your password.
+
Your code is now on GitHub. Go and check it out! You'll find it's in fine company – [Django](https://github.com/django/django), the [Django Girls Tutorial](https://github.com/DjangoGirls/tutorial), and many other great open source software projects also host their code on GitHub. :)
From 07fd6132dc50064f2dfcd1b6af13d4ea4b671faf Mon Sep 17 00:00:00 2001
From: Zahid Kizmaz
Date: Sun, 21 Apr 2024 15:41:40 +0200
Subject: [PATCH 22/70] 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 23/70] 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 b50cb7b73ebe1a5b0c262124e187ef2cbe705df0 Mon Sep 17 00:00:00 2001
From: Zahid Kizmaz
Date: Sun, 21 Apr 2024 22:06:53 +0200
Subject: [PATCH 24/70] chore: update github actions
---
.github/workflows/deploy.yml | 6 +++---
.github/workflows/test.yml | 2 +-
2 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/.github/workflows/deploy.yml b/.github/workflows/deploy.yml
index 26085e3df72..c9341696806 100644
--- a/.github/workflows/deploy.yml
+++ b/.github/workflows/deploy.yml
@@ -20,7 +20,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
- uses: actions/checkout@v3
+ uses: actions/checkout@v4
with:
persist-credentials: false
- name: Install and Build
@@ -28,7 +28,7 @@ jobs:
npm install
npx honkit build
- name: Upload artifact
- uses: actions/upload-pages-artifact@v1
+ uses: actions/upload-pages-artifact@v3
with:
path: _book
@@ -44,4 +44,4 @@ jobs:
steps:
- name: Deploy to GitHub Pages
id: deployment
- uses: actions/deploy-pages@v2
+ uses: actions/deploy-pages@v4
diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
index 2be577d7fd1..d70f6bad896 100644
--- a/.github/workflows/test.yml
+++ b/.github/workflows/test.yml
@@ -7,7 +7,7 @@ jobs:
runs-on: ubuntu-latest
steps:
- name: Checkout
- uses: actions/checkout@v2
+ uses: actions/checkout@v4
with:
persist-credentials: false
From d8cf43268d6d3d515d80bd1c41280927262523c5 Mon Sep 17 00:00:00 2001
From: Zahid Kizmaz
Date: Sun, 28 Apr 2024 11:14:38 +0200
Subject: [PATCH 25/70] 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

-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 26/70] 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 6a28a7d48191bc7bdc035325533b90d067fc7616 Mon Sep 17 00:00:00 2001
From: Anna Makarudze
Date: Sat, 4 May 2024 02:50:19 +0200
Subject: [PATCH 27/70] Add survey link to sidebar ads
---
book.json | 14 ++++++++++----
1 file changed, 10 insertions(+), 4 deletions(-)
diff --git a/book.json b/book.json
index 9ccdbbd8103..a58c47753d5 100644
--- a/book.json
+++ b/book.json
@@ -44,9 +44,9 @@
"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!"
+ "url": "https://surveys.jetbrains.com/s3/w-django-girls-survey-2024",
+ "description": "💖 Celebrate 10 years with us. Fill our survey! ✨",
+ "btnText": "Fill in now!"
},
{
"imageUrl": "https://static.djangoproject.com/img/logos/django-logo-negative.png",
@@ -65,7 +65,7 @@
"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/",
@@ -84,6 +84,12 @@
"description": "💖 Host, run, and code Python in the cloud! ✨",
"btnText": "Learn more! "
},
+ {
+ "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://djangogirls.org/static/img/global/donate/tshirt.jpg",
"url": "https://djangogirls.org/en/contact/",
From 2e461459ac371104e0d454a0d73090f69d2de5d6 Mon Sep 17 00:00:00 2001
From: Ewoud Kohl van Wijngaarden
Date: Sat, 18 May 2024 10:11:22 +0200
Subject: [PATCH 28/70] Remove Runcode instructions
Runcode no longer offers a free tier, so it's best to avoid this.
---
en/SUMMARY.md | 1 -
en/cloud_development_setup/README.md | 5 --
en/cloud_development_setup/instructions.md | 85 -------------------
en/code_editor/README.md | 2 -
en/django_installation/README.md | 2 -
en/django_start_project/README.md | 7 --
en/installation/README.md | 20 +----
en/intro_to_command_line/open_instructions.md | 9 --
en/python_installation/README.md | 2 -
9 files changed, 1 insertion(+), 132 deletions(-)
delete mode 100644 en/cloud_development_setup/README.md
delete mode 100644 en/cloud_development_setup/instructions.md
diff --git a/en/SUMMARY.md b/en/SUMMARY.md
index 453c0d15647..f90bbb71c61 100644
--- a/en/SUMMARY.md
+++ b/en/SUMMARY.md
@@ -2,7 +2,6 @@
* [Introduction](README.md)
* [Installation](installation/README.md)
- * [Installation (RunCode Cloud)](cloud_development_setup/README.md)
* [Installation (Chromebook)](chromebook_setup/README.md)
* [Installation (OS X/Windows/Linux)](installation/README.md#osx-windows-linux)
* [Command Line](installation/README.md#intro-command-line)
diff --git a/en/cloud_development_setup/README.md b/en/cloud_development_setup/README.md
deleted file mode 100644
index 6ac43a58741..00000000000
--- a/en/cloud_development_setup/README.md
+++ /dev/null
@@ -1,5 +0,0 @@
-# RunCode Cloud Environment setup
-
-> **Note** If you already worked through the [installation steps](../installation/README.md), you do not need to also complete the RunCode Cloud Environment setup. Please skip straight to [Introduction to Python](../python_introduction/README.md).
-
-{% include "/cloud_development_setup/instructions.md" %}
\ No newline at end of file
diff --git a/en/cloud_development_setup/instructions.md b/en/cloud_development_setup/instructions.md
deleted file mode 100644
index 9c3f4abd3bb..00000000000
--- a/en/cloud_development_setup/instructions.md
+++ /dev/null
@@ -1,85 +0,0 @@
-If you are using RunCode Cloud development environment, your installation experience will be a little different. You can ignore the rest of the installation instructions as you do not need to install anything locally, you just need to create three online accounts.
-
-## Create a GitHub account
-Go to [GitHub.com](https://github.com/) and sign up for a new, free user account.Skip this step if you already did
-this in the previous step so you could sign up for RunCode.
-
-## Create a RunCode account
-Go to [RunCode.io](https://runcode.io/) and sign up for a new, free user account. You need to have a
-[Google.com](https://www.google.com/intl/en-GB/gmail/about/) account or [GitHub.com](https://github.com/)
-which you can sign up with.
-
-## Create a PythonAnywhere account {#pythonanywhere-account}
-{% include "/deploy/signup_pythonanywhere.md" %}
-
-## Command Line
-To open the Ubuntu terminal on RunCode, go to Workspaces → New Workspace → Blank, and select the “Tiny” Workspace Type. After waiting for it to start, this will open a new Visual Studio Code workspace which has an Ubuntu terminal in the bottom pane.
-
-Ubuntu is a version of Linux so for all command line instructions later in the tutorial you can follow Linux instructions.
-
-## Virtual Environment
-Before we install Django we will get you to install an extremely useful tool to help keep your coding environment tidy on your computer. It's possible to skip this step, but it's highly recommended. Starting with the best possible setup will save you a lot of trouble in the future!
-
-So, let's create a **virtual environment** (also called a *virtualenv*). Virtualenv will isolate your Python/Django setup on a per-project basis. This means that any changes you make to one website won't affect any others you're also developing. Neat, right?
-
-All you need to do is find a directory in which you want to create the `virtualenv`; your home directory, for example. On Windows, it might look like `C:\Users\Name\` (where `Name` is the name of your login).
-
-For this tutorial we will be using a new directory `djangogirls` from your home directory:
-
-{% filename %}command-line{% endfilename %}
-```
-$ mkdir djangogirls
-$ cd djangogirls
-```
-
-We will make a virtualenv called `myvenv` by running `python3 -m venv myvenv`.
-It will look like this:
-
-{% filename %}command-line{% endfilename %}
-```
-$ python3 -m venv myvenv
-```
-
-`myvenv` is the name of your `virtualenv`. You can use any other name, but stick to lowercase and use no spaces. It is also a good idea to keep the name short as you'll be referencing it a lot!
-
-## Working with a Virtual Environment
->Start your virtual environment by running:
->```
->$ source myvenv/bin/activate
->```
-
-Remember to replace `myvenv` with your chosen `virtualenv` name!
-
-### Installing packages with requirements
-
-A requirements file keeps a list of dependencies to be installed using
-`pip install`:
-
-First create a `requirements.txt` file inside of the `djangogirls/` folder, using the code editor that you installed earlier. You do this by opening a new file in the code editor and then saving it as `requirements.txt` in the `djangogirls/` folder. Your directory will look like this:
-
-```
-djangogirls
-├── myvenv
-│ └── ...
-└───requirements.txt
-```
-
-In your `djangogirls/requirements.txt` file you should add the following text:
-
-{% filename %}djangogirls/requirements.txt{% endfilename %}
-```
-Django~={{ book.django_version }}
-```
-
-Now, run `pip install -r requirements.txt` to install Django.
-
-{% filename %}command-line{% endfilename %}
-```
-(myvenv) ~$ pip install -r requirements.txt
-Collecting Django~={{ book.django_version }} (from -r requirements.txt (line 1))
- Downloading Django-{{ book.django_version }}-py3-none-any.whl (7.9MB)
-Installing collected packages: Django
-Successfully installed Django-{{ book.django_version }}
-```
-
-That's it! You're now (finally) ready to create a Django application!
\ No newline at end of file
diff --git a/en/code_editor/README.md b/en/code_editor/README.md
index 03694b61ca2..c1ff8c58248 100644
--- a/en/code_editor/README.md
+++ b/en/code_editor/README.md
@@ -8,6 +8,4 @@ You're about to write your first line of code, so it's time to download a code e
> **Note** You might have done this earlier in the [Installation chapter](../installation/README.md) – if so, you can skip right ahead to the next chapter!
-> **Note** If you have followed [RunCode Setup](../cloud_development_setup/README.md) you can skip this section as Visual Studio Code is pre-installed on the platform.
-
{% include "/code_editor/instructions.md" %}
diff --git a/en/django_installation/README.md b/en/django_installation/README.md
index de8abc08a06..e5e8b62d653 100644
--- a/en/django_installation/README.md
+++ b/en/django_installation/README.md
@@ -2,8 +2,6 @@
> **Note** If you're using a Chromebook, skip this chapter and make sure you follow the [Chromebook Setup](../chromebook_setup/README.md) instructions.
-> **Note** If you're using RunCode, skip this chapter and make sure you follow the [RunCode Setup](../cloud_development_setup/README.md) instructions.
-
> **Note** If you already worked through the [installation steps](../installation/README.md) then you've already done this – you can go straight to the next chapter!
{% include "/django_installation/instructions.md" %}
diff --git a/en/django_start_project/README.md b/en/django_start_project/README.md
index ce1ef96ca0c..8ecb4e1bbd5 100644
--- a/en/django_start_project/README.md
+++ b/en/django_start_project/README.md
@@ -252,13 +252,6 @@ or on Glitch:
https://name-of-your-glitch-project.glitch.me
```
-If you are using RunCode cloud platform, the URL will look something like this:
-`https://8000-soft-limit-18855079.eu-ws4.runcode.io/`. To view your own instance, the URL will be like:
-
-{% filename %}browser{% endfilename %}
-```
-https://8000-the-name-of-your-runcode-instance.eu-ws4.runcode.io/
-```
You can open this in another browser window and you should see the Django install worked page.
Congratulations! You've just created your first website and run it using a web server! Isn't that awesome?
diff --git a/en/installation/README.md b/en/installation/README.md
index 41c8e7b74a5..6546ba6c28e 100644
--- a/en/installation/README.md
+++ b/en/installation/README.md
@@ -17,22 +17,6 @@ If you are attending one of the [Django Girls events](https://djangogirls.org/ev
In this tutorial you will be building a blog. In order to do that, as you go through the tutorial you'll be instructed on how to
install various software on your computer and set up some online accounts as needed (if you are using local desktop environment) or instructed on how to create online accounts only (if you are using cloud development). This page gathers all of the installation and sign-up instructions in one place (which is useful for some workshop formats).
-# Cloud Development
-In this tutorial, the cloud development platform we will be using will be [RunCode](https://runcode.io/). RunCode is a cloud development environment which people can use without the need to install Python, Django and Visual Studio Code editor locally on their machines. This cloud environment enables anyone to work from any device that has an internet connection, including cellphones, tablets, laptop or desktop.
-
-This removes the need for you to install packages on a borrowed laptop or the need for you to own a laptop to attend the workshop or follow this tutorial from home as you only need to set up three online accounts. This will also save you time required for setting up your development environment. You can always do the [installation](installation/README.md#command-line) later on as a follow-up after finishing the tutorial. However, loading the development environment requires good and fast internet for this solution to work for you.
-
-> **Note** There are sections of this tutorial which depend on the platform you are working on. If you follow the local installation steps for Windows, Linux, OS X or Chromebook, you will need to follow instructions for your operating system. If you follow RunCode Cloud Environment setup instructions, then you will need to follow instructions for RunCode development environment. Where no specific instructions are provided for RunCode Cloud Environment, follow the Linux instructions as RunCode runs on Ubuntu Linux.
-
-
-# RunCode Cloud Development Setup
-To set up RunCode Cloud development, follow the instructions below:
-
-
-{% include "/cloud_development_setup/instructions.md" %}
-
-
# Chromebook Installation
To set up your Chromebook, follow the instructions below:
@@ -43,9 +27,7 @@ data-id="chromebook_setup" data-collapse=true ces-->
# OS X, Windows, Linux Installation {#osx-windows-linux}
-> __NOTE:__ You can skip right over this section if you have followed [RunCode Cloud Development](cloud_development_setup/README.md) or [ChromeBook](chromebook_setup/README.md) installation steps.
-
-If you are not using RunCode or Chromebook, your experience will be a little different as you need to download and install some software locally as well as set up online accounts.
+If you are not using a Chromebook, your experience will be a little different as you need to download and install some software locally as well as set up online accounts.
To install software on your machine, follow the instructions below:
diff --git a/en/intro_to_command_line/open_instructions.md b/en/intro_to_command_line/open_instructions.md
index 0bfede71549..bc229c56b10 100644
--- a/en/intro_to_command_line/open_instructions.md
+++ b/en/intro_to_command_line/open_instructions.md
@@ -25,12 +25,3 @@ Go to Applications → Utilities → Terminal.
It's probably under Applications → Accessories → Terminal, or Applications → System → Terminal, but that may depend on your system. If it's not there, you can try to Google it. :)
-
-
-> **NOTE** If you followed [RunCode setup instructions](../cloud_development_setup/README.md) follow these steps to open command line.
-
-If you already created a Workspace on RunCode, access it again from the Dashobard. To open a new workspace with the the Ubuntu terminal on RunCode, go to Workspaces → New Workspace → Blank, and select the “Tiny” Workspace Type. This will open a new Visual Studio Code workspace which has an Ubuntu terminal in the bottom pane.
-
-Ubuntu is a version of Linux so from now on you can follow Linux instructions.
-
-
\ No newline at end of file
diff --git a/en/python_installation/README.md b/en/python_installation/README.md
index d03e285e533..c2d343ec52b 100644
--- a/en/python_installation/README.md
+++ b/en/python_installation/README.md
@@ -12,7 +12,5 @@ Python originated in the late 1980s and its main goal is to be readable by human
> **Note** If you already worked through the [installation steps](../installation/README.md), there's no need to do this again – you can skip straight ahead to the next chapter!
-> **Note** If you're using [RunCode cloud environment](../cloud_development_setup/README.md), you do not need to install Python as it is pre-installed on their platform so you can skip straight ahead to the next chapter!
-
{% include "/python_installation/instructions.md" %}
From 1e2dac4b75b0f40bbabd9f300ad9467e09a867ef Mon Sep 17 00:00:00 2001
From: Julian Swagemakers
Date: Sat, 27 Apr 2024 16:20:33 +0200
Subject: [PATCH 29/70] Fix link to CONTRIBUTING
The contributing guidelines are located in the main README.md and not in
a separate file. This will align the German translation with the English
one.
---
de/README.md | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/de/README.md b/de/README.md
index 517f362d1bb..db87ba0c460 100644
--- a/de/README.md
+++ b/de/README.md
@@ -40,7 +40,7 @@ In jedem Kapitel, das bereits mit Video unterstützt wird, gibt es einen Link au
## Über uns und wie du mithelfen kannst
-Dieses Tutorial wird von [DjangoGirls](https://djangogirls.org/) betreut. Solltest du Fehler finden oder das Tutorial aktualisieren wollen, dann folge den [Richtlinien zum Mitarbeiten](https://github.com/DjangoGirls/tutorial/blob/master/CONTRIBUTING.md).
+Dieses Tutorial wird von [DjangoGirls](https://djangogirls.org/) betreut. Solltest du Fehler finden oder das Tutorial aktualisieren wollen, dann folge den [Richtlinien zum Mitarbeiten](https://github.com/DjangoGirls/tutorial/blob/master/README.md).
## Möchtest du uns helfen, das Tutorial in andere Sprachen zu übersetzen?
From ab6985b434fdedd3c9ad2d7c62e755ebf82930b0 Mon Sep 17 00:00:00 2001
From: Julian Swagemakers
Date: Sat, 27 Apr 2024 16:24:29 +0200
Subject: [PATCH 30/70] Fix broken links due to html reference
This will replace the wrong reference to `.html` files with `.md` files.
The static page generator will take care of correctly replacing the file
extensions while generating the page.
---
fr/python_introduction/README.md | 2 +-
pt/dynamic_data_in_templates/README.md | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/fr/python_introduction/README.md b/fr/python_introduction/README.md
index 559d3a226e6..a3872b18ec8 100755
--- a/fr/python_introduction/README.md
+++ b/fr/python_introduction/README.md
@@ -10,7 +10,7 @@ Allons écrire du code !
> Pour les lecteurs à la maison: cette partie est couverte dans la vidéo [Python Basics: Integers, Strings, Lists, Variables and Errors](https://www.youtube.com/watch?v=MO63L4s-20U) .
-Pour commencer à jouer avec Python, nous avons besoin d'ouvrir une *ligne de commande* sur votre ordinateur. Normalement, vous savez déjà comment le faire – vous l'avez appris dans le chapitre [Introduction à la ligne de commande](/intro_to_command_line/README. html).
+Pour commencer à jouer avec Python, nous avons besoin d'ouvrir une *ligne de commande* sur votre ordinateur. Normalement, vous savez déjà comment le faire – vous l'avez appris dans le chapitre [Introduction à la ligne de commande](../intro_to_command_line/README.md).
Dès que vous êtes prête, suivez les instructions suivantes.
diff --git a/pt/dynamic_data_in_templates/README.md b/pt/dynamic_data_in_templates/README.md
index 57449e42d20..6ae56ba438d 100755
--- a/pt/dynamic_data_in_templates/README.md
+++ b/pt/dynamic_data_in_templates/README.md
@@ -32,7 +32,7 @@ E o que vem agora? Para pegar os posts reais do modelo `Post`, precisamos de uma
## QuerySet
-Você já deve estar familiarizada com o modo que os QuerySets funcionam. Nós conversamos sobre isso no [capítulo QuerySets e ORM do Django](/django_orm/README. html).