[Jifty-commit] r5065 - jifty/branches/jquery/share/plugins/Jifty/Plugin/I18N/web/static/js

[Jifty commits]

Author: gugod
Date: Thu Feb  7 10:30:06 2008
New Revision: 5065

Modified:
   jifty/branches/jquery/share/plugins/Jifty/Plugin/I18N/web/static/js/loc.js

Log:
Replace Ajax.Request with jQuery.ajax in loc.js
Also, it's not really necessary to use extend method in this case.


Modified: jifty/branches/jquery/share/plugins/Jifty/Plugin/I18N/web/static/js/loc.js
==============================================================================
--- jifty/branches/jquery/share/plugins/Jifty/Plugin/I18N/web/static/js/loc.js	(original)
+++ jifty/branches/jquery/share/plugins/Jifty/Plugin/I18N/web/static/js/loc.js	Thu Feb  7 10:30:06 2008
@@ -1,4 +1,4 @@
-Localization = jQuery.extend(new Object(), {
+Localization = {
     init: function(params) {
         this.lang = params.lang || 'en';
         if (params["dict_path"]) {
@@ -10,22 +10,21 @@
         this.dict = this.load_dict(lang);
     },
     load_dict: function(lang) {
-        var d;
-        new Ajax.Request(
-            this.dict_path + "/" + lang + ".json",
-            {
-                method: 'get',
-                asynchronous: false,
-                onComplete: function(t, obj) {
-                    eval("d = " + t.responseText || "{}");
-                }
+        var d = {};
+        jQuery.ajax({
+            url: this.dict_path + "/" + lang + ".json",
+            type: 'get',
+            asynchronous: fasle,
+            success: function(dict) {
+                eval("d = " + dict || "{}");
             }
-        );
+        });
+
         return d;
     },
     loc: function(str) {
         var dict = this.dict;
-        if (dict[str]) {
+        if (dict[str] != null) {
             return dict[str];
         }
         return str;
@@ -58,11 +57,10 @@
         if (minutes < 2880) return _('about one day');
         else return (Math.round(minutes / 1440) + _(' days'))
     }
-
-});
+};
 
 Localization.dict = {};
-_ = function() {
-    Localization.loc.apply(Localization, arguments);
-}
 
+window._ = function() {
+    return Localization.loc.apply(Localization, arguments);
+}