From: ewinslow <ewinslow@36083f99-b078-4883-b0ff-0f9b5a30f544>
Date: Sat, 20 Nov 2010 06:59:48 +0000 (+0000)
Subject: Commented elgg.add_translation
X-Git-Url: https://gitweb.fluxo.info/?a=commitdiff_plain;h=58794fd3d17801db697b4b6feb5ca0b3c7229e24;p=lorea%2Felgg.git

Commented elgg.add_translation
Utilizing elgg.extend instead of $.extend

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

diff --git a/js/lib/languages.js b/js/lib/languages.js
index 82cfa7a01..0ac654508 100644
--- a/js/lib/languages.js
+++ b/js/lib/languages.js
@@ -6,10 +6,14 @@ elgg.provide('elgg.config.translations');
 
 elgg.config.language = 'en';
 
+/**
+ * Analagous to the php version.  Merges translations for a
+ * given language into the current translations map.
+ */
 elgg.add_translation = function(lang, translations) {
 	elgg.provide('elgg.config.translations.' + lang);
 
-	$.extend(elgg.config.translations[lang], translations);
+	elgg.extend(elgg.config.translations[lang], translations);
 };
 
 /**