Author: massi
Date: Fri Jun 21 09:57:43 2013
New Revision: 1495360
URL: http://svn.apache.org/r1495360
Log:
merged from 1_1_X
Modified:
syncope/trunk/ (props changed)
syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/InvalidPolicyType.java
syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/DateTimeFieldPanel.java
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Users.properties
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Users_it.properties
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Users_pt_BR.properties
Propchange: syncope/trunk/
------------------------------------------------------------------------------
Merged /syncope/branches/1_1_X:r1492226-1495359
Modified:
syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/InvalidPolicyType.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/InvalidPolicyType.java?rev=1495360&r1=1495359&r2=1495360&view=diff
==============================================================================
---
syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/InvalidPolicyType.java
(original)
+++
syncope/trunk/console/src/main/java/org/apache/syncope/console/rest/InvalidPolicyType.java
Fri Jun 21 09:57:43 2013
@@ -25,7 +25,7 @@ public class InvalidPolicyType extends R
public InvalidPolicyType() {
}
- public InvalidPolicyType(String msg) {
+ public InvalidPolicyType(final String msg) {
super(msg);
}
}
Modified:
syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/DateTimeFieldPanel.java
URL:
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/DateTimeFieldPanel.java?rev=1495360&r1=1495359&r2=1495360&view=diff
==============================================================================
---
syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/DateTimeFieldPanel.java
(original)
+++
syncope/trunk/console/src/main/java/org/apache/syncope/console/wicket/markup/html/form/DateTimeFieldPanel.java
Fri Jun 21 09:57:43 2013
@@ -20,7 +20,6 @@ package org.apache.syncope.console.wicke
import java.util.Calendar;
import java.util.Date;
-import org.apache.syncope.common.SyncopeConstants;
import org.apache.syncope.console.commons.Constants;
import org.apache.wicket.AttributeModifier;
import org.apache.wicket.ajax.AjaxRequestTarget;
Modified:
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Users.properties
URL:
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Users.properties?rev=1495360&r1=1495359&r2=1495360&view=diff
==============================================================================
---
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Users.properties
(original)
+++
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Users.properties
Fri Jun 21 09:57:43 2013
@@ -20,6 +20,7 @@ search=Search
create_user=Create new user
search_results_title=Search results:
search_noResults=No matches found.
+search_error=Error:search's format is invalid
reset=Reset
showingFrom=Showing
showingTo=to
Modified:
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Users_it.properties
URL:
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Users_it.properties?rev=1495360&r1=1495359&r2=1495360&view=diff
==============================================================================
---
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Users_it.properties
(original)
+++
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Users_it.properties
Fri Jun 21 09:57:43 2013
@@ -20,6 +20,7 @@ search=Cerca
create_user=Crea nuovo utente
search_results_title=Risultati ricerca:
search_noResults=Nessuna corrispondenza trovata.
+search_error=Errore:il formato di ricerca non \u00e8 valido
reset=Reset
showingFrom=Risultati da
showingTo=a
Modified:
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Users_pt_BR.properties
URL:
http://svn.apache.org/viewvc/syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Users_pt_BR.properties?rev=1495360&r1=1495359&r2=1495360&view=diff
==============================================================================
---
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Users_pt_BR.properties
(original)
+++
syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Users_pt_BR.properties
Fri Jun 21 09:57:43 2013
@@ -17,9 +17,10 @@
tab1=Lista
tab2=Buscar
search=Buscar
-create_user=Criar novo usu\u00E1rio
+create_user=Criar novo usu\u00e1rio
search_results_title=Resultados de pesquisa\:
search_noResults=Nenhum resultado encontrado
+search_error=Erro\: formato de busca incorreto.
reset=Resetar
showingFrom=Mostrar
showingTo=para
