Commit ec6902858d9cfcd37541e601b96c7b989a259839

Authored by Zambom
1 parent e2879923

Adding i18n to bulletin window view

Showing 1 changed file with 105 additions and 123 deletions   Show diff stats
bulletin/templates/bulletin/window_view.html
@@ -91,103 +91,85 @@ @@ -91,103 +91,85 @@
91 {% endif %} 91 {% endif %}
92 92
93 {% autoescape off %} 93 {% autoescape off %}
94 - {{ bulletin.content }} 94 + {{ bulletin.content }}
95 {% endautoescape %} 95 {% endautoescape %}
96 96
97 <div style="padding-left: 0px;padding-right: 0px;"> 97 <div style="padding-left: 0px;padding-right: 0px;">
98 - <div align="left" style="font-size:22px; color: #878787; padding-top: 0px;">Confira as suas metas</div> 98 + <div align="left" style="font-size:22px; color: #878787; padding-top: 0px;">{% trans 'Check your goals' %}</div>
99 <hr style="height:2px; background-color:#878787; margin-top: 5px;"> 99 <hr style="height:2px; background-color:#878787; margin-top: 5px;">
100 <div class="row"> 100 <div class="row">
101 <div class="col-md-4"> 101 <div class="col-md-4">
102 - <div align="center" style="font-size:16px; color: #000; padding-botom: 10px;"><b>Metas Atingidas</b></div> 102 + <div align="center" style="font-size:16px; color: #000; padding-botom: 10px;"><b>{% trans 'Goals Reached' %}</b></div>
103 <div id="donut_chart" align="center"></div> 103 <div id="donut_chart" align="center"></div>
104 </div> 104 </div>
105 105
106 <div class="col-md-8"> 106 <div class="col-md-8">
107 - <div style="font-size:16px; text-align:left; color: #000; padding-left: 10px; "><b>Detalhamento das metas</b></div>  
108 - <hr style="height:2px; background-color:#878787;margin-top: 5px;margin-bottom: 5px;">  
109 - <table class="table table-hover">  
110 - <thead> 107 + <div style="font-size:16px; text-align:left; color: #000; padding-left: 10px; "><b>{% trans 'Goals Details' %}</b></div>
  108 + <hr style="height:2px; background-color:#878787;margin-top: 5px;margin-bottom: 5px;">
  109 + <table class="table table-hover">
  110 + <thead>
111 <tr> 111 <tr>
112 - <th style="text-align:center">Descrição</th>  
113 - <th style="width:150px; text-align:center">Recomendação </br> do(a) professor(a)</th>  
114 - <th style="text-align:center">Média da turma</th>  
115 - <th style="text-align:center">Sua meta</th>  
116 - <th style="text-align:center">Seu resultado</th> 112 + <th style="text-align:center">{% trans 'Description' %}</th>
  113 + <th style="width:150px; text-align:center">{% trans "Professor's recomendation" %}</th>
  114 + <th style="text-align:center">{% trans 'Class average' %}</th>
  115 + <th style="text-align:center">{% trans 'Your goal' %}</th>
  116 + <th style="text-align:center">{% trans 'Your result' %}</th>
117 </tr> 117 </tr>
118 </thead> 118 </thead>
119 <tbody> 119 <tbody>
120 {% for meta in metas%} 120 {% for meta in metas%}
121 <tr> 121 <tr>
122 - <th style="font-weight: normal;">{{ meta.description }}</th>  
123 - <th style="text-align:center;font-weight: normal;">{{ meta.desejada }} %</th>  
124 - <td style="text-align:center;font-weight: normal;">{{ meta.media }}%</td>  
125 - <th style="text-align:center; font-weight: normal;">{{ meta.estabelecida }}%</th> 122 + <td style="font-weight: normal;">{{ meta.description }}</td>
  123 + <td style="text-align:center;font-weight: normal;">{{ meta.desejada }} %</td>
  124 + <td style="text-align:center;font-weight: normal;">{{ meta.media }}%</td>
  125 + <td style="text-align:center; font-weight: normal;">{{ meta.estabelecida }}%</td>
126 126
127 127
128 <!-- Cor amarela --> 128 <!-- Cor amarela -->
129 {% if meta.alcancada < meta.desejada and meta.alcancada > meta.estabelecida or meta.alcancada < meta.desejada and meta.alcancada == meta.estabelecida %} 129 {% if meta.alcancada < meta.desejada and meta.alcancada > meta.estabelecida or meta.alcancada < meta.desejada and meta.alcancada == meta.estabelecida %}
130 - <th style="text-align:center;background-color:#f8b800 ; text-shadow: 1px 1px 2px #000; color:#fff; font-weight: normal;" 130 + <td style="text-align:center;background-color:#f8b800 ; text-shadow: 1px 1px 2px #000; color:#fff; font-weight: normal;"
131 data-toggle="tooltip" data-html="true" data-placement="bottom" 131 data-toggle="tooltip" data-html="true" data-placement="bottom"
132 - title="<b>Meta atingida!</b><br><br>Atenção! O seu resultado foi inferior ao recomendado pelo professor." class="grey-tooltip">  
133 - {{ meta.alcancada }}%</th>  
134 - {% endif %}  
135 -  
136 - {% if meta.alcancada > meta.desejada and meta.alcancada < meta.estabelecida or meta.alcancada == meta.desejada and meta.alcancada < meta.estabelecida %}  
137 - <th style="text-align:center;background-color:#f8b800 ; text-shadow: 1px 1px 2px #000; color:#fff; font-weight: normal;" 132 + title="{% trans "<b>Goal reached!</b><br /><br /> Atention! Your result were lower than the professor's recommendation." %}" class="grey-tooltip">
  133 + {{ meta.alcancada }}%</td>
  134 + {% elif meta.alcancada > meta.desejada and meta.alcancada < meta.estabelecida or meta.alcancada == meta.desejada and meta.alcancada < meta.estabelecida %}
  135 + <td style="text-align:center;background-color:#f8b800 ; text-shadow: 1px 1px 2px #000; color:#fff; font-weight: normal;"
138 data-toggle="tooltip" data-html="true" data-placement="bottom" 136 data-toggle="tooltip" data-html="true" data-placement="bottom"
139 - title="<b>Meta atingida!</b><br><br>Atenção! O seu resultado foi inferior a sua meta inicial." class="grey-tooltip">  
140 - {{ meta.alcancada }}%</th>  
141 - {% endif %}  
142 -  
143 - <!-- Cor amarela -->  
144 -  
145 - <!-- Cor verde -->  
146 - {% if meta.alcancada > meta.desejada and meta.alcancada > meta.estabelecida or meta.alcancada == meta.desejada and meta.alcancada > meta.estabelecida or meta.alcancada > meta.desejada and meta.alcancada == meta.estabelecida or meta.alcancada == 100 or meta.alcancada == meta.desejada and meta.alcancada == meta.estabelecida %}  
147 - <th style="text-align:center;background-color:#00d337; text-shadow: 1px 1px 2px #000; color:#fff; font-weight: normal;" 137 + title="{% trans "<b>Goal reached!</b><br /><br /> Atention! Your result were lower than your initial goal." %}" class="grey-tooltip">
  138 + {{ meta.alcancada }}%</td>
  139 + {% elif meta.alcancada > meta.desejada and meta.alcancada > meta.estabelecida or meta.alcancada == meta.desejada and meta.alcancada > meta.estabelecida or meta.alcancada > meta.desejada and meta.alcancada == meta.estabelecida or meta.alcancada == 100 or meta.alcancada == meta.desejada and meta.alcancada == meta.estabelecida %}
  140 + <td style="text-align:center;background-color:#00d337; text-shadow: 1px 1px 2px #000; color:#fff; font-weight: normal;"
148 data-toggle="tooltip" data-html="true" data-placement="bottom" 141 data-toggle="tooltip" data-html="true" data-placement="bottom"
149 - title="<b>Meta atingida!</b>" class="grey-tooltip">  
150 - {{ meta.alcancada }}%</th>  
151 - {% endif %}  
152 -  
153 - <!-- Cor verde -->  
154 -  
155 - <!-- Cor vermelha -->  
156 - {% if meta.alcancada < meta.desejada and meta.alcancada < meta.estabelecida %}  
157 - <th style="text-align:center;background-color:#ff0000; text-shadow: 1px 1px 2px #000; color:#fff; font-weight: normal;" 142 + title="{% trans "<b>Goal reached!</b>" %}" class="grey-tooltip">
  143 + {{ meta.alcancada }}%</td>
  144 + {% elif meta.alcancada < meta.desejada and meta.alcancada < meta.estabelecida %}
  145 + <td style="text-align:center;background-color:#ff0000; text-shadow: 1px 1px 2px #000; color:#fff; font-weight: normal;"
158 data-toggle="tooltip" data-html="true" data-placement="bottom" 146 data-toggle="tooltip" data-html="true" data-placement="bottom"
159 - title="<b>Meta não atingida!</b><br><br>Resultado inferior </br>a sua meta e ao recomendado pelo professor." class="grey-tooltip">  
160 - {{ meta.alcancada }}%</th> 147 + title="{% trans "<b>Goal not reached!</b><br /><br /> Result lower than your goal and the professor's recommendation." %}" class="grey-tooltip">
  148 + {{ meta.alcancada }}%</td>
161 149
162 {% endif %} 150 {% endif %}
163 - <!-- Cor vermelha -->  
164 -  
165 -  
166 </tr> 151 </tr>
167 -  
168 - {% endfor %}  
169 -  
170 - 152 + {% endfor %}
171 </tbody> 153 </tbody>
172 - </table>  
173 - <hr style="height:1px; background-color:#878787;margin-top: -20px;">  
174 - </div> 154 + </table>
  155 + <hr style="height:1px; background-color:#878787;margin-top: -20px;">
  156 + </div>
175 </div> 157 </div>
176 </div> 158 </div>
177 <div style="padding-left: 0px;padding-right: 0px;"> 159 <div style="padding-left: 0px;padding-right: 0px;">
178 - <div align="left" style="font-size:22px; color: #878787; padding-top: 25px; ">Indicadores relevantes para o seu desempenho</div> 160 + <div align="left" style="font-size:22px; color: #878787; padding-top: 25px;">{% trans 'Relevant indicators to your performance' %}</div>
179 <hr style="height:2px; background-color:#878787; margin-top: 5px;"> 161 <hr style="height:2px; background-color:#878787; margin-top: 5px;">
180 <div class="row" style="padding-left: 15px;" > 162 <div class="row" style="padding-left: 15px;" >
181 <table > 163 <table >
182 <tr > 164 <tr >
183 <td style="background-color:#002F4B; width: 20px;"></td> 165 <td style="background-color:#002F4B; width: 20px;"></td>
184 - <td style="padding-left: 5px;">Seu resultado</td> 166 + <td style="padding-left: 5px;">{% trans 'Your result' %}</td>
185 <td style="width: 20px"></td> 167 <td style="width: 20px"></td>
186 <td style="background-color:#009688; width: 20px;"></td> 168 <td style="background-color:#009688; width: 20px;"></td>
187 - <td style="padding-left: 5px;">Nível acima da mediana dos aprovados</td> 169 + <td style="padding-left: 5px;">{% trans 'Level above the approved median' %}</td>
188 <td style="width: 20px"></td> 170 <td style="width: 20px"></td>
189 <td style="background-color:#d0cebb; width: 20px;"></td> 171 <td style="background-color:#d0cebb; width: 20px;"></td>
190 - <td style="padding-left: 5px;">Nível abaixo da mediana dos aprovados</td> 172 + <td style="padding-left: 5px;">{% trans 'Level below the approved median' %}</td>
191 <td style="width: 30px"></td> 173 <td style="width: 30px"></td>
192 </tr> 174 </tr>
193 </table> 175 </table>
@@ -202,7 +184,7 @@ @@ -202,7 +184,7 @@
202 <div class="col-md-5"> 184 <div class="col-md-5">
203 185
204 <div style="font-size:16px; text-align:left; color: #000; padding-left: 20px;padding-top: 30px; "> 186 <div style="font-size:16px; text-align:left; color: #000; padding-left: 20px;padding-top: 30px; ">
205 - <b>Descrição dos indicadores</b> 187 + <b>{% trans 'Indicators description' %}</b>
206 </div> 188 </div>
207 189
208 <hr style="height:2px; background-color:#878787;margin-top: 5px;margin-bottom: -1px;"> 190 <hr style="height:2px; background-color:#878787;margin-top: 5px;margin-bottom: -1px;">
@@ -212,7 +194,7 @@ @@ -212,7 +194,7 @@
212 {% for titulo in titulos %} 194 {% for titulo in titulos %}
213 <tr> 195 <tr>
214 <th style="width:110px;"> 196 <th style="width:110px;">
215 - Indicador 0{{forloop.counter }}: 197 + {% trans 'Indicator' %} {{ forloop.counter|stringformat:"02d" }}:
216 </th> 198 </th>
217 <th style="text-align:left; font-weight: normal; padding-left:0px;"> 199 <th style="text-align:left; font-weight: normal; padding-left:0px;">
218 {{titulo}} 200 {{titulo}}
@@ -263,10 +245,10 @@ @@ -263,10 +245,10 @@
263 </div> 245 </div>
264 {% endif %} 246 {% endif %}
265 247
266 -{% include 'session_security/all.html' %}  
267 - <script type="text/javascript">  
268 - sessionSecurity.confirmFormDiscard = undefined;  
269 - </script> 248 + {% include 'session_security/all.html' %}
  249 + <script type="text/javascript">
  250 + sessionSecurity.confirmFormDiscard = undefined;
  251 + </script>
270 252
271 <script type="text/javascript"> 253 <script type="text/javascript">
272 $('[data-toggle="tooltip"]').tooltip({ 254 $('[data-toggle="tooltip"]').tooltip({
@@ -478,12 +460,12 @@ @@ -478,12 +460,12 @@
478 var height = h - margin.top - margin.bottom; 460 var height = h - margin.top - margin.bottom;
479 461
480 // Definindo x1 com escala ordinal 462 // Definindo x1 com escala ordinal
481 - var x = d3.scale.ordinal().domain(ind01.map(function(entry){return "Indicador 01";})).rangeBands([0, width]);  
482 - var x2 = d3.scale.ordinal().domain(ind02.map(function(entry){return "Indicador 02";})).rangeBands([0, width]);  
483 - var x3 = d3.scale.ordinal().domain(ind03.map(function(entry){return "Indicador 03";})).rangeBands([0, width]);  
484 - var x4 = d3.scale.ordinal().domain(ind04.map(function(entry){return "Indicador 04";})).rangeBands([0, width]);  
485 - var x5 = d3.scale.ordinal().domain(ind05.map(function(entry){return "Indicador 05";})).rangeBands([0, width]);  
486 - var x6 = d3.scale.ordinal().domain(ind06.map(function(entry){return "Indicador 06";})).rangeBands([0, width]); 463 + var x = d3.scale.ordinal().domain(ind01.map(function(entry){return "{% trans 'Indicator' %} 01";})).rangeBands([0, width]);
  464 + var x2 = d3.scale.ordinal().domain(ind02.map(function(entry){return "{% trans 'Indicator' %} 02";})).rangeBands([0, width]);
  465 + var x3 = d3.scale.ordinal().domain(ind03.map(function(entry){return "{% trans 'Indicator' %} 03";})).rangeBands([0, width]);
  466 + var x4 = d3.scale.ordinal().domain(ind04.map(function(entry){return "{% trans 'Indicator' %} 04";})).rangeBands([0, width]);
  467 + var x5 = d3.scale.ordinal().domain(ind05.map(function(entry){return "{% trans 'Indicator' %} 05";})).rangeBands([0, width]);
  468 + var x6 = d3.scale.ordinal().domain(ind06.map(function(entry){return "{% trans 'Indicator' %} 06";})).rangeBands([0, width]);
487 469
488 // Definindo y com escala linear 470 // Definindo y com escala linear
489 var y = d3.scale.linear().domain([0, d3.max(ind01, function(d){return d.maximo;})]).range([height, 0]); 471 var y = d3.scale.linear().domain([0, d3.max(ind01, function(d){return d.maximo;})]).range([height, 0]);
@@ -554,9 +536,9 @@ @@ -554,9 +536,9 @@
554 .style("left", d3.event.pageX - 80 + "px") 536 .style("left", d3.event.pageX - 80 + "px")
555 .style("top", d3.event.pageY - 110 + "px") 537 .style("top", d3.event.pageY - 110 + "px")
556 .style("display", "inline-block") 538 .style("display", "inline-block")
557 - .html("<b>Seu resultado: </b>"+ "<b>" + (d.valor) + "</b>" + "<br>" + "<br>"  
558 - + "Máximo: " + (d.maximo)  
559 - + "<br>" + "Mediana: " + (d.mediana)); 539 + .html("<b>{% trans 'Your result' %}: </b>"+ "<b>" + (d.valor) + "</b>" + "<br>" + "<br>"
  540 + + "{% trans 'Max' %}: " + (d.maximo)
  541 + + "<br>" + "{% trans 'Median' %}: " + (d.mediana));
560 }) 542 })
561 .attr("y", function(d,i){ 543 .attr("y", function(d,i){
562 return y(d.maximo); 544 return y(d.maximo);
@@ -582,9 +564,9 @@ @@ -582,9 +564,9 @@
582 .style("left", d3.event.pageX - 80 + "px") 564 .style("left", d3.event.pageX - 80 + "px")
583 .style("top", d3.event.pageY - 110 + "px") 565 .style("top", d3.event.pageY - 110 + "px")
584 .style("display", "inline-block") 566 .style("display", "inline-block")
585 - .html("<b>Seu resultado: </b>"+ "<b>" + (d.valor) + "</b>" + "<br>" + "<br>"  
586 - + "Máximo: " + (d.maximo)  
587 - + "<br>" + "Mediana: " + (d.mediana)); 567 + .html("<b>{% trans 'Your result' %}: </b>"+ "<b>" + (d.valor) + "</b>" + "<br>" + "<br>"
  568 + + "{% trans 'Max' %}: " + (d.maximo)
  569 + + "<br>" + "{% trans 'Median' %}: " + (d.mediana));
588 }) 570 })
589 .attr("y", function(d,i){ 571 .attr("y", function(d,i){
590 return y(d.mediana); 572 return y(d.mediana);
@@ -614,9 +596,9 @@ @@ -614,9 +596,9 @@
614 .style("left", d3.event.pageX - 80 + "px") 596 .style("left", d3.event.pageX - 80 + "px")
615 .style("top", d3.event.pageY - 110 + "px") 597 .style("top", d3.event.pageY - 110 + "px")
616 .style("display", "inline-block") 598 .style("display", "inline-block")
617 - .html("<b>Seu resultado: </b>"+ "<b>" + (d.valor) + "</b>" + "<br>" + "<br>"  
618 - + "Máximo: " + (d.maximo)  
619 - + "<br>" + "Mediana: " + (d.mediana)); 599 + .html("<b>{% trans 'Your result' %}: </b>"+ "<b>" + (d.valor) + "</b>" + "<br>" + "<br>"
  600 + + "{% trans 'Max' %}: " + (d.maximo)
  601 + + "<br>" + "{% trans 'Median' %}: " + (d.mediana));
620 }) 602 })
621 .attr("x", 20) 603 .attr("x", 20)
622 .attr("width", function(d){ 604 .attr("width", function(d){
@@ -669,9 +651,9 @@ @@ -669,9 +651,9 @@
669 .style("left", d3.event.pageX - 80 + "px") 651 .style("left", d3.event.pageX - 80 + "px")
670 .style("top", d3.event.pageY - 110 + "px") 652 .style("top", d3.event.pageY - 110 + "px")
671 .style("display", "inline-block") 653 .style("display", "inline-block")
672 - .html("<b>Seu resultado: </b>"+ "<b>" + (d.valor) + "</b>" + "<br>" + "<br>"  
673 - + "Máximo: " + (d.maximo)  
674 - + "<br>" + "Mediana: " + (d.mediana)); 654 + .html("<b>{% trans 'Your result' %}: </b>"+ "<b>" + (d.valor) + "</b>" + "<br>" + "<br>"
  655 + + "{% trans 'Max' %}: " + (d.maximo)
  656 + + "<br>" + "{% trans 'Median' %}: " + (d.mediana));
675 }) 657 })
676 .attr("y2", function(d,i){ 658 .attr("y2", function(d,i){
677 return y2(d.maximo); 659 return y2(d.maximo);
@@ -697,9 +679,9 @@ @@ -697,9 +679,9 @@
697 .style("left", d3.event.pageX - 80 + "px") 679 .style("left", d3.event.pageX - 80 + "px")
698 .style("top", d3.event.pageY - 110 + "px") 680 .style("top", d3.event.pageY - 110 + "px")
699 .style("display", "inline-block") 681 .style("display", "inline-block")
700 - .html("<b>Seu resultado: </b>"+ "<b>" + (d.valor) + "</b>" + "<br>" + "<br>"  
701 - + "Máximo: " + (d.maximo)  
702 - + "<br>" + "Mediana: " + (d.mediana)); 682 + .html("<b>{% trans 'Your result' %}: </b>"+ "<b>" + (d.valor) + "</b>" + "<br>" + "<br>"
  683 + + "{% trans 'Max' %}: " + (d.maximo)
  684 + + "<br>" + "{% trans 'Median' %}: " + (d.mediana));
703 }) 685 })
704 .attr("y", function(d,i){ 686 .attr("y", function(d,i){
705 return y2(d.mediana); 687 return y2(d.mediana);
@@ -728,9 +710,9 @@ @@ -728,9 +710,9 @@
728 .style("left", d3.event.pageX - 80 + "px") 710 .style("left", d3.event.pageX - 80 + "px")
729 .style("top", d3.event.pageY - 110 + "px") 711 .style("top", d3.event.pageY - 110 + "px")
730 .style("display", "inline-block") 712 .style("display", "inline-block")
731 - .html("<b>Seu resultado: </b>"+ "<b>" + (d.valor) + "</b>" + "<br>" + "<br>"  
732 - + "Máximo: " + (d.maximo)  
733 - + "<br>" + "Mediana: " + (d.mediana)); 713 + .html("<b>{% trans 'Your result' %}: </b>"+ "<b>" + (d.valor) + "</b>" + "<br>" + "<br>"
  714 + + "{% trans 'Max' %}: " + (d.maximo)
  715 + + "<br>" + "{% trans 'Median' %}: " + (d.mediana));
734 }) 716 })
735 .attr("x", 20) 717 .attr("x", 20)
736 .attr("width", function(d){ 718 .attr("width", function(d){
@@ -782,9 +764,9 @@ @@ -782,9 +764,9 @@
782 .style("left", d3.event.pageX - 80 + "px") 764 .style("left", d3.event.pageX - 80 + "px")
783 .style("top", d3.event.pageY - 110 + "px") 765 .style("top", d3.event.pageY - 110 + "px")
784 .style("display", "inline-block") 766 .style("display", "inline-block")
785 - .html("<b>Seu resultado: </b>"+ "<b>" + (d.valor) + "</b>" + "<br>" + "<br>"  
786 - + "Máximo: " + (d.maximo)  
787 - + "<br>" + "Mediana: " + (d.mediana)); 767 + .html("<b>{% trans 'Your result' %}: </b>"+ "<b>" + (d.valor) + "</b>" + "<br>" + "<br>"
  768 + + "{% trans 'Max' %}: " + (d.maximo)
  769 + + "<br>" + "{% trans 'Median' %}: " + (d.mediana));
788 }) 770 })
789 .attr("y", function(d,i){ 771 .attr("y", function(d,i){
790 return y3(d.maximo); 772 return y3(d.maximo);
@@ -809,9 +791,9 @@ @@ -809,9 +791,9 @@
809 .style("left", d3.event.pageX - 80 + "px") 791 .style("left", d3.event.pageX - 80 + "px")
810 .style("top", d3.event.pageY - 110 + "px") 792 .style("top", d3.event.pageY - 110 + "px")
811 .style("display", "inline-block") 793 .style("display", "inline-block")
812 - .html("<b>Seu resultado: </b>"+ "<b>" + (d.valor) + "</b>" + "<br>" + "<br>"  
813 - + "Máximo: " + (d.maximo)  
814 - + "<br>" + "Mediana: " + (d.mediana)); 794 + .html("<b>{% trans 'Your result' %}: </b>"+ "<b>" + (d.valor) + "</b>" + "<br>" + "<br>"
  795 + + "{% trans 'Max' %}: " + (d.maximo)
  796 + + "<br>" + "{% trans 'Median' %}: " + (d.mediana));
815 }) 797 })
816 .attr("y", function(d,i){ 798 .attr("y", function(d,i){
817 return y3(d.mediana); 799 return y3(d.mediana);
@@ -840,9 +822,9 @@ @@ -840,9 +822,9 @@
840 .style("left", d3.event.pageX - 80 + "px") 822 .style("left", d3.event.pageX - 80 + "px")
841 .style("top", d3.event.pageY - 110 + "px") 823 .style("top", d3.event.pageY - 110 + "px")
842 .style("display", "inline-block") 824 .style("display", "inline-block")
843 - .html("<b>Seu resultado: </b>"+ "<b>" + (d.valor) + "</b>" + "<br>" + "<br>"  
844 - + "Máximo: " + (d.maximo)  
845 - + "<br>" + "Mediana: " + (d.mediana)); 825 + .html("<b>{% trans 'Your result' %}: </b>"+ "<b>" + (d.valor) + "</b>" + "<br>" + "<br>"
  826 + + "{% trans 'Max' %}: " + (d.maximo)
  827 + + "<br>" + "{% trans 'Median' %}: " + (d.mediana));
846 }) 828 })
847 829
848 .attr("x", 20) 830 .attr("x", 20)
@@ -895,9 +877,9 @@ @@ -895,9 +877,9 @@
895 .style("left", d3.event.pageX - 80 + "px") 877 .style("left", d3.event.pageX - 80 + "px")
896 .style("top", d3.event.pageY - 110 + "px") 878 .style("top", d3.event.pageY - 110 + "px")
897 .style("display", "inline-block") 879 .style("display", "inline-block")
898 - .html("<b>Seu resultado: </b>"+ "<b>" + (d.valor) + "</b>" + "<br>" + "<br>"  
899 - + "Máximo: " + (d.maximo)  
900 - + "<br>" + "Mediana: " + (d.mediana)); 880 + .html("<b>{% trans 'Your result' %}: </b>"+ "<b>" + (d.valor) + "</b>" + "<br>" + "<br>"
  881 + + "{% trans 'Max' %}: " + (d.maximo)
  882 + + "<br>" + "{% trans 'Median' %}: " + (d.mediana));
901 }) 883 })
902 .attr("y", function(d,i){ 884 .attr("y", function(d,i){
903 return y4(d.maximo); 885 return y4(d.maximo);
@@ -922,9 +904,9 @@ @@ -922,9 +904,9 @@
922 .style("left", d3.event.pageX - 80 + "px") 904 .style("left", d3.event.pageX - 80 + "px")
923 .style("top", d3.event.pageY - 110 + "px") 905 .style("top", d3.event.pageY - 110 + "px")
924 .style("display", "inline-block") 906 .style("display", "inline-block")
925 - .html("<b>Seu resultado: </b>"+ "<b>" + (d.valor) + "</b>" + "<br>" + "<br>"  
926 - + "Máximo: " + (d.maximo)  
927 - + "<br>" + "Mediana: " + (d.mediana)); 907 + .html("<b>{% trans 'Your result' %}: </b>"+ "<b>" + (d.valor) + "</b>" + "<br>" + "<br>"
  908 + + "{% trans 'Max' %}: " + (d.maximo)
  909 + + "<br>" + "{% trans 'Median' %}: " + (d.mediana));
928 }) 910 })
929 .attr("y", function(d,i){ 911 .attr("y", function(d,i){
930 return y4(d.mediana); 912 return y4(d.mediana);
@@ -954,9 +936,9 @@ @@ -954,9 +936,9 @@
954 .style("left", d3.event.pageX - 80 + "px") 936 .style("left", d3.event.pageX - 80 + "px")
955 .style("top", d3.event.pageY - 110 + "px") 937 .style("top", d3.event.pageY - 110 + "px")
956 .style("display", "inline-block") 938 .style("display", "inline-block")
957 - .html("<b>Seu resultado: </b>"+ "<b>" + (d.valor) + "</b>" + "<br>" + "<br>"  
958 - + "Máximo: " + (d.maximo)  
959 - + "<br>" + "Mediana: " + (d.mediana)); 939 + .html("<b>{% trans 'Your result' %}: </b>"+ "<b>" + (d.valor) + "</b>" + "<br>" + "<br>"
  940 + + "{% trans 'Max' %}: " + (d.maximo)
  941 + + "<br>" + "{% trans 'Median' %}: " + (d.mediana));
960 }) 942 })
961 943
962 .attr("x", 20) 944 .attr("x", 20)
@@ -1011,9 +993,9 @@ @@ -1011,9 +993,9 @@
1011 .style("left", d3.event.pageX - 80 + "px") 993 .style("left", d3.event.pageX - 80 + "px")
1012 .style("top", d3.event.pageY - 110 + "px") 994 .style("top", d3.event.pageY - 110 + "px")
1013 .style("display", "inline-block") 995 .style("display", "inline-block")
1014 - .html("<b>Seu resultado: </b>"+ "<b>" + (d.valor) + "</b>" + "<br>" + "<br>"  
1015 - + "Máximo: " + (d.maximo)  
1016 - + "<br>" + "Mediana: " + (d.mediana)); 996 + .html("<b>{% trans 'Your result' %}: </b>"+ "<b>" + (d.valor) + "</b>" + "<br>" + "<br>"
  997 + + "{% trans 'Max' %}: " + (d.maximo)
  998 + + "<br>" + "{% trans 'Median' %}: " + (d.mediana));
1017 }) 999 })
1018 .attr("y5", function(d,i){ 1000 .attr("y5", function(d,i){
1019 return y5(d.maximo); 1001 return y5(d.maximo);
@@ -1038,9 +1020,9 @@ @@ -1038,9 +1020,9 @@
1038 .style("left", d3.event.pageX - 80 + "px") 1020 .style("left", d3.event.pageX - 80 + "px")
1039 .style("top", d3.event.pageY - 110 + "px") 1021 .style("top", d3.event.pageY - 110 + "px")
1040 .style("display", "inline-block") 1022 .style("display", "inline-block")
1041 - .html("<b>Seu resultado: </b>"+ "<b>" + (d.valor) + "</b>" + "<br>" + "<br>"  
1042 - + "Máximo: " + (d.maximo)  
1043 - + "<br>" + "Mediana: " + (d.mediana)); 1023 + .html("<b>{% trans 'Your result' %}: </b>"+ "<b>" + (d.valor) + "</b>" + "<br>" + "<br>"
  1024 + + "{% trans 'Max' %}: " + (d.maximo)
  1025 + + "<br>" + "{% trans 'Median' %}: " + (d.mediana));
1044 }) 1026 })
1045 1027
1046 .attr("y", function(d,i){ 1028 .attr("y", function(d,i){
@@ -1070,9 +1052,9 @@ @@ -1070,9 +1052,9 @@
1070 .style("left", d3.event.pageX - 80 + "px") 1052 .style("left", d3.event.pageX - 80 + "px")
1071 .style("top", d3.event.pageY - 110 + "px") 1053 .style("top", d3.event.pageY - 110 + "px")
1072 .style("display", "inline-block") 1054 .style("display", "inline-block")
1073 - .html("<b>Seu resultado: </b>"+ "<b>" + (d.valor) + "</b>" + "<br>" + "<br>"  
1074 - + "Máximo: " + (d.maximo)  
1075 - + "<br>" + "Mediana: " + (d.mediana)); 1055 + .html("<b>{% trans 'Your result' %}: </b>"+ "<b>" + (d.valor) + "</b>" + "<br>" + "<br>"
  1056 + + "{% trans 'Max' %}: " + (d.maximo)
  1057 + + "<br>" + "{% trans 'Median' %}: " + (d.mediana));
1076 }) 1058 })
1077 1059
1078 .attr("x", 20) 1060 .attr("x", 20)
@@ -1126,9 +1108,9 @@ @@ -1126,9 +1108,9 @@
1126 .style("left", d3.event.pageX - 80 + "px") 1108 .style("left", d3.event.pageX - 80 + "px")
1127 .style("top", d3.event.pageY - 110 + "px") 1109 .style("top", d3.event.pageY - 110 + "px")
1128 .style("display", "inline-block") 1110 .style("display", "inline-block")
1129 - .html("<b>Seu resultado: </b>"+ "<b>" + (d.valor) + "</b>" + "<br>" + "<br>"  
1130 - + "Máximo: " + (d.maximo)  
1131 - + "<br>" + "Mediana: " + (d.mediana)); 1111 + .html("<b>{% trans 'Your result' %}: </b>"+ "<b>" + (d.valor) + "</b>" + "<br>" + "<br>"
  1112 + + "{% trans 'Max' %}: " + (d.maximo)
  1113 + + "<br>" + "{% trans 'Median' %}: " + (d.mediana));
1132 }) 1114 })
1133 .attr("y", function(d,i){ 1115 .attr("y", function(d,i){
1134 return y6(d.maximo); 1116 return y6(d.maximo);
@@ -1153,9 +1135,9 @@ @@ -1153,9 +1135,9 @@
1153 .style("left", d3.event.pageX - 80 + "px") 1135 .style("left", d3.event.pageX - 80 + "px")
1154 .style("top", d3.event.pageY - 110 + "px") 1136 .style("top", d3.event.pageY - 110 + "px")
1155 .style("display", "inline-block") 1137 .style("display", "inline-block")
1156 - .html("<b>Seu resultado: </b>"+ "<b>" + (d.valor) + "</b>" + "<br>" + "<br>"  
1157 - + "Máximo: " + (d.maximo)  
1158 - + "<br>" + "Mediana: " + (d.mediana)); 1138 + .html("<b>{% trans 'Your result' %}: </b>"+ "<b>" + (d.valor) + "</b>" + "<br>" + "<br>"
  1139 + + "{% trans 'Max' %}: " + (d.maximo)
  1140 + + "<br>" + "{% trans 'Median' %}: " + (d.mediana));
1159 }) 1141 })
1160 .attr("y", function(d,i){ 1142 .attr("y", function(d,i){
1161 return y6(d.mediana); 1143 return y6(d.mediana);
@@ -1184,9 +1166,9 @@ @@ -1184,9 +1166,9 @@
1184 .style("left", d3.event.pageX - 80 + "px") 1166 .style("left", d3.event.pageX - 80 + "px")
1185 .style("top", d3.event.pageY - 110 + "px") 1167 .style("top", d3.event.pageY - 110 + "px")
1186 .style("display", "inline-block") 1168 .style("display", "inline-block")
1187 - .html("<b>Seu resultado: </b>"+ "<b>" + (d.valor) + "</b>" + "<br>" + "<br>"  
1188 - + "Máximo: " + (d.maximo)  
1189 - + "<br>" + "Mediana: " + (d.mediana)); 1169 + .html("<b>{% trans 'Your result' %}: </b>"+ "<b>" + (d.valor) + "</b>" + "<br>" + "<br>"
  1170 + + "{% trans 'Max' %}: " + (d.maximo)
  1171 + + "<br>" + "{% trans 'Median' %}: " + (d.mediana));
1190 }) 1172 })
1191 1173
1192 .attr("x", 20 ) 1174 .attr("x", 20 )