Skip to content
GitLab
Projects
Groups
Snippets
Help
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Open sidebar
AStA
Gremientransparenz
Commits
7a2e377b
Commit
7a2e377b
authored
Jun 01, 2022
by
Felix Schlösser / TinTin
Browse files
added language switcher
parent
ee99d522
Pipeline
#147331
failed with stages
in 14 seconds
Changes
8
Pipelines
1
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
1009 additions
and
275 deletions
+1009
-275
config/settings/base.py
config/settings/base.py
+8
-7
config/settings/local.py
config/settings/local.py
+5
-2
config/urls.py
config/urls.py
+0
-2
locale/en/LC_MESSAGES/django.po
locale/en/LC_MESSAGES/django.po
+977
-263
package-lock.json
package-lock.json
+17
-0
package.json
package.json
+1
-0
requirements/base.txt
requirements/base.txt
+0
-1
requirements/local.txt
requirements/local.txt
+1
-0
No files found.
config/settings/base.py
View file @
7a2e377b
...
...
@@ -74,7 +74,7 @@ DJANGO_APPS = [
"django.contrib.sites"
,
"django.contrib.messages"
,
"django.contrib.staticfiles"
,
#
"django.contrib.humanize", # Handy template tags
"django.contrib.humanize"
,
# Handy template tags
"django.contrib.admin"
,
"django.forms"
,
]
...
...
@@ -85,7 +85,6 @@ THIRD_PARTY_APPS = [
"taggit"
,
"djmoney"
,
"modeltranslation"
,
"rosetta"
,
"django_hosts"
,
"widget_tweaks"
,
]
...
...
@@ -94,7 +93,7 @@ LOCAL_APPS = [
"committee_transparency.motions"
,
"committee_transparency.meetings"
,
"committee_transparency.decisions"
,
"committee_transparency.
people
"
,
"committee_transparency.
users
"
,
# Your stuff: custom apps go here
]
# https://docs.djangoproject.com/en/dev/ref/settings/#installed-apps
...
...
@@ -112,11 +111,13 @@ AUTHENTICATION_BACKENDS = [
"django.contrib.auth.backends.ModelBackend"
,
]
# https://docs.djangoproject.com/en/dev/ref/settings/#auth-user-model
#AUTH_USER_MODEL = "users.User"
# https://docs.djangoproject.com/en/dev/ref/settings/#login-redirect-url
LOGIN_REDIRECT_URL
=
"users:redirect"
AUTH_USER_MODEL
=
"users.User"
# https://docs.djangoproject.com/en/dev/ref/settings/#login-url
LOGIN_URL
=
"account_login"
LOGIN_URL
=
"admin:index"
# https://docs.djangoproject.com/en/dev/ref/settings/#login-redirect-url
LOGIN_REDIRECT_URL
=
"/"
# https://docs.djangoproject.com/en/dev/ref/settings/#login-redirect-url-failure
LOGIN_REDIRECT_URL_FAILURE
=
"/"
# PASSWORDS
# ------------------------------------------------------------------------------
...
...
config/settings/local.py
View file @
7a2e377b
...
...
@@ -17,7 +17,9 @@ ALLOWED_HOSTS = ["localhost",
"antrag.localhost"
,
"beschluesse.localhost"
,
"sitzung.localhost"
,
"0.0.0.0"
,
"127.0.0.1"
]
"0.0.0.0"
,
"127.0.0.1"
,
"192.168.2.1"
,
"antrag.192.168.2.1"
]
# CACHES
# ------------------------------------------------------------------------------
...
...
@@ -45,7 +47,8 @@ INSTALLED_APPS = ["whitenoise.runserver_nostatic"] + INSTALLED_APPS # noqa F405
# django-debug-toolbar
# ------------------------------------------------------------------------------
# https://django-debug-toolbar.readthedocs.io/en/latest/installation.html#prerequisites
INSTALLED_APPS
+=
[
"debug_toolbar"
]
# noqa F405
INSTALLED_APPS
+=
[
"debug_toolbar"
,
"rosetta"
]
# noqa F405
# https://django-debug-toolbar.readthedocs.io/en/latest/installation.html#middleware
MIDDLEWARE
+=
[
"debug_toolbar.middleware.DebugToolbarMiddleware"
]
# noqa F405
# https://django-debug-toolbar.readthedocs.io/en/latest/configuration.html#debug-toolbar-config
...
...
config/urls.py
View file @
7a2e377b
...
...
@@ -15,8 +15,6 @@ urlpatterns = [
),
# Django Admin, use {% url 'admin:index' %}
path
(
settings
.
ADMIN_URL
,
admin
.
site
.
urls
),
# User management
path
(
'accounts/'
,
include
(
'django.contrib.auth.urls'
),
name
=
'account'
),
# Your stuff: custom urls includes go here
]
+
static
(
settings
.
MEDIA_URL
,
document_root
=
settings
.
MEDIA_ROOT
)
...
...
locale/en/LC_MESSAGES/django.po
View file @
7a2e377b
This diff is collapsed.
Click to expand it.
package-lock.json
View file @
7a2e377b
...
...
@@ -7,6 +7,7 @@
"name"
:
"committee-transparency"
,
"dependencies"
:
{
"bulma"
:
"0.9.4"
,
"bulma-checkradio"
:
"^2.1.3"
,
"node-sass"
:
"7.0.1"
}
},
...
...
@@ -314,6 +315,14 @@
"resolved"
:
"https://registry.npmjs.org/bulma/-/bulma-0.9.4.tgz"
,
"integrity"
:
"sha512-86FlT5+1GrsgKbPLRRY7cGDg8fsJiP/jzTqXXVqiUZZ2aZT8uemEOHlU1CDU+TxklPEZ11HZNNWclRBBecP4CQ=="
},
"node_modules/bulma-checkradio"
:
{
"version"
:
"2.1.3"
,
"resolved"
:
"https://registry.npmjs.org/bulma-checkradio/-/bulma-checkradio-2.1.3.tgz"
,
"integrity"
:
"sha512-8OmZ7PURyftNLGXSTNAYNTJHIe0OkoH/8z9iWfSXGxiv3AlrKneMtiVpBKofXsvc9ZHBUI1YjefiW5WFhgFgAQ=="
,
"dependencies"
:
{
"bulma"
:
"^0.9.3"
}
},
"node_modules/cacache"
:
{
"version"
:
"15.3.0"
,
"resolved"
:
"https://registry.npmjs.org/cacache/-/cacache-15.3.0.tgz"
,
...
...
@@ -2591,6 +2600,14 @@
"resolved"
:
"https://registry.npmjs.org/bulma/-/bulma-0.9.4.tgz"
,
"integrity"
:
"sha512-86FlT5+1GrsgKbPLRRY7cGDg8fsJiP/jzTqXXVqiUZZ2aZT8uemEOHlU1CDU+TxklPEZ11HZNNWclRBBecP4CQ=="
},
"bulma-checkradio"
:
{
"version"
:
"2.1.3"
,
"resolved"
:
"https://registry.npmjs.org/bulma-checkradio/-/bulma-checkradio-2.1.3.tgz"
,
"integrity"
:
"sha512-8OmZ7PURyftNLGXSTNAYNTJHIe0OkoH/8z9iWfSXGxiv3AlrKneMtiVpBKofXsvc9ZHBUI1YjefiW5WFhgFgAQ=="
,
"requires"
:
{
"bulma"
:
"^0.9.3"
}
},
"cacache"
:
{
"version"
:
"15.3.0"
,
"resolved"
:
"https://registry.npmjs.org/cacache/-/cacache-15.3.0.tgz"
,
...
...
package.json
View file @
7a2e377b
...
...
@@ -8,6 +8,7 @@
},
"dependencies"
:
{
"
bulma
"
:
"
0.9.4
"
,
"
bulma-checkradio
"
:
"
^2.1.3
"
,
"
node-sass
"
:
"
7.0.1
"
}
}
requirements/base.txt
View file @
7a2e377b
...
...
@@ -13,7 +13,6 @@ django-ninja==0.17.0 # https://github.com/vitalik/django-ninja
django-taggit==3.0.0 # https://github.com/jazzband/django-taggit
django-modeltranslation==0.17.7 # https://github.com/deschler/django-modeltranslation
django-money==2.1.1 # https://github.com/django-money/django-money
django-rosetta==0.9.8 # https://github.com/mbi/django-rosetta/
django-hashid-field==3.3.4 # https://github.com/nshafer/django-hashid-field
django-hosts==5.1 # https://github.com/jazzband/django-hosts/
django-widget-tweaks==1.4.12 # https://github.com/jazzband/django-widget-tweaks
requirements/local.txt
View file @
7a2e377b
...
...
@@ -29,3 +29,4 @@ django-debug-toolbar==3.2.4 # https://github.com/jazzband/django-debug-toolbar
django-extensions==3.1.5 # https://github.com/django-extensions/django-extensions
django-coverage-plugin==2.0.2 # https://github.com/nedbat/django_coverage_plugin
pytest-django==4.5.2 # https://github.com/pytest-dev/pytest-django
django-rosetta==0.9.8 # https://github.com/mbi/django-rosetta/
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment