Commit dd4ec578488d78e015f06a7374ad6f826971c04c
1 parent
82165370
Exists in
master
and in
3 other branches
language selector working properly
Showing
3 changed files
with
9 additions
and
7 deletions
Show diff stats
amadeus/static/js/main.js
| @@ -30,7 +30,7 @@ $(function () { | @@ -30,7 +30,7 @@ $(function () { | ||
| 30 | var change_language = { | 30 | var change_language = { |
| 31 | post: function(url, language){ | 31 | post: function(url, language){ |
| 32 | $.post(url, language ,function(data){ | 32 | $.post(url, language ,function(data){ |
| 33 | - console.log(data); | 33 | + window.location.href= window.location.href; |
| 34 | }); | 34 | }); |
| 35 | } | 35 | } |
| 36 | } | 36 | } |
amadeus/templates/base.html
| @@ -106,13 +106,13 @@ | @@ -106,13 +106,13 @@ | ||
| 106 | </a> | 106 | </a> |
| 107 | <ul class="dropdown-menu"> | 107 | <ul class="dropdown-menu"> |
| 108 | <li > | 108 | <li > |
| 109 | - <a href="#" class="language-item"> | 109 | + <a class="language-item" value="pt-br"> |
| 110 | <img src="{% static "img/brazilicon.png" %}" /> | 110 | <img src="{% static "img/brazilicon.png" %}" /> |
| 111 | <span>{% trans "pt_BR" %}</span> | 111 | <span>{% trans "pt_BR" %}</span> |
| 112 | </a> | 112 | </a> |
| 113 | </li> | 113 | </li> |
| 114 | <li> | 114 | <li> |
| 115 | - <a href="#" class="language-item"> | 115 | + <a class="language-item" value="en"> |
| 116 | <img src="{% static "img/euaicon.png" %}" /> | 116 | <img src="{% static "img/euaicon.png" %}" /> |
| 117 | <span>{% trans "EN" %}</span> | 117 | <span>{% trans "EN" %}</span> |
| 118 | </a> | 118 | </a> |
| @@ -273,8 +273,8 @@ | @@ -273,8 +273,8 @@ | ||
| 273 | 273 | ||
| 274 | <script> | 274 | <script> |
| 275 | $(".language-item").click(function(event) { | 275 | $(".language-item").click(function(event) { |
| 276 | - | ||
| 277 | - change_language.post("{% url 'set_language' %}", ); | 276 | + |
| 277 | + change_language.post("{% url 'set_language' %}", {'language': $(this)[0].attributes[1].value, next: "{% url 'users:login' %}", csrfmiddlewaretoken: '{{ csrf_token }}' } ); | ||
| 278 | 278 | ||
| 279 | }); | 279 | }); |
| 280 | </script> | 280 | </script> |
users/templates/users/login.html
| @@ -85,13 +85,13 @@ | @@ -85,13 +85,13 @@ | ||
| 85 | </a> | 85 | </a> |
| 86 | <ul class="dropdown-menu"> | 86 | <ul class="dropdown-menu"> |
| 87 | <li class="active"> | 87 | <li class="active"> |
| 88 | - <a href="#" class="language-item" value="pt_BR"> | 88 | + <a class="language-item" value-lang="pt-br"> |
| 89 | <img src="{% static "img/brazilicon.png" %}" /> | 89 | <img src="{% static "img/brazilicon.png" %}" /> |
| 90 | <span>{% trans "pt_BR" %}</span> | 90 | <span>{% trans "pt_BR" %}</span> |
| 91 | </a> | 91 | </a> |
| 92 | </li> | 92 | </li> |
| 93 | <li > | 93 | <li > |
| 94 | - <a href="#" class="language-item" value="EN"> | 94 | + <a class="language-item" value-lang="en"> |
| 95 | <img src="{% static "img/euaicon.png" %}" /> | 95 | <img src="{% static "img/euaicon.png" %}" /> |
| 96 | <span>{% trans "EN" %}</span> | 96 | <span>{% trans "EN" %}</span> |
| 97 | </a> | 97 | </a> |
| @@ -112,6 +112,8 @@ | @@ -112,6 +112,8 @@ | ||
| 112 | </div> | 112 | </div> |
| 113 | </div> | 113 | </div> |
| 114 | </div> | 114 | </div> |
| 115 | + | ||
| 116 | + | ||
| 115 | {% endblock%} | 117 | {% endblock%} |
| 116 | 118 | ||
| 117 | {% block footer %} | 119 | {% block footer %} |