Merge branch 'master' of github.com:grails/grails-core

Author: graemerocher

src/java/org/codehaus/groovy/grails/plugins/i18n/I18nGrailsPlugin.groovy

@@ -23,7 +23,9 @@ import org.apache.commons.lang.StringUtils
 import org.apache.commons.logging.LogFactory
 
 import org.codehaus.groovy.grails.context.support.PluginAwareResourceBundleMessageSource
+import org.codehaus.groovy.grails.web.context.GrailsConfigUtils;
 import org.codehaus.groovy.grails.web.i18n.ParamsAwareLocaleChangeInterceptor
+import org.codehaus.groovy.grails.web.pages.GroovyPagesTemplateEngine
 
 import org.springframework.core.io.ContextResource
 import org.springframework.context.support.ReloadableResourceBundleMessageSource
@@ -93,8 +95,13 @@ class I18nGrailsPlugin {
             basenames = baseNames.toArray()
             fallbackToSystemLocale = false
             pluginManager = manager
-            if (Environment.current.isReloadEnabled()) {
-                cacheSeconds = 5
+            if (Environment.current.isReloadEnabled() || GrailsConfigUtils.isConfigTrue(application, GroovyPagesTemplateEngine.CONFIG_PROPERTY_GSP_ENABLE_RELOAD)) {
+				def cacheSecondsSetting = application?.flatConfig?.get('grails.i18n.cache.seconds')
+				if(cacheSecondsSetting != null) {	
+					cacheSeconds = cacheSecondsSetting as Integer
+				} else {		
+                	cacheSeconds = 5
+				}
             }
         }
 

src/java/org/codehaus/groovy/grails/plugins/web/GroovyPagesGrailsPlugin.groovy

@@ -29,6 +29,7 @@ import org.codehaus.groovy.grails.commons.GrailsTagLibClass
 import org.codehaus.groovy.grails.commons.TagLibArtefactHandler
 import org.codehaus.groovy.grails.plugins.GrailsPluginManager
 import org.codehaus.groovy.grails.plugins.web.taglib.*
+import org.codehaus.groovy.grails.web.context.GrailsConfigUtils;
 import org.codehaus.groovy.grails.web.filters.JavascriptLibraryFilters
 import org.codehaus.groovy.grails.web.pages.*
 import org.codehaus.groovy.grails.web.pages.ext.jsp.TagLibraryResolver
@@ -91,8 +92,7 @@ class GroovyPagesGrailsPlugin {
         boolean developmentMode = !application.warDeployed
         Environment env = Environment.current
         boolean enableReload = env.isReloadEnabled() ||
-            application?.flatConfig?.get(GroovyPagesTemplateEngine.CONFIG_PROPERTY_GSP_ENABLE_RELOAD) == true ||
-			Boolean.getBoolean(GroovyPagesTemplateEngine.CONFIG_PROPERTY_GSP_ENABLE_RELOAD) ||
+            GrailsConfigUtils.isConfigTrue(application, GroovyPagesTemplateEngine.CONFIG_PROPERTY_GSP_ENABLE_RELOAD) ||
             (developmentMode && env == Environment.DEVELOPMENT)
         boolean warDeployedWithReload = application.warDeployed && enableReload
 		boolean enableCacheResources = !(application?.flatConfig?.get(GroovyPagesTemplateEngine.CONFIG_PROPERTY_DISABLE_CACHING_RESOURCES) == true)

src/java/org/codehaus/groovy/grails/web/context/GrailsConfigUtils.java

@@ -28,6 +28,7 @@
 import org.codehaus.groovy.grails.commons.spring.GrailsRuntimeConfigurator;
 import org.codehaus.groovy.grails.plugins.GrailsPluginManager;
 import org.codehaus.groovy.grails.support.PersistenceContextInterceptor;
+import org.codehaus.groovy.runtime.typehandling.DefaultTypeTransformation;
 import org.springframework.beans.BeanUtils;
 import org.springframework.beans.factory.config.AutowireCapableBeanFactory;
 import org.springframework.context.ApplicationContext;
@@ -166,4 +167,22 @@ public static GrailsRuntimeConfigurator determineGrailsRuntimeConfiguratorFromSe
 
         return configurator;
     }
+    
+    /**
+     * Checks if a Config parameter is true or a System property with the same name is true
+     * 
+     * 
+     * @param application
+     * @param propertyName
+     * @return
+     */
+    public static boolean isConfigTrue(GrailsApplication application, String propertyName) {
+    	return ((application != null && application.getFlatConfig() != null && DefaultTypeTransformation.castToBoolean(application.getFlatConfig().get(propertyName))) ||
+    			Boolean.getBoolean(propertyName));
+	}
+    
+    // support GrailsApplication mocking, see ControllersGrailsPluginTests
+    public static boolean isConfigTrue(Object application, String propertyName) {
+    	return false;
+    }
 }