merged

README.md

@@ -59,7 +59,7 @@ As `en` is set to be the default, when making a request to `/en/products` you wi
 
 #### Translation files
 Every translation file is JSON and must end with .json  
-You can have as many file you want for each locale. This let you seperate content.  
+You can have as many files as you want for each locale. This let you seperate content.  
 For example : `en.json` `header_en.json` `footer_en.json`  
 <br/>
 Each file start with the `locale` key.  

lib/node-i18n.js

@@ -33,11 +33,13 @@ module.exports = function (options) {
     this.files    = fs.readdirSync(this.options.dir)
 
     this.load = function(){
-      _.each(this.files, function(file){
-        this.words = _.extend(self.words, require(self.options.dir + '/' + file))
-      })
-      return this
-    }
+			_.each(this.files, function(file){
+				fileContents = require(self.options.dir + '/' + file)
+				fileLocale = _.keys(fileContents)[0]
+				self.words[fileLocale] = _.extend(self.words[fileLocale] || {}, fileContents[fileLocale])
+			})
+			return this
+		}
 
     this.translateHelper = function(locale){
       return function(key, variables, forcedLocale) {