Merge branch '1.2.x' of github.com:grails/grails-core into 1.2.x

Author: graemerocher

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

@@ -39,7 +39,7 @@ class I18nGrailsPlugin {
 
 	def doWithSpring = {
 		// find i18n resource bundles and resolve basenames
-		def baseNames = []
+		def baseNames = [] as Set
 
         def messageResources
         if(application.warDeployed) {
@@ -52,20 +52,25 @@ class I18nGrailsPlugin {
         if(messageResources) {
 
             for( resource in messageResources) {
-                // Skip files with a locale specification, since we assume
-                // that there is an associated base resource bundle too.
-                if (resource.filename.contains("_")) {
-                    continue
-                }
-
                 // Extract the file path of the file's parent directory
                 // that comes after "grails-app/i18n".
                 def path = StringUtils.substringAfter(resource.path, baseDir)
 
-                // Lop off the extension - the "basenames" property in the
-                // message source cannot have entries with an extension.
-                path -= ".properties"
-
+                // look for an underscore in the file name (not the full path)
+                def fileName = resource.filename
+                def firstUnderscore = fileName.indexOf('_')
+
+                if(firstUnderscore > 0) {
+					// grab everyting up to but not including
+					// the first underscore in the file name
+					def numberOfCharsToRemove = fileName.length() - firstUnderscore
+					def lastCharacterToRetain = -1 * (numberOfCharsToRemove + 1)
+				    path = path[0..lastCharacterToRetain]
+				} else {
+					// Lop off the extension - the "basenames" property in the
+					// message source cannot have entries with an extension.
+					path -= ".properties"
+				}
                 baseNames << "WEB-INF/" + baseDir + path
             }
         }
@@ -124,3 +129,4 @@ class I18nGrailsPlugin {
 		}
 	}
 }
+

src/test/org/codehaus/groovy/grails/plugins/i18n/I18nGrailsPluginTests.groovy

@@ -15,8 +15,11 @@ class I18nGrailsPluginTests extends AbstractGrailsMockTests {
 
         ga.@applicationMeta = ['grails.war.deployed':'true'] as Metadata
         ctx.registerMockResource("WEB-INF/grails-app/i18n/messages.properties")
+        ctx.registerMockResource("WEB-INF/grails-app/i18n/messages-site_en.properties")
+        ctx.registerMockResource("WEB-INF/grails-app/i18n/foo-site_en.properties")
 		ctx.registerMockResource("WEB-INF/grails-app/i18n/project.properties")
 		ctx.registerMockResource("WEB-INF/grails-app/i18n/project_nl.properties")
+		ctx.registerMockResource("WEB-INF/grails-app/i18n/sub/dir_name/sub/foo-bar_en.properties")
 		ctx.registerMockResource("WEB-INF/grails-app/i18n/nobundle")
 		ctx.registerMockResource("WEB-INF/grails-app/i18n/nobundle.txt")
 		ctx.registerMockResource("WEB-INF/grails-app/i18n/nobundle.xml")
@@ -41,6 +44,9 @@ class I18nGrailsPluginTests extends AbstractGrailsMockTests {
 		def messageSource = appCtx.getBean("messageSource")?.toString()
 		println messageSource
 		assert StringUtils.contains(messageSource, "messages")
+		assert StringUtils.contains(messageSource, "messages-site")
+		assert StringUtils.contains(messageSource, "foo-site")
+		assert StringUtils.contains(messageSource, "foo-bar")
 		assert StringUtils.contains(messageSource, "project")
 		assert !StringUtils.contains(messageSource, "messages.properties")
 		assert !StringUtils.contains(messageSource, "project.properties")