Skip to content
Snippets Groups Projects
Commit e218adb4 authored by Jan Hartig's avatar Jan Hartig
Browse files

Add default language configuration

parent e33ed593
Branches
No related tags found
1 merge request!4Merge new features and fixes
...@@ -26,8 +26,7 @@ def create_app(): ...@@ -26,8 +26,7 @@ def create_app():
for language in app.config["ENABLED_LOCALISATIONS"]: for language in app.config["ENABLED_LOCALISATIONS"]:
check_localisation(app.logger, app.config["LOCALISATIONS"], language) check_localisation(app.logger, app.config["LOCALISATIONS"], language)
del language
del language
app.logger.info("Localisations loaded.") app.logger.info("Localisations loaded.")
......
...@@ -3,6 +3,7 @@ UPLOAD_FOLDER = "uploads" ...@@ -3,6 +3,7 @@ UPLOAD_FOLDER = "uploads"
MAX_CONTENT_LENGTH = 10 # in GB MAX_CONTENT_LENGTH = 10 # in GB
ENABLED_LOCALISATIONS = [ "de", "en" ] ENABLED_LOCALISATIONS = [ "de", "en" ]
DEFAULT_LANGUAGE = "de"
[ CONTACT ] [ CONTACT ]
ORG = "Fun Inc." ORG = "Fun Inc."
......
...@@ -19,7 +19,7 @@ def validate_audio(_, field): ...@@ -19,7 +19,7 @@ def validate_audio(_, field):
if not has_audio: if not has_audio:
raise ValidationError("noaudiotrack") raise ValidationError("noaudiotrack")
except av.AVError as e: except av.AVError as e:
current_app.logger.error( current_app.logger.info(
"Error while checking audio of file '{}': {}".format(file.filename, str(e)) "Error while checking audio of file '{}': {}".format(file.filename, str(e))
) )
raise ValidationError("brokenfile") raise ValidationError("brokenfile")
...@@ -27,15 +27,15 @@ def validate_audio(_, field): ...@@ -27,15 +27,15 @@ def validate_audio(_, field):
class UploadForm(FlaskForm): class UploadForm(FlaskForm):
email = StringField( email = StringField(
current_app.config["LOCALISATIONS"]["email"]["label"]["de"], current_app.config["LOCALISATIONS"]["email"]["label"][current_app.config["DEFAULT_LANGUAGE"]],
validators=[InputRequired("invalidEmail"), Email("invalidEmail")], validators=[InputRequired("invalidEmail"), Email("invalidEmail")],
) )
language = SelectField( language = SelectField(
current_app.config["LOCALISATIONS"]["language"]["label"]["de"], current_app.config["LOCALISATIONS"]["language"]["label"][current_app.config["DEFAULT_LANGUAGE"]],
validators=[InputRequired("required")], validators=[InputRequired("required")],
) )
file = FileField( file = FileField(
current_app.config["LOCALISATIONS"]["file"]["label"]["de"], current_app.config["LOCALISATIONS"]["file"]["label"][current_app.config["DEFAULT_LANGUAGE"]],
validators=[ validators=[
FileRequired("nofile"), FileRequired("nofile"),
FileSize(current_app.config["MAX_CONTENT_LENGTH"]), FileSize(current_app.config["MAX_CONTENT_LENGTH"]),
......
...@@ -2,10 +2,10 @@ import json ...@@ -2,10 +2,10 @@ import json
from os import path, makedirs from os import path, makedirs
from uuid import uuid4 from uuid import uuid4
import av
from flask import current_app, render_template, abort, url_for, redirect, request, stream_with_context from flask import current_app, render_template, abort, url_for, redirect, request, stream_with_context
from forms import UploadForm from forms import UploadForm
import av
@current_app.route("/upload/<string:language>", methods=["GET", "POST"]) @current_app.route("/upload/<string:language>", methods=["GET", "POST"])
...@@ -75,7 +75,7 @@ def upload(language: str): ...@@ -75,7 +75,7 @@ def upload(language: str):
if form.email.data: if form.email.data:
form.email.data = form.email.data[:-7] form.email.data = form.email.data[:-7]
if language != "de": if language != current_app.config["DEFAULT_LANGUAGE"]:
form.email.label.text = current_app.config["LOCALISATIONS"]["email"]["label"][language] form.email.label.text = current_app.config["LOCALISATIONS"]["email"]["label"][language]
form.language.label.text = current_app.config["LOCALISATIONS"]["language"]["label"][language] form.language.label.text = current_app.config["LOCALISATIONS"]["language"]["label"][language]
form.file.label.text = current_app.config["LOCALISATIONS"]["file"]["label"][language] form.file.label.text = current_app.config["LOCALISATIONS"]["file"]["label"][language]
...@@ -86,7 +86,7 @@ def upload(language: str): ...@@ -86,7 +86,7 @@ def upload(language: str):
@current_app.route("/") @current_app.route("/")
@current_app.route("/upload/") @current_app.route("/upload/")
def default(): def default():
return redirect(url_for("upload", language="de")) return redirect(url_for("upload", language=current_app.config["DEFAULT_LANGUAGE"]))
def set_language(language): def set_language(language):
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment