Skip to content

Commit b6ddb61

Browse files
tnirtnir
committed
Merge branch '20-update-django-base-from-2-1-to-2-2' into 'master'
Update Django base from 2.1 to 2.2 Closes #20 See merge request tnir/docs.djangoproject.jp!14
2 parents 3bfffd0 + 3b3632e commit b6ddb61

File tree

2 files changed

+32
-32
lines changed

2 files changed

+32
-32
lines changed

‎redirect.go

+1-1
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ import (
77
)
88

99
const (
10-
base = "https://docs.djangoproject.com/ja/2.1/"
10+
base = "https://docs.djangoproject.com/ja/2.2/"
1111
prefix = "/en/latest/"
1212
suffix = ".html"
1313
srcPrefix = "_sources/"

‎redirect_test.go

+31-31
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,13 @@ import (
66

77
func TestMapUrlSimple(t *testing.T) {
88
m := map[string]string{
9-
"": "https://docs.djangoproject.com/ja/2.1/",
10-
"/": "https://docs.djangoproject.com/ja/2.1/",
11-
"/favicon.ico": "https://docs.djangoproject.com/ja/2.1/",
12-
"/en/latest/faq/": "https://docs.djangoproject.com/ja/2.1/faq/",
13-
"/ja/latest/faq/": "https://docs.djangoproject.com/ja/2.1/",
14-
"/en/latest/contents.html": "https://docs.djangoproject.com/ja/2.1/contents/",
15-
"/en/latest/_sources/ref/forms/fields.txt": "https://docs.djangoproject.com/ja/2.1/ref/forms/fields/",
9+
"": "https://docs.djangoproject.com/ja/2.2/",
10+
"/": "https://docs.djangoproject.com/ja/2.2/",
11+
"/favicon.ico": "https://docs.djangoproject.com/ja/2.2/",
12+
"/en/latest/faq/": "https://docs.djangoproject.com/ja/2.2/faq/",
13+
"/ja/latest/faq/": "https://docs.djangoproject.com/ja/2.2/",
14+
"/en/latest/contents.html": "https://docs.djangoproject.com/ja/2.2/contents/",
15+
"/en/latest/_sources/ref/forms/fields.txt": "https://docs.djangoproject.com/ja/2.2/ref/forms/fields/",
1616
}
1717

1818
for k, v := range m {
@@ -24,30 +24,30 @@ func TestMapUrlSimple(t *testing.T) {
2424

2525
func TestMapUrlMigration(t *testing.T) {
2626
m := map[string]string{
27-
"/en/latest/howto/apache-auth.html": "https://docs.djangoproject.com/ja/2.1/howto/deployment/wsgi/apache-auth/",
28-
"/en/latest/howto/deployment/fastcgi.html": "https://docs.djangoproject.com/ja/2.1/internals/deprecation/#deprecation-removed-in-1-9",
29-
"/en/latest/howto/deployment/modpython.html": "https://docs.djangoproject.com/ja/2.1/internals/deprecation/#deprecation-removed-in-1-5",
30-
"/en/latest/internals/committers.html": "https://docs.djangoproject.com/ja/2.1/internals/organization/#prerogatives",
31-
"/en/latest/internals/documentation.html": "https://docs.djangoproject.com/ja/2.1/internals/contributing/writing-documentation/",
32-
"/en/latest/obsolete/": "https://docs.djangoproject.com/ja/2.1/internals/deprecation/",
33-
"/en/latest/obsolete/admin-css.html": "https://docs.djangoproject.com/ja/2.1/internals/deprecation/",
34-
"/en/latest/ref/authbackends.html": "https://docs.djangoproject.com/ja/2.1/topics/auth/customizing/#authentication-backends",
35-
"/en/latest/ref/contrib/comments/": "https://docs.djangoproject.com/ja/2.1/releases/1.8/#features-removed-in-1-8",
36-
"/en/latest/ref/contrib/comments/custom.html": "https://docs.djangoproject.com/ja/2.1/releases/1.8/#features-removed-in-1-8",
37-
"/en/latest/ref/contrib/csrf.html": "https://docs.djangoproject.com/ja/2.1/ref/csrf/",
38-
"/en/latest/ref/contrib/databrowse.html": "https://docs.djangoproject.com/ja/2.1/releases/1.4/#django-contrib-databrowse",
39-
"/en/latest/ref/contrib/formtools/": "https://docs.djangoproject.com/ja/2.1/releases/1.8/#removal-of-django-contrib-formtools",
40-
"/en/latest/ref/contrib/formtools/form-preview.html": "https://docs.djangoproject.com/ja/2.1/releases/1.8/#removal-of-django-contrib-formtools",
41-
"/en/latest/ref/contrib/localflavor.html": "https://docs.djangoproject.com/ja/2.1/internals/deprecation/#deprecation-removed-in-1-6",
42-
"/en/latest/ref/contrib/webdesign.html": "https://docs.djangoproject.com/ja/2.1/releases/1.8/#django-contrib-webdesign",
43-
"/en/latest/ref/generic-views.html": "https://docs.djangoproject.com/ja/2.1/topics/class-based-views/",
44-
"/en/latest/topics/generic-views-migration.html": "https://docs.djangoproject.com/ja/2.1/topics/class-based-views/",
45-
"/en/latest/topics/http/generic-views.html": "https://docs.djangoproject.com/ja/2.1/topics/class-based-views/",
46-
"/en/latest/topics/generic-views.html": "https://docs.djangoproject.com/ja/2.1/topics/class-based-views/",
47-
"/en/latest/releases/1.0-alpha-1.html": "https://docs.djangoproject.com/ja/2.1/releases/1.0/",
48-
"/en/latest/releases/1.0-alpha-2.html": "https://docs.djangoproject.com/ja/2.1/releases/1.0/",
49-
"/en/latest/releases/1.0-beta.html": "https://docs.djangoproject.com/ja/2.1/releases/1.0/",
50-
"/en/latest/releases/1.1-alpha-1.html": "https://docs.djangoproject.com/ja/2.1/releases/1.1/",
27+
"/en/latest/howto/apache-auth.html": "https://docs.djangoproject.com/ja/2.2/howto/deployment/wsgi/apache-auth/",
28+
"/en/latest/howto/deployment/fastcgi.html": "https://docs.djangoproject.com/ja/2.2/internals/deprecation/#deprecation-removed-in-1-9",
29+
"/en/latest/howto/deployment/modpython.html": "https://docs.djangoproject.com/ja/2.2/internals/deprecation/#deprecation-removed-in-1-5",
30+
"/en/latest/internals/committers.html": "https://docs.djangoproject.com/ja/2.2/internals/organization/#prerogatives",
31+
"/en/latest/internals/documentation.html": "https://docs.djangoproject.com/ja/2.2/internals/contributing/writing-documentation/",
32+
"/en/latest/obsolete/": "https://docs.djangoproject.com/ja/2.2/internals/deprecation/",
33+
"/en/latest/obsolete/admin-css.html": "https://docs.djangoproject.com/ja/2.2/internals/deprecation/",
34+
"/en/latest/ref/authbackends.html": "https://docs.djangoproject.com/ja/2.2/topics/auth/customizing/#authentication-backends",
35+
"/en/latest/ref/contrib/comments/": "https://docs.djangoproject.com/ja/2.2/releases/1.8/#features-removed-in-1-8",
36+
"/en/latest/ref/contrib/comments/custom.html": "https://docs.djangoproject.com/ja/2.2/releases/1.8/#features-removed-in-1-8",
37+
"/en/latest/ref/contrib/csrf.html": "https://docs.djangoproject.com/ja/2.2/ref/csrf/",
38+
"/en/latest/ref/contrib/databrowse.html": "https://docs.djangoproject.com/ja/2.2/releases/1.4/#django-contrib-databrowse",
39+
"/en/latest/ref/contrib/formtools/": "https://docs.djangoproject.com/ja/2.2/releases/1.8/#removal-of-django-contrib-formtools",
40+
"/en/latest/ref/contrib/formtools/form-preview.html": "https://docs.djangoproject.com/ja/2.2/releases/1.8/#removal-of-django-contrib-formtools",
41+
"/en/latest/ref/contrib/localflavor.html": "https://docs.djangoproject.com/ja/2.2/internals/deprecation/#deprecation-removed-in-1-6",
42+
"/en/latest/ref/contrib/webdesign.html": "https://docs.djangoproject.com/ja/2.2/releases/1.8/#django-contrib-webdesign",
43+
"/en/latest/ref/generic-views.html": "https://docs.djangoproject.com/ja/2.2/topics/class-based-views/",
44+
"/en/latest/topics/generic-views-migration.html": "https://docs.djangoproject.com/ja/2.2/topics/class-based-views/",
45+
"/en/latest/topics/http/generic-views.html": "https://docs.djangoproject.com/ja/2.2/topics/class-based-views/",
46+
"/en/latest/topics/generic-views.html": "https://docs.djangoproject.com/ja/2.2/topics/class-based-views/",
47+
"/en/latest/releases/1.0-alpha-1.html": "https://docs.djangoproject.com/ja/2.2/releases/1.0/",
48+
"/en/latest/releases/1.0-alpha-2.html": "https://docs.djangoproject.com/ja/2.2/releases/1.0/",
49+
"/en/latest/releases/1.0-beta.html": "https://docs.djangoproject.com/ja/2.2/releases/1.0/",
50+
"/en/latest/releases/1.1-alpha-1.html": "https://docs.djangoproject.com/ja/2.2/releases/1.1/",
5151
}
5252

5353
for k, v := range m {

0 commit comments

Comments
 (0)