Apache
/
archiva-redback-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix redback i18n loading package name 

git-svn-id: https://svn.apache.org/repos/asf/archiva/redback/redback-core/trunk@1311119 13f79535-47bb-0310-9956-ffa450edef68
This commit is contained in:
Olivier Lamy 2012-04-08 23:27:08 +00:00
parent 3103779e3a
commit f829629e3c
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
redback-integrations/redback-rest/redback-rest-services/src/main/java/org/apache/archiva/redback/rest/services/DefaultUtilServices.java
View File

@ -72,26 +72,26 @@ public class DefaultUtilServices
{
// load default first then requested locale
loadResource( properties, "org/codehaus/plexus/redback/users/messages", null );
loadResource( properties, "org/codehaus/plexus/redback/users/messages", locale );
loadResource( properties, "org/apache/archiva/redback/users/messages", null );
loadResource( properties, "org/apache/archiva/redback/users/messages", locale );
}
catch ( IOException e )
{
log.warn( "skip error loading properties {}", "org/codehaus/plexus/redback/users/messages" );
log.warn( "skip error loading properties {}", "org/apache/archiva/redback/users/messages" );
}
try
{
// load default first then requested locale
loadResource( properties, "org/codehaus/redback/i18n/default", null );
loadResource( properties, "org/codehaus/redback/i18n/default", locale );
loadResource( properties, "org/apache/archiva/redback/i18n/default", null );
loadResource( properties, "org/apache/archiva/redback/i18n/default", locale );
}
catch ( IOException e )
{
log.warn( "skip error loading properties {}", "org/codehaus/redback/i18n/default" );
log.warn( "skip error loading properties {}", "org/apache/archiva/redback/i18n/default" );
}
StringBuilder output = new StringBuilder();
@ -114,11 +114,11 @@ public class DefaultUtilServices
{
Properties properties = new Properties();
// load default first then requested locale
loadResource( properties, "org/codehaus/plexus/redback/users/messages", null );
loadResource( properties, "org/codehaus/plexus/redback/users/messages", locale );
loadResource( properties, "org/apache/archiva/redback/users/messages", null );
loadResource( properties, "org/apache/archiva/redback/users/messages", locale );
loadResource( properties, "org/codehaus/redback/i18n/default", null );
loadResource( properties, "org/codehaus/redback/i18n/default", locale );
loadResource( properties, "org/apache/archiva/redback/i18n/default", null );
loadResource( properties, "org/apache/archiva/redback/i18n/default", locale );
return properties;
}
catch ( IOException e )