The method wrapping default behaviour now receives the filename as a parameter

Author: LonelyPrincess

dist/jquery.localize.js

@@ -18,7 +18,7 @@ http://keith-wood.name/localisation.html
   };
   $.defaultLanguage = normaliseLang(navigator.languages && navigator.languages.length > 0 ? navigator.languages[0] : navigator.language || navigator.userLanguage);
   $.localize = function(pkg, options) {
-    var defaultCallback, deferred, fileExtension, intermediateLangData, jsonCall, loadLanguage, localizeElement, localizeForSpecialKeys, localizeImageElement, localizeInputElement, localizeOptgroupElement, notifyDelegateLanguageLoaded, regexify, setAttrFromValueForKey, setTextFromValueForKey, translateFromFile, translateFromObject, valueForKey, wrappedSet;
+    var defaultCallback, deferred, fileExtension, intermediateLangData, jsonCall, loadLanguage, localizeElement, localizeForSpecialKeys, localizeImageElement, localizeInputElement, localizeOptgroupElement, notifyDelegateLanguageLoaded, regexify, setAttrFromValueForKey, setTextFromValueForKey, useFileAsDataSource, useObjectAsDataSource, valueForKey, wrappedSet;
     if (options == null) {
       options = {};
     }
@@ -180,25 +180,25 @@ http://keith-wood.name/localisation.html
         return string_or_regex_or_array;
       }
     };
-    translateFromFile = function() {
+    useFileAsDataSource = function(filename) {
       var lang;
       lang = normaliseLang(options.language ? options.language : $.defaultLanguage);
       if (options.skipLanguage && lang.match(regexify(options.skipLanguage))) {
         return deferred.resolve();
       } else {
-        return loadLanguage(pkg, lang, 1);
+        return loadLanguage(filename, lang, 1);
       }
     };
-    translateFromObject = function(object) {
+    useObjectAsDataSource = function(object) {
       var data;
       data = JSON.parse(JSON.stringify(object));
       defaultCallback(data);
       return deferred.resolve();
     };
     if (typeof pkg === "object") {
-      translateFromObject(pkg);
+      useObjectAsDataSource(pkg);
     } else {
-      translateFromFile();
+      useFileAsDataSource(pkg);
     }
     wrappedSet.localizePromise = deferred;
     return wrappedSet;

dist/jquery.localize.min.js

@@ -136,16 +136,16 @@ do ($ = jQuery) ->
       else
         string_or_regex_or_array
 
-    # Retrieve translations from an external file based on required language
-    translateFromFile = () ->
+    # Retrieve translations from an external file depending on required language
+    useFileAsDataSource = (filename) ->
       lang = normaliseLang(if options.language then options.language else $.defaultLanguage)
       if (options.skipLanguage && lang.match(regexify(options.skipLanguage)))
         deferred.resolve()
       else
-        loadLanguage(pkg, lang, 1)
+        loadLanguage(filename, lang, 1)
 
     # Retrieve translations from an object
-    translateFromObject = (object) ->
+    useObjectAsDataSource = (object) ->
       # We stringify and parse the received object to ensure the object is a valid json
       # Any functions defined within the object will be removed during this process
       data = JSON.parse(JSON.stringify(object))
@@ -154,9 +154,9 @@ do ($ = jQuery) ->
 
     # If 'pkg' is an object, use it as the source for translations
     if typeof(pkg) == "object"
-      translateFromObject(pkg)
+      useObjectAsDataSource(pkg)
     else
-      translateFromFile()
+      useFileAsDataSource(pkg)
 
     wrappedSet.localizePromise = deferred