codeninjasllc/codecombat
1
0
Fork 0
mirror of https://github.com/codeninjasllc/codecombat.git synced 2025-04-04 17:19:47 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'kumabotz-coffeescript-convention'

Browse source
This commit is contained in:
Scott Erickson 2014-07-04 18:11:56 -07:00
commit 0c3d5c9882
1 changed files with 5 additions and 5 deletions

10
app/lib/utils.coffee
View file

@ -25,7 +25,7 @@ module.exports.normalizeFunc = (func_thing, object) ->
if _.isString(func_thing)
func = object[func_thing]
if not func
console.error('Could not find method', func_thing, 'in object', @)
console.error "Could not find method #{func_thing} in object #{@}"
return => null # always return a func, or Mediator will go boom
func_thing = func
return func_thing
@ -57,10 +57,10 @@ module.exports.i18n = (say, target, language=me.lang(), fallback='en') ->
if target of locale
result = locale[target]
else continue
return result if localeName == language
generalResult = result if localeName == generalName
fallbackResult = result if localeName == fallback
fallforwardResult = result if localeName.indexOf(language) == 0 and not fallforwardResult?
return result if localeName is language
generalResult = result if localeName is generalName
fallbackResult = result if localeName is fallback
fallforwardResult = result if localeName.indexOf(language) is 0 and not fallforwardResult?
return generalResult if generalResult?
return fallforwardResult if fallforwardResult?