svn commit: r1229063 - in /archiva/trunk/archiva-modules/archiva-web: archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultCommonServices.java archiva-webapp-js/src/main/webapp/js/archiva/i18nload.js

[olamy]

Author: olamy
Date: Mon Jan  9 09:00:43 2012
New Revision: 1229063

URL: http://svn.apache.org/viewvc?rev=1229063&view=rev
Log:
load all i18n in only one rest call

Modified:
    
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultCommonServices.java
    
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/i18nload.js

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultCommonServices.java
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultCommonServices.java?rev=1229063&r1=1229062&r2=1229063&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultCommonServices.java
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-rest/archiva-rest-services/src/main/java/org/apache/archiva/rest/services/DefaultCommonServices.java
 Mon Jan  9 09:00:43 2012
@@ -83,7 +83,7 @@ public class DefaultCommonServices
 
     }
 
-    private String fromProperties( Properties properties )
+    private String fromProperties( final Properties properties )
     {
         StringBuilder output = new StringBuilder();
 
@@ -96,17 +96,22 @@ public class DefaultCommonServices
         return output.toString();
     }
 
-    private void loadResource( Properties properties, String resourceName )
+    private void loadResource( final Properties finalProperties, String 
resourceName )
         throws IOException
     {
         InputStream is = null;
-
+        Properties properties = new Properties();
         try
         {
             is = 
Thread.currentThread().getContextClassLoader().getResourceAsStream( 
resourceName.toString() );
             if ( is != null )
             {
                 properties.load( is );
+                finalProperties.putAll( properties );
+            }
+            else
+            {
+                log.info( "cannot load resource {}", resourceName );
             }
         }
         finally

Modified: 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/i18nload.js
URL: 
http://svn.apache.org/viewvc/archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/i18nload.js?rev=1229063&r1=1229062&r2=1229063&view=diff
==============================================================================
--- 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/i18nload.js
 (original)
+++ 
archiva/trunk/archiva-modules/archiva-web/archiva-webapp-js/src/main/webapp/js/archiva/i18nload.js
 Mon Jan  9 09:00:43 2012
@@ -28,8 +28,8 @@ $(function() {
   $.log("use browserLang:"+browserLang);
   // -- archiva
   // load default
-  
loadAndParseFile("restServices/archivaServices/commonServices/getAllI18nResources",
 {cache:false, mode: 'map',encoding:'utf-8'});
-  if (browserLang!='en'){
-    
loadAndParseFile("restServices/archivaServices/commonServices/getAllI18nResources?locale="+browserLang,
 {cache:false, mode: 'map',encoding:'utf-8'});
-  }
+  
//loadAndParseFile("restServices/archivaServices/commonServices/getAllI18nResources",
 {cache:false, mode: 'map',encoding:'utf-8'});
+  //if (browserLang!='en'){
+  
loadAndParseFile("restServices/archivaServices/commonServices/getAllI18nResources?locale="+browserLang,
 {cache:false, mode: 'map',encoding:'utf-8'});
+  //}
 });
\ No newline at end of file