Merge pull request #6 from viattik/master

Fallback locale functionality

.gitignore

@@ -1,3 +1,4 @@
 node_modules
+bower_components
 .idea
 tmp

package.json

@@ -20,7 +20,7 @@
   "devDependencies": {
     "grunt": "~0.4.1",
     "grunt-contrib-coffee": "~0.6.4",
-    "grunt-contrib-uglify": "~0.1.x",
+    "grunt-contrib-uglify": "^0.9.1",
     "grunt-contrib-watch": "*",
     "karma-chrome-launcher": "~0.1.4",
     "karma-jasmine": "~0.1.5",

src/l10n.coffee

@@ -2,6 +2,7 @@ angular.module('l10n', ['ngLocale'])
 .provider('l10n',
 	db: {}
 	locale: null
+	fallbackLocale: null
 	localeMessages: {}
 	# transform messages using function. Must return object with messages
 	transform: null
@@ -37,24 +38,38 @@ angular.module('l10n', ['ngLocale'])
 
 		@db.getLocale = => locale.id
 
-		@db.get = (key, substitutions...) ->
-			return '' unless key
-			originalKey = key
-			# protection against method redefine
-			key = '$' + key if angular.isFunction @[key]
-			parent = @
-			# get value from hash
+		@db.setFallbackLocale = (localeCode) =>
+			@fallbackLocale = localeCode
+
+		@db.getFallbackLocale = => @fallbackLocale
+
+		# get value from hash
+		findValue = (key, messagesRoot) =>
+			parent = messagesRoot
 			while (pos = key.indexOf('.')) > 0
 				rest = key.substr(pos + 1)
 				key = key.substr(0, pos)
 
 				if typeof parent[key] != 'undefined'
 					parent = parent[key]
 				else
-					return originalKey
+					return null
 				key = rest
 			value = parent[key]
-			value = originalKey unless value?
+			value = null unless value?
+			value
+
+		@db.get = (key, substitutions...) ->
+			return '' unless key
+			allLocales = @getAllLocales()
+			fallbackLocale = @getFallbackLocale()
+			# protection against method redefine
+			key = '$' + key if angular.isFunction @[key]
+			value = findValue(key, @)
+			# using fallback locale key if no message exists for current locale
+			if !value && fallbackLocale && allLocales?[fallbackLocale]
+				value = findValue(key, allLocales[fallbackLocale])
+			value = key unless value
 
 			if typeof value == 'string'
 				# expand @referenced values

test/unit/service.spec.coffee

@@ -58,6 +58,9 @@ describe 'l10n.get method', ->
 						'one': '1 person is viewing.'
 						'other': '{} people are viewing.'
 
+			l10nProvider.add 'en-CA',
+				'not-existing-message': 'This exists only in en-CA'
+
 		module 'test-get'
 		inject (l10n) ->
 			service = l10n
@@ -93,6 +96,11 @@ describe 'l10n.get method', ->
 		expect(service.get('subs.hello2', 'name', 'name2', 'name3' )).toBe 'Hello, name and name2'
 		expect(service.get('%1 %2 %3 %4 %5 %6 %7 %8 %9 %10', 1, 2, 3, 4, 5, 6, 7, 8, 9, 10)).toBe '1 2 3 4 5 6 7 8 9 10'
 
+	it 'should fallback to fallback language if no locale for current language is present', ->
+		expect(service.get('not-existing-message')).toBe 'not-existing-message'
+		service.setFallbackLocale 'en-CA'
+		expect(service.get('not-existing-message')).toBe 'This exists only in en-CA'
+
 describe 'l10n directives', ->
 	compile = null
 	scope = null