]> gitweb.fluxo.info Git - lorea/elgg.git/commitdiff
Commented elgg.add_translation
authorewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
Sat, 20 Nov 2010 06:59:48 +0000 (06:59 +0000)
committerewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
Sat, 20 Nov 2010 06:59:48 +0000 (06:59 +0000)
Utilizing elgg.extend instead of $.extend

git-svn-id: http://code.elgg.org/elgg/trunk@7362 36083f99-b078-4883-b0ff-0f9b5a30f544

js/lib/languages.js

index 82cfa7a01320b85ba869a79fa524d8bd29f03187..0ac6545087d4ef4e209428d3b3683641911888a5 100644 (file)
@@ -6,10 +6,14 @@ elgg.provide('elgg.config.translations');
 \r
 elgg.config.language = 'en';\r
 \r
+/**\r
+ * Analagous to the php version.  Merges translations for a\r
+ * given language into the current translations map.\r
+ */\r
 elgg.add_translation = function(lang, translations) {\r
        elgg.provide('elgg.config.translations.' + lang);\r
 \r
-       $.extend(elgg.config.translations[lang], translations);\r
+       elgg.extend(elgg.config.translations[lang], translations);\r
 };\r
 \r
 /**\r