syncope-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ilgro...@apache.org
Subject svn commit: r1467187 - in /syncope/trunk: ./ console/src/main/java/org/apache/syncope/console/ console/src/main/resources/org/apache/syncope/console/ console/src/main/resources/org/apache/syncope/console/pages/ console/src/main/resources/org/apache/syn...
Date Fri, 12 Apr 2013 07:27:45 GMT
Author: ilgrosso
Date: Fri Apr 12 07:27:44 2013
New Revision: 1467187

URL: http://svn.apache.org/r1467187
Log:
[SYNCOPE-340] Merge from 1_1_X

Added:
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/SyncopeApplication_pt_BR.properties
      - copied unchanged from r1467185, syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/SyncopeApplication_pt_BR.properties
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ApprovalModalPage_pt_BR.properties
      - copied unchanged from r1467185, syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/ApprovalModalPage_pt_BR.properties
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/BaseModalPage_pt_BR.properties
      - copied unchanged from r1467185, syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/BaseModalPage_pt_BR.properties
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/BasePage_pt_BR.properties
      - copied unchanged from r1467185, syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/BasePage_pt_BR.properties
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/BulkActionModalPage_pt_BR.properties
      - copied unchanged from r1467185, syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/BulkActionModalPage_pt_BR.properties
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/BulkActionResultModalPage_pt_BR.properties
      - copied unchanged from r1467185, syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/BulkActionResultModalPage_pt_BR.properties
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ConfigurationModalPage_pt_BR.properties
      - copied unchanged from r1467185, syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/ConfigurationModalPage_pt_BR.properties
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Configuration_pt_BR.properties
      - copied unchanged from r1467185, syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/Configuration_pt_BR.properties
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ConnObjectModalPage_pt_BR.properties
      - copied unchanged from r1467185, syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/ConnObjectModalPage_pt_BR.properties
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ConnectorModalPage_pt_BR.properties
      - copied unchanged from r1467185, syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/ConnectorModalPage_pt_BR.properties
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/DerivedSchemaModalPage_pt_BR.properties
      - copied unchanged from r1467185, syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/DerivedSchemaModalPage_pt_BR.properties
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/DisplayAttributesModalPage_pt_BR.properties
      - copied unchanged from r1467185, syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/DisplayAttributesModalPage_pt_BR.properties
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/InfoModalPage_pt_BR.properties
      - copied unchanged from r1467185, syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/InfoModalPage_pt_BR.properties
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Login_pt_BR.properties
      - copied unchanged from r1467185, syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/Login_pt_BR.properties
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/MembershipModalPage_pt_BR.properties
      - copied unchanged from r1467185, syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/MembershipModalPage_pt_BR.properties
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/NotificationModalPage_pt_BR.properties
      - copied unchanged from r1467185, syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/NotificationModalPage_pt_BR.properties
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/NotificationTaskModalPage_pt_BR.properties
      - copied unchanged from r1467185, syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/NotificationTaskModalPage_pt_BR.properties
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/PolicyModalPage_pt_BR.properties
      - copied unchanged from r1467185, syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/PolicyModalPage_pt_BR.properties
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/PropagationTaskModalPage_pt_BR.properties
      - copied unchanged from r1467185, syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/PropagationTaskModalPage_pt_BR.properties
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ReportExecResultDownloadModalPage_pt_BR.properties
      - copied unchanged from r1467185, syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/ReportExecResultDownloadModalPage_pt_BR.properties
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ReportModalPage_pt_BR.properties
      - copied unchanged from r1467185, syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/ReportModalPage_pt_BR.properties
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ReportletConfModalPage_pt_BR.properties
      - copied unchanged from r1467185, syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/ReportletConfModalPage_pt_BR.properties
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Reports_pt_BR.properties
      - copied unchanged from r1467185, syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/Reports_pt_BR.properties
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ResourceModalPage_pt_BR.properties
      - copied unchanged from r1467185, syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/ResourceModalPage_pt_BR.properties
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Resources_pt_BR.properties
      - copied unchanged from r1467185, syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/Resources_pt_BR.properties
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/ResultStatusModalPage_pt_BR.properties
      - copied unchanged from r1467185, syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/ResultStatusModalPage_pt_BR.properties
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/RoleModalPage_pt_BR.properties
      - copied unchanged from r1467185, syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/RoleModalPage_pt_BR.properties
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Roles_pt_BR.properties
      - copied unchanged from r1467185, syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/Roles_pt_BR.properties
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/SchedTaskModalPage_pt_BR.properties
      - copied unchanged from r1467185, syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/SchedTaskModalPage_pt_BR.properties
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/SchemaModalPage_pt_BR.properties
      - copied unchanged from r1467185, syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/SchemaModalPage_pt_BR.properties
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Schema_pt_BR.properties
      - copied unchanged from r1467185, syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/Schema_pt_BR.properties
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/StatusModalPage_pt_BR.properties
      - copied unchanged from r1467185, syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/StatusModalPage_pt_BR.properties
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/SyncTaskModalPage_pt_BR.properties
      - copied unchanged from r1467185, syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/SyncTaskModalPage_pt_BR.properties
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Tasks_pt_BR.properties
      - copied unchanged from r1467185, syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/Tasks_pt_BR.properties
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Todo_pt_BR.properties
      - copied unchanged from r1467185, syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/Todo_pt_BR.properties
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/UserModalPage_pt_BR.properties
      - copied unchanged from r1467185, syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/UserModalPage_pt_BR.properties
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/UserOwnerSelectModalPage_pt_BR.properties
      - copied unchanged from r1467185, syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/UserOwnerSelectModalPage_pt_BR.properties
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/Users_pt_BR.properties
      - copied unchanged from r1467185, syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/Users_pt_BR.properties
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/VirtualSchemaModalPage_pt_BR.properties
      - copied unchanged from r1467185, syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/VirtualSchemaModalPage_pt_BR.properties
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/WelcomePage_pt_BR.properties
      - copied unchanged from r1467185, syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/WelcomePage_pt_BR.properties
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/AbstractSearchPanel_pt_BR.properties
      - copied unchanged from r1467185, syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/panels/AbstractSearchPanel_pt_BR.properties
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/AbstractSearchResultPanel_pt_BR.properties
      - copied unchanged from r1467185, syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/panels/AbstractSearchResultPanel_pt_BR.properties
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/AccountInformationPanel_pt_BR.properties
      - copied unchanged from r1467185, syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/panels/AccountInformationPanel_pt_BR.properties
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/DerivedAttributesPanel_pt_BR.properties
      - copied unchanged from r1467185, syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/panels/DerivedAttributesPanel_pt_BR.properties
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/MembershipsPanel_pt_BR.properties
      - copied unchanged from r1467185, syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/panels/MembershipsPanel_pt_BR.properties
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/NotificationTasks_pt_BR.properties
      - copied unchanged from r1467185, syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/panels/NotificationTasks_pt_BR.properties
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/PoliciesPanel_pt_BR.properties
      - copied unchanged from r1467185, syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/panels/PoliciesPanel_pt_BR.properties
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/PropagationTasks_pt_BR.properties
      - copied unchanged from r1467185, syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/panels/PropagationTasks_pt_BR.properties
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/ResourceSecurityPanel_pt_BR.properties
      - copied unchanged from r1467185, syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/panels/ResourceSecurityPanel_pt_BR.properties
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RoleDetailsPanel_pt_BR.properties
      - copied unchanged from r1467185, syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/panels/RoleDetailsPanel_pt_BR.properties
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RolePanel_pt_BR.properties
      - copied unchanged from r1467185, syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/panels/RolePanel_pt_BR.properties
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RoleSecurityPanel_pt_BR.properties
      - copied unchanged from r1467185, syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/panels/RoleSecurityPanel_pt_BR.properties
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/RoleTabPanel_pt_BR.properties
      - copied unchanged from r1467185, syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/panels/RoleTabPanel_pt_BR.properties
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/SchedTasks_pt_BR.properties
      - copied unchanged from r1467185, syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/panels/SchedTasks_pt_BR.properties
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/StatusPanel_pt_BR.properties
      - copied unchanged from r1467185, syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/panels/StatusPanel_pt_BR.properties
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/SyncTasks_pt_BR.properties
      - copied unchanged from r1467185, syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/panels/SyncTasks_pt_BR.properties
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/UserDetailsPanel_pt_BR.properties
      - copied unchanged from r1467185, syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/panels/UserDetailsPanel_pt_BR.properties
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/pages/panels/VirtualAttributesPanel_pt_BR.properties
      - copied unchanged from r1467185, syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/pages/panels/VirtualAttributesPanel_pt_BR.properties
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/DateTimeFieldPanel_pt_BR.properties
      - copied unchanged from r1467185, syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/DateTimeFieldPanel_pt_BR.properties
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/MultiValueSelectorPanel_pt_BR.properties
      - copied unchanged from r1467185, syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/form/MultiValueSelectorPanel_pt_BR.properties
    syncope/trunk/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/tree/TreeActionLinkPanel_pt_BR.properties
      - copied unchanged from r1467185, syncope/branches/1_1_X/console/src/main/resources/org/apache/syncope/console/wicket/markup/html/tree/TreeActionLinkPanel_pt_BR.properties
Modified:
    syncope/trunk/   (props changed)
    syncope/trunk/console/src/main/java/org/apache/syncope/console/SyncopeSession.java

Propchange: syncope/trunk/
------------------------------------------------------------------------------
  Merged /syncope/branches/1_0_X:r1466016-1467182
  Merged /syncope/branches/1_1_X:r1466462-1467185

Modified: syncope/trunk/console/src/main/java/org/apache/syncope/console/SyncopeSession.java
URL: http://svn.apache.org/viewvc/syncope/trunk/console/src/main/java/org/apache/syncope/console/SyncopeSession.java?rev=1467187&r1=1467186&r2=1467187&view=diff
==============================================================================
--- syncope/trunk/console/src/main/java/org/apache/syncope/console/SyncopeSession.java (original)
+++ syncope/trunk/console/src/main/java/org/apache/syncope/console/SyncopeSession.java Fri
Apr 12 07:27:44 2013
@@ -72,7 +72,7 @@ public class SyncopeSession extends WebS
     private static final long serialVersionUID = 7743446298924805872L;
 
     public static final List<Locale> SUPPORTED_LOCALES = Arrays.asList(new Locale[]
{
-        Locale.ENGLISH, Locale.ITALIAN});
+        Locale.ENGLISH, Locale.ITALIAN, new Locale("pt", "BR")});
 
     private String userId;
 



Mime
View raw message