auto select language

diff --git a/app/scripts/app.sh b/app/scripts/app.sh
index 4636b6cbea40c71a9c1a6f99896d9b244f827ff8..46b9b008253c20b786e926ec0133c2b1dc2d0db3 100644 (file)
--- a/app/scripts/app.sh
+++ b/app/scripts/app.sh
@@ -39,7 +39,7 @@ if [ $REINDEX = "True" ]; then
 fi
 
 # fix media access rights
-chown -R www-data:www-data $media
+chown www-data:www-data $media
 for dir in $(ls $media); do
     if [ ! $(stat -c %U $media/$dir) = 'www-data' ]; then
         chown www-data:www-data $media/$dir

diff --git a/telemeta/locale b/telemeta/locale
index e7fd56599e9e22eddf92c1063419fec6ab82e15e..ea6605ad78243d798d88f1ffc46c8f6bc507ce11 160000 (submodule)
--- a/telemeta/locale
+++ b/telemeta/locale
@@ -1 +1 @@
-Subproject commit e7fd56599e9e22eddf92c1063419fec6ab82e15e
+Subproject commit ea6605ad78243d798d88f1ffc46c8f6bc507ce11

diff --git a/telemeta/templates/telemeta/base.html b/telemeta/templates/telemeta/base.html
index c9a557f8e556fd81c94562c7ec7dcdf2945bf945..a27e05c509992d64de9a6cb5c3bde1f348c76019 100644 (file)
--- a/telemeta/templates/telemeta/base.html
+++ b/telemeta/templates/telemeta/base.html
@@ -158,17 +158,15 @@
                                 </li>
                             {% endif %}
                         </ul>
-                        <form id="formlang" action="/i18n/setlang/" method="post" style="display:inline-block;">
+                        <form id="formlang" action="/i18n/setlang/" method="post" style="display:inline-block;" onchange='this.submit();'>
                             {% csrf_token %}
                             <input name="next" type="hidden" value="{% url 'telemeta-home' %}"/>
                             <select name="language" style="color:#6a0307">
                                 {% for lang in LANGUAGES %}
-                                    <option value="{{ lang.0 }}">{{ lang.1 }}</option>
+                                    <option value="{{ lang.0 }}" {% if lang.0|slice:"2" == LANGUAGE_CODE|slice:"2" %}selected="selected"{% endif %}>{{ lang.0 }}</option>
                                 {% endfor %}
                             </select>
-                            <input type="submit" value="Ok"/>
                         </form>
-
                     {% endblock menu %}
                 </div>
             </div>