Changeset 5894

Timestamp:

04/09/12 12:40:56 (12 years ago)

Author:

airton

Message:

Ticket #1794 - Melhorias na representacao das mensagens e internacionalizacao da descricao dos filtros

Location:

trunk

Files:

• expressoMail1_2/setup/phpgw_pt-br.lang (modified) (1 diff)
• prototype/modules/filters/edit-filter.ejs (modified) (5 diffs)
• prototype/modules/filters/filter-list.ejs (modified) (4 diffs)

trunk/expressoMail1_2/setup/phpgw_pt-br.lang

@@ -829 +829 @@
 You have %1 follow ups due for today:   expressoMail1_2 pt-br   Você tem %1 mensagens sinalizadas para hoje:
 Don't show this window anymore today.   expressoMail1_2 pt-br   Não mostrar essa janela por hoje.
+redirect        expressoMail1_2 pt-br   Redirecionar para
+setflag expressoMail1_2 pt-br   Marcar como
+fileinto        expressoMail1_2 pt-br   Mover para
 Contains        expressoMail1_2 pt-br   Contém
 Criteria        expressoMail1_2 pt-br   Critérios

trunk/prototype/modules/filters/edit-filter.ejs

@@ -20 +20 @@
                                 <label class="small"><%= get_lang("Sender")%></label>
                                 <select name="criteriaOperator[]">
-                                        <option value="="><%= get_lang("contains")%></option>
+                                        <option value="="><%= get_lang("is equal to")%></option>
                                         <option value="*"><%= get_lang("contains the phrase")%></option>
                                         <option value="!*"><%= get_lang("doesn't contain the phrase")%></option>
@@ -33 +33 @@
                                 <label class="small"><%= get_lang("Receiver")%></label>
                                 <select name="criteriaOperator[]">
-                                        <option value="="><%= get_lang("contains")%></option>
+                                        <option value="="><%= get_lang("is equal to")%></option>
                                         <option value="*"><%= get_lang("contains the phrase")%></option>
                                         <option value="!*"><%= get_lang("doesn't contain the phrase")%></option>
@@ -45 +45 @@
                                 <label class="small"><%= get_lang("Subject")%></label>
                                 <select name="criteriaOperator[]">
-                                        <option value="="><%= get_lang("contains")%></option>
+                                        <option value="="><%= get_lang("is equal to")%></option>
                                         <option value="*"><%= get_lang("contains the phrase")%></option>
                                         <option value="!*"><%= get_lang("doesn't contain the phrase")%></option>
@@ -58 +58 @@
                                 <label class="small"><%= get_lang("Message")%></label>
                                 <select name="criteriaOperator[]">
-                                        <option value="="><%= get_lang("contains")%></option>
+                                        <option value="="><%= get_lang("is equal to")%></option>
                                         <option value="*"><%= get_lang("contains the phrase")%></option>
                                         <option value="!*"><%= get_lang("doesn't contain the phrase")%></option>
@@ -76 +76 @@
                                 <input type="hidden" name="criteriaType[]" value="size"/>
                         </fieldset>
-                        <!--
                         <fieldset>
                                 <input type="checkbox" value="hasAttachment" name="hasAttachment" />
                                 <label>A mensagem possui anexo</label>
                         </fieldset>
-                        -->
                         <fieldset class="fields-isexact">
                                 <fieldset>

trunk/prototype/modules/filters/filter-list.ejs

@@ -15 +15 @@
                                                 for (var j=0; j<data.rules[i].criteria.length; j++) {
                                         %>
-                                                <li><strong><%= data.rules[i].criteria[j].field %>:</strong> <%= data.rules[i].criteria[j].value %></li>
+                                                <li><strong><%= get_lang(data.rules[i].criteria[j].field) %>:</strong> <%= data.rules[i].criteria[j].value %></li>
                                         <%
                                                 }
@@ -27 +27 @@
                                                 for (var k=0; k<data.rules[i].actions.length; k++) {
                                         %>
-                                                <li><strong><%= data.rules[i].actions[k].type %>:</strong> <%= data.rules[i].actions[k].parameter %></li>
+                                                <li><strong><%= get_lang(data.rules[i].actions[k].type) %>:</strong> <%= data.rules[i].actions[k].parameter %></li>
                                         <%
                                                 }
@@ -39 +39 @@
                                 <li><a href="#<%= data.rules[i].name %>" class="button disable<%= (data.rules[i].enabled  == "true")? ' hidden': '' %>" title="<%= get_lang("Enable rule")%>"></a></li>
                                 <li><a href="#<%= data.rules[i].name %>" class="button close" title="<%= get_lang("Delete rule")%> '<%= data.rules[i].name %>'"></a></li>
-                                <!--<li class="select" ><input type="checkbox"/></li>-->
+                                <li class="select" ><input type="checkbox"/></li>
                         </ul>
                 </li>
@@ -46 +46 @@
 %>
 </ul>
-<!--
 <fieldset class="fields-selected-itens ui-corner-all">
         <legend>Selecionadas</legend>
         <a href="#" class="button enable"  title="Habilitar regras selecionadas">Habilitar</a>
         <a href="#" class="button disable" title="Desabilitar regras selecionadas">Desabilitar</a>
-        <a href="#" class="button delete"  title="Excluir regras selecionadas">Excluir</a>
+        <!--<a href="#" class="button delete"  title="Excluir regras selecionadas">Excluir</a>-->
 </fieldset>
--->