Download as
Browse Code »

Commit 12d316e17a70ae25779bed42c76a4e51e150ce1e

Authored by felipebormann
1 parent 46d367fa
Exists in master and in 3 other branches amadeus_univasf, image-crop, refactoring

finished logic of selecting django template languages

Showing 7 changed files with 87 additions and 33 deletions   Show diff stats
amadeus/settings.py
  Diff comments   View file @12d316e
... ... @@ -15,6 +15,7 @@ import os
15 15 import dj_database_url
16 16  
17 17 from django.conf.global_settings import DATETIME_INPUT_FORMATS, DATE_INPUT_FORMATS
  18 +from django.utils.translation import ugettext_lazy as _
18 19  
19 20 db_from_ev = dj_database_url.config(conn_max_age=500)
20 21  
... ... @@ -156,6 +157,11 @@ AUTH_PASSWORD_VALIDATORS = [
156 157  
157 158 LANGUAGE_CODE = 'pt-br'
158 159  
  160 +LANGUAGES = [
  161 + ('pt-br', _('Portuguese')),
  162 + ('en', _('English')),
  163 +]
  164 +
159 165 TIME_ZONE = 'America/Recife'
160 166  
161 167 USE_I18N = True
... ...
amadeus/static/img/brazilicon.png
View file @46d367f

19.9 KB
amadeus/static/img/en.png 0 → 100644
View file @12d316e

15.9 KB
amadeus/static/img/euaicon.png
View file @46d367f

15.9 KB
amadeus/static/img/pt-br.png 0 → 100644
View file @12d316e

19.9 KB
amadeus/templates/base.html
  Diff comments   View file @12d316e
... ... @@ -96,29 +96,35 @@
96 96 <ul class="nav navbar-nav navbar-right notifications">
97 97  
98 98 <li class="dropdown language-selector-on-header {{ settings_menu_active }}" title data-original-title="{% trans 'Language Selector' %}">
99   - <a href="#" class="dropdown-toggle hidden-xs" data-toggle="dropdown" data-close-others="true">
100   - <img src="{% static "img/brazilicon.png" %}" />
101   - </a>
  99 + {% get_current_language as LANGUAGE_CODE %}
  100 + <a href="#" class="dropdown-toggle" data-toggle="dropdown" data-close-others="true">
102 101  
103   - <a href="#" class="dropdown-toggle title" data-toggle="dropdown" data-close-others="true">
104   - <i class="fa fa-cog hidden-xs" aria-hidden="true"></i>
105   - <span class="visible-xs-inline">{% trans 'Language Selector' %}</span>
  102 + {% with 'img/'|add:LANGUAGE_CODE|add:'.png' as image_static %}
  103 + <img src="{% static image_static %}" />
  104 + {% endwith %}
  105 +
106 106 </a>
107 107 <ul class="dropdown-menu">
108   - <li >
109   - <a class="language-item" value="pt-br">
110   - <img src="{% static "img/brazilicon.png" %}" />
111   - <span>{% trans "pt_BR" %}</span>
112   - </a>
113   - </li>
114   - <li>
115   - <a class="language-item" value="en">
116   - <img src="{% static "img/euaicon.png" %}" />
117   - <span>{% trans "EN" %}</span>
118   - </a>
119   - </li>
  108 +
  109 +
  110 + {% get_available_languages as LANGUAGES %}
  111 + {% get_language_info_list for LANGUAGES as languages %}
  112 + {% for language in languages %}
  113 +
  114 + <li {% if language.code == LANGUAGE_CODE %}
  115 + class="active"
  116 + {% endif %}>
  117 + <a class="language-item" value-lang="{{language.code}}">
  118 + {% with 'img/'|add:language.code|add:'.png' as image_static %}
  119 + <img src="{% static image_static %}" />
  120 + {% endwith %}
  121 + <span>{{language.code}}</span>
  122 + </a>
  123 + </li>
  124 +
  125 + {% endfor %}
120 126 </ul>
121   - </li>
  127 + </li>
122 128  
123 129  
124 130 <li id="profile-menu" class="dropdown" data-toggle="tooltip" data-placement="bottom" title data-original-title="{{ user }}">
... ...
users/templates/users/login.html
  Diff comments   View file @12d316e
... ... @@ -80,22 +80,33 @@
80 80 <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12 text-right forgotPassword">
81 81 <a class="pull-right" href="{% url 'users:forgot_pass' %}">{% trans 'Forgot your password?' %}</a>
82 82 <li class="dropdown language-selector pull-right ">
  83 + {% get_current_language as LANGUAGE_CODE %}
83 84 <a href="#" class="dropdown-toggle" data-toggle="dropdown" data-close-others="true">
84   - <img src="{% static "img/brazilicon.png" %}" />
  85 +
  86 + {% with 'img/'|add:LANGUAGE_CODE|add:'.png' as image_static %}
  87 + <img src="{% static image_static %}" />
  88 + {% endwith %}
  89 +
85 90 </a>
86 91 <ul class="dropdown-menu">
87   - <li class="active">
88   - <a class="language-item" value-lang="pt-br">
89   - <img src="{% static "img/brazilicon.png" %}" />
90   - <span>{% trans "pt_BR" %}</span>
91   - </a>
92   - </li>
93   - <li >
94   - <a class="language-item" value-lang="en">
95   - <img src="{% static "img/euaicon.png" %}" />
96   - <span>{% trans "EN" %}</span>
97   - </a>
98   - </li>
  92 +
  93 +
  94 + {% get_available_languages as LANGUAGES %}
  95 + {% get_language_info_list for LANGUAGES as languages %}
  96 + {% for language in languages %}
  97 +
  98 + <li {% if language.code == LANGUAGE_CODE %}
  99 + class="active"
  100 + {% endif %}>
  101 + <a class="language-item" value-lang="{{language.code}}">
  102 + {% with 'img/'|add:language.code|add:'.png' as image_static %}
  103 + <img src="{% static image_static %}" />
  104 + {% endwith %}
  105 + <span>{{language.code}}</span>
  106 + </a>
  107 + </li>
  108 +
  109 + {% endfor %}
99 110 </ul>
100 111 </li>
101 112 </div>
... ... @@ -104,6 +115,37 @@
104 115 <div class="col-md-12 col-lg-12 col-sm-12 col-xs-12">
105 116 <div class="col-lg-12 col-md-12 col-sm-12 col-xs-12 text-center forgotPassword">
106 117 <a href="{% url 'users:forgot_pass' %}">{% trans 'Forgot your password?' %}</a>
  118 +
  119 + <li class="dropdown language-selector pull-right ">
  120 + {% get_current_language as LANGUAGE_CODE %}
  121 + <a href="#" class="dropdown-toggle" data-toggle="dropdown" data-close-others="true">
  122 +
  123 + {% with 'img/'|add:LANGUAGE_CODE|add:'.png' as image_static %}
  124 + <img src="{% static image_static %}" />
  125 + {% endwith %}
  126 +
  127 + </a>
  128 + <ul class="dropdown-menu">
  129 +
  130 +
  131 + {% get_available_languages as LANGUAGES %}
  132 + {% get_language_info_list for LANGUAGES as languages %}
  133 + {% for language in languages %}
  134 +
  135 + <li {% if language.code == LANGUAGE_CODE %}
  136 + class="active"
  137 + {% endif %}>
  138 + <a class="language-item" value-lang="{{language.code}}">
  139 + {% with 'img/'|add:language.code|add:'.png' as image_static %}
  140 + <img src="{% static image_static %}" />
  141 + {% endwith %}
  142 + <span>{{language.code}}</span>
  143 + </a>
  144 + </li>
  145 +
  146 + {% endfor %}
  147 + </ul>
  148 + </li>
107 149 </div>
108 150 </div>
109 151 {% endif %}
... ... @@ -113,7 +155,7 @@
113 155 </div>
114 156 </div>
115 157  
116   -
  158 +
117 159 {% endblock%}
118 160  
119 161 {% block footer %}
... ...