From e402a4093d0d4786e32cac931eb940523c63cd61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonne=20Ha=C3=9F?= <me@mrzyx.de>
Date: Sun, 9 Feb 2014 13:01:00 +0100
Subject: [PATCH] Actually load a different section when requested in
 get_javascript_strings_for, add spec for changes in JS i18n helper

---
 app/helpers/language_helper.rb        |  2 +-
 spec/javascripts/widgets/i18n-spec.js | 10 ++++++++++
 2 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/app/helpers/language_helper.rb b/app/helpers/language_helper.rb
index 318af4088..13ef1b5c1 100644
--- a/app/helpers/language_helper.rb
+++ b/app/helpers/language_helper.rb
@@ -11,7 +11,7 @@ module LanguageHelper
     defaults = I18n.t(section, :locale => DEFAULT_LANGUAGE)
 
     if language != DEFAULT_LANGUAGE
-      translations = I18n.t('javascripts', :locale => language)
+      translations = I18n.t(section, :locale => language)
       defaults.deep_merge!(translations)
     end
 
diff --git a/spec/javascripts/widgets/i18n-spec.js b/spec/javascripts/widgets/i18n-spec.js
index b25c8afa7..f48a96107 100644
--- a/spec/javascripts/widgets/i18n-spec.js
+++ b/spec/javascripts/widgets/i18n-spec.js
@@ -28,6 +28,16 @@ describe("Diaspora", function() {
 
           expect(Diaspora.I18n.locale).toEqual(locale);
         });
+
+        it("extends the class's locale variable on multiple calls", function() {
+          var data = {another: 'section'},
+              extended = $.extend(locale, data);
+
+          Diaspora.I18n.loadLocale(locale);
+          Diaspora.I18n.loadLocale(data;
+
+          expect(Diaspora.I18n.locale).toEqual(extended);
+        });
       });
 
       describe("t", function() {