diff --git a/bazarr/api.py b/bazarr/api.py index 55605b1ad..a07ea1fd2 100644 --- a/bazarr/api.py +++ b/bazarr/api.py @@ -92,9 +92,9 @@ class Languages(Resource): def get(self): enabled = request.args.get('enabled') if enabled.lower() in ['true', '1']: - result = database.execute("SELECT * FROM table_settings_languages WHERE enabled=1") + result = database.execute("SELECT * FROM table_settings_languages WHERE enabled=1 ORDER BY name") else: - result = database.execute("SELECT * FROM table_settings_languages") + result = database.execute("SELECT * FROM table_settings_languages ORDER BY name") return jsonify(result) diff --git a/bazarr/config.py b/bazarr/config.py index b8afd85ca..68e60c259 100644 --- a/bazarr/config.py +++ b/bazarr/config.py @@ -152,6 +152,10 @@ base_url = settings.general.base_url def save_settings(settings_items): for key, value in settings_items: + if key == 'enabled_languages': + print(key) + continue + settings_keys = key.split('-') if value == 'true': diff --git a/bazarr/main.py b/bazarr/main.py index 28158caab..873f5839c 100644 --- a/bazarr/main.py +++ b/bazarr/main.py @@ -343,6 +343,12 @@ def settingssubtitles(): return render_template('settingssubtitles.html') +@app.route('/settings/languages/') +@login_required +def settingslanguages(): + return render_template('settingslanguages.html') + + @app.route('/check_update') @login_required def check_update(): diff --git a/views/_main.html b/views/_main.html index 242f9b624..cbe57e2bd 100644 --- a/views/_main.html +++ b/views/_main.html @@ -204,7 +204,7 @@
  • Sonarr
  • Radarr
  • Subtitles
    • -
  • Languages
    • +
  • Languages
  • Providers
  • Notifications
  • Scheduler
    • diff --git a/views/settingslanguages.html b/views/settingslanguages.html new file mode 100644 index 000000000..290671480 --- /dev/null +++ b/views/settingslanguages.html @@ -0,0 +1,189 @@ +{% extends '_main.html' %} + +{% block title %}Languages - Bazarr{% endblock %} + +{% block page_head %} + +{% endblock page_head %} + +{% block bcleft %} +
    + +
    +{% endblock bcleft %} + +{% block bcright %} + +{% endblock bcright %} + +{% block body %} +
    +
    +

    Subtitles languages

    +
    +
    +
    + Single Language +
    +
    + +
    +
    +
    +
    +
    + Enabled Languages +
    +
    + +
    +
    +
    + +

    Default Settings

    +
    +
    +
    + Series Default Settings +
    + +
    +
    +
    +
    +
    + Languages +
    + +
    +
    +
    +
    + Hearing-Impaired +
    + +
    +
    +
    +
    + Forced +
    + +
    +
    +
    +
    +
    + Movies Default Settings +
    + +
    +
    +
    +
    +
    + Languages +
    + +
    +
    +
    +
    + Hearing-Impaired +
    + +
    +
    +
    +
    + Forced +
    + +
    +
    +
    +
    +
    +{% endblock body %} + +{% block tail %} + +{% endblock tail %}