Merge pull request #1529 from matmair/matmair/issue1527

per session user-language settings

InvenTree/InvenTree/urls.py

@@ -39,7 +39,7 @@ from rest_framework.documentation import include_docs_urls
 
 from .views import IndexView, SearchView, DatabaseStatsView
 from .views import SettingsView, EditUserView, SetPasswordView
-from .views import ColorThemeSelectView, SettingCategorySelectView
+from .views import AppearanceSelectView, SettingCategorySelectView
 from .views import DynamicJsView
 
 from common.views import SettingEdit
@@ -79,7 +79,8 @@ apipatterns = [
 settings_urls = [
 
     url(r'^user/?', SettingsView.as_view(template_name='InvenTree/settings/user.html'), name='settings-user'),
-    url(r'^theme/?', ColorThemeSelectView.as_view(), name='settings-theme'),
+    url(r'^appearance/?', AppearanceSelectView.as_view(), name='settings-appearance'),
+    url(r'^i18n/?', include('django.conf.urls.i18n')),
    
     url(r'^global/?', SettingsView.as_view(template_name='InvenTree/settings/global.html'), name='settings-global'),
     url(r'^report/?', SettingsView.as_view(template_name='InvenTree/settings/report.html'), name='settings-report'),

InvenTree/InvenTree/views.py

@@ -769,12 +769,12 @@ class SettingsView(TemplateView):
         return ctx
 
 
-class ColorThemeSelectView(FormView):
+class AppearanceSelectView(FormView):
     """ View for selecting a color theme """
 
     form_class = ColorThemeSelectForm
-    success_url = reverse_lazy('settings-theme')
+    success_url = reverse_lazy('settings-appearance')
-    template_name = "InvenTree/settings/theme.html"
+    template_name = "InvenTree/settings/appearance.html"
 
     def get_user_theme(self):
         """ Get current user color theme """
@@ -788,7 +788,7 @@ class ColorThemeSelectView(FormView):
     def get_initial(self):
         """ Select current user color theme as initial choice """
 
-        initial = super(ColorThemeSelectView, self).get_initial()
+        initial = super(AppearanceSelectView, self).get_initial()
 
         user_theme = self.get_user_theme()
         if user_theme:

InvenTree/templates/InvenTree/settings/appearance.html

@@ -0,0 +1,67 @@
+{% extends "InvenTree/settings/settings.html" %}
+{% load i18n %}
+{% load inventree_extras %}
+
+{% block tabs %}
+{% include "InvenTree/settings/tabs.html" with tab='theme' %}
+{% endblock %}
+
+{% block subtitle %}
+{% trans "Theme Settings" %}
+{% endblock %}
+
+{% block settings %}
+
+<div class='row'>
+    <div class='col-sm-6'>
+        <h4>{% trans "Color Themes" %}</h4>
+    </div>
+</div>
+
+<form action="{% url 'settings-appearance' %}" method="post">
+    {% csrf_token %}
+    {% load crispy_forms_tags %}
+    {% crispy form %}
+</form>
+
+{% if invalid_color_theme %}
+    <div class="alert alert-danger alert-block" role="alert" style="display: inline-block;">
+    {% blocktrans %}
+        The CSS sheet "{{invalid_color_theme}}.css" for the currently selected color theme was not found.<br>
+        Please select another color theme :)
+    {% endblocktrans %}
+    </div>
+{% endif %}
+
+
+<div class='row'>
+    <div class='col-sm-6'>
+        <h4>{% trans "Language" %}</h4>
+    </div>
+</div>
+
+
+
+<div class="row">
+    <form action="{% url 'set_language' %}" method="post">{% csrf_token %}
+        <input name="next" type="hidden" value="{% url 'settings-appearance' %}">
+        <div class="col-sm-6" style="width: 200px;"><div id="div_id_name" class="form-group"><div class="controls ">
+            <select name="language" class="select form-control">
+                {% get_current_language as LANGUAGE_CODE %}
+                {% get_available_languages as LANGUAGES %}
+                {% get_language_info_list for LANGUAGES as languages %}
+                {% for language in languages %}
+                    <option value="{{ language.code }}"{% if language.code == LANGUAGE_CODE %} selected{% endif %}>
+                        {{ language.name_local }} ({{ language.code }})
+                    </option>
+                {% endfor %}
+            </select>
+        </div></div></div>
+        <div class="col-sm-6" style="width: auto;">
+            <input type="submit" value="{% trans 'Set Language' %}" class="btn btn btn-primary">
+        </div>
+    </form>
+</div>
+
+
+{% endblock %}

InvenTree/templates/InvenTree/settings/tabs.html

@@ -6,7 +6,7 @@
         <a href="{% url 'settings-user' %}"><span class='fas fa-user'></span> {% trans "Account" %}</a>
     </li>
     <li{% ifequal tab 'theme' %} class='active'{% endifequal %}>
-        <a href="{% url 'settings-theme' %}"><span class='fas fa-fill'></span> {% trans "Theme" %}</a>
+        <a href="{% url 'settings-appearance' %}"><span class='fas fa-fill'></span> {% trans "Appearance" %}</a>
     </li>
 </ul>
 {% if user.is_staff %}

InvenTree/templates/InvenTree/settings/theme.html

@@ -1,36 +0,0 @@
-{% extends "InvenTree/settings/settings.html" %}
-{% load i18n %}
-{% load inventree_extras %}
-
-{% block tabs %}
-{% include "InvenTree/settings/tabs.html" with tab='theme' %}
-{% endblock %}
-
-{% block subtitle %}
-{% trans "Theme Settings" %}
-{% endblock %}
-
-{% block settings %}
-
-<div class='row'>
-    <div class='col-sm-6'>
-        <h4>{% trans "Color Themes" %}</h4>
-    </div>
-</div>    
-
-<form action="{% url 'settings-theme' %}" method="post">
-    {% csrf_token %}
-    {% load crispy_forms_tags %}
-    {% crispy form %}
-</form>
-
-{% if invalid_color_theme %}
-    <div class="alert alert-danger alert-block" role="alert" style="display: inline-block;">
-    {% blocktrans %}
-        The CSS sheet "{{invalid_color_theme}}.css" for the currently selected color theme was not found.<br>
-        Please select another color theme :)
-    {% endblocktrans %}
-    </div>
-{% endif %}
-
-{% endblock %}