From 683654aaa58c2e4963ed9bd97efcab7a5d8ea80e Mon Sep 17 00:00:00 2001 From: Daniel Gaiottino Date: Tue, 29 Mar 2011 10:11:21 +0200 Subject: [PATCH 1/2] If no value is found, return the key instead of null --- lib/javascripts/babilu.js | 3 +++ 1 file changed, 3 insertions(+) diff --git a/lib/javascripts/babilu.js b/lib/javascripts/babilu.js index bf16833..2a8247e 100644 --- a/lib/javascripts/babilu.js +++ b/lib/javascripts/babilu.js @@ -54,6 +54,9 @@ var value = this.lookup(key, opts.defaultValue); if (typeof value != "string" && value) value = this.pluralize(value, opts.count); if (typeof value == "string") value = interpolate(value, opts); + + if (value === null || value === undefined) return key; + return value; } }; From d1153802d27c0ff696dc71c1a46edcc5305ae26e Mon Sep 17 00:00:00 2001 From: Daniel Gaiottino Date: Tue, 29 Mar 2011 11:20:40 +0200 Subject: [PATCH 2/2] returning the key instead of the key array --- lib/javascripts/babilu.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/javascripts/babilu.js b/lib/javascripts/babilu.js index 2a8247e..9e66113 100644 --- a/lib/javascripts/babilu.js +++ b/lib/javascripts/babilu.js @@ -50,8 +50,8 @@ } else { opts = opts || {}; opts.defaultValue = opts.defaultValue || null; - key = keyToArray(opts.scope).concat(keyToArray(key)); - var value = this.lookup(key, opts.defaultValue); + keyArray = keyToArray(opts.scope).concat(keyToArray(key)); + var value = this.lookup(keyArray, opts.defaultValue); if (typeof value != "string" && value) value = this.pluralize(value, opts.count); if (typeof value == "string") value = interpolate(value, opts);