Skip to content

Commit a8ee992

Browse files
aniavaniav
authored
Merge branch 'master' into master
2 parents 0034eb9 + 99df332 commit a8ee992

File tree

46 files changed

+179
-153
lines changed

Some content is hidden

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

46 files changed

+179
-153
lines changed

‎cs/css/README.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,8 @@ Uděláš to tak, že vytvoříš složku s názvem `static` uvnitř aplikace bl
4545
djangogirls
4646
├── blog
4747
│ ├── migrations
48-
│ └── static
48+
│ ├── static
49+
│   └── templates
4950
└── mysite
5051
```
5152

‎cs/python_introduction/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -444,7 +444,7 @@ Už jsi někdy slyšela výraz "srovnávat jablka a hrušky"? Zkusme v Pythonu e
444444
>>> 1 > 'django'
445445
Traceback (most recent call last):
446446
File "<stdin>", line 1, in <module>
447-
TypeError: unorderable types: int() > str()
447+
TypeError: '>' not supported between instances of 'int' and 'str'
448448
```
449449

450450
Zde vidíš, že stejně jako nelze srovnávat "jablka a hrušky", Python není schopen porovnávat řetězce (`str`) a čísla (`int`). Místo toho zobrazí **TypeError** a říká nám, že tyto dva typy nelze srovnávat společně.

‎de/css/README.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,8 @@ Dies tun wir, indem wir einen Ordner namens `static` in der Blog-App erstellen:
4343
djangogirls
4444
├── blog
4545
│ ├── migrations
46-
│ └── static
46+
│ ├── static
47+
│   └── templates
4748
└── mysite
4849
```
4950

‎de/deploy/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ Jetzt ist unser Code auf PythonAnywhere, unser virtualenv ist bereit, die statis
241241

242242
Gehe zurück zum PythonAnywhere Dashboard, indem du auf das Logo klickst und klicke anschließend auf den **Web** Menüpunkt. Dort wählst du **Add a new web app** aus.
243243

244-
Nach der Bestätigung deines Domainnamens wählst du **manual configuration** (NB *nicht* die "Django"-Option) im Dialogfeld aus. Entscheide dich als Nächstes für **Python 3.4** und klicke "Next", um den Assistenten zu beenden.
244+
Nach der Bestätigung deines Domainnamens wählst du **manual configuration** (NB *nicht* die "Django"-Option) im Dialogfeld aus. Entscheide dich als Nächstes für **Python 3.5** und klicke "Next", um den Assistenten zu beenden.
245245

246246
> **Hinweis:** Versichere dich, dass du die Option "Manual configuration" ausgewählt hast und nicht "Django". Wir sind einfach zu cool für das Standard PythonAnywhere Django Setup :-)
247247

‎de/python_introduction/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -447,7 +447,7 @@ Die Redewendung "Äpfel mit Birnen zu vergleichen" hast du bestimmt schon einmal
447447
>>> 1 > 'django'
448448
Traceback (most recent call last):
449449
File "<stdin>", line 1, in <module>
450-
TypeError: unorderable types: int() > str()
450+
TypeError: '>' not supported between instances of 'int' and 'str'
451451
```
452452

453453
Unterschiedliche Dinge, hier die Datentypen Zahlen (`int`) und Strings (`str`), lassen sich auch in Python nicht miteinander vergleichen. In solch einem Fall liefert uns Python einen **TypeError** und sagt uns, dass diese zwei Datentypen nicht miteinander verglichen werden können.

‎en/css/README.md‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -46,7 +46,8 @@ We do that by creating a folder called `static` inside the blog app:
4646
djangogirls
4747
├── blog
4848
│ ├── migrations
49-
│ └── static
49+
│ ├── static
50+
│   └── templates
5051
└── mysite
5152
```
5253

@@ -106,7 +107,7 @@ Between the `<head>` and `</head>` tags, after the links to the Bootstrap CSS fi
106107
```html
107108
<link rel="stylesheet" href="{% static 'css/blog.css' %}">
108109
```
109-
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 override code in Bootstrap files.
110+
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.
110111
We just told our template where our CSS file is located.
111112

112113
Your file should now look like this:

‎en/django_views/README.md‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -21,12 +21,12 @@ Not too much stuff here yet.
2121

2222
Remember that lines starting with `#` are comments – this means that those lines won't be run by Python.
2323

24-
The simplest *view* can look like this:
24+
Let's create a *view* as the comment suggests. Add the following minimal view below it:
2525

2626
{% filename %}blog/views.py{% endfilename %}
2727
```python
2828
def post_list(request):
29-
return render(request, 'blog/post_list.html', {})
29+
return render(request, 'blog/post_list.html')
3030
```
3131

3232
As you can see, we created a function (`def`) called `post_list` that takes `request` and `return` a function `render` that will render (put together) our template `blog/post_list.html`.

‎en/python_introduction/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -503,7 +503,7 @@ Have you heard of the expression "comparing apples to oranges"? Let's try the Py
503503
>>> 1 > 'django'
504504
Traceback (most recent call last):
505505
File "<stdin>", line 1, in <module>
506-
TypeError: unorderable types: int() > str()
506+
TypeError: '>' not supported between instances of 'int' and 'str'
507507
```
508508

509509
Here you see that just like in the expression, Python is not able to compare a number (`int`) and a string (`str`).

‎es/css/README.md‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,8 @@ Esto lo conseguimos creando una carpeta llamada `static` dentro de la aplicació
4444
djangogirls
4545
├── blog
4646
│ ├── migrations
47-
│ └── static
47+
│ ├── static
48+
│   └── templates
4849
└── mysite
4950

5051

‎es/python_introduction/README.md‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,7 @@ Puedes darle a Python todos los números para comparar que quieras, y siempre te
397397
>>> 1 > 'django'
398398
Traceback (most recent call last):
399399
File "<stdin>", line 1, in <module>
400-
TypeError: unorderable types: int() > str()
400+
TypeError: '>' not supported between instances of 'int' and 'str'
401401

402402

403403
Aquí verás que al igual que en la expresión, Python no es capaz de comparar un número (`int`) y un string (`str`). En cambio, muestra un **TypeError** y nos dice que los dos tipos no se pueden comparar.

0 commit comments

Comments
 (0)