Merge branch 'master' into dashboard-master

spec/helpers/locales_helper_spec.rb

@@ -0,0 +1,33 @@
+require 'rails_helper'
+
+describe LocalesHelper do
+
+  context "Language names" do
+
+    let!(:default_enforce) { I18n.enforce_available_locales }
+
+    before do
+      I18n.enforce_available_locales = false
+    end
+
+    after do
+      I18n.backend.reload!
+      I18n.enforce_available_locales = default_enforce
+      I18n.backend.send(:init_translations)
+    end
+
+    it "returns the language name in i18n.language.name translation" do
+      keys = { language: {
+                 name: "World Language" }}
+
+      I18n.backend.store_translations(:wl, { i18n: keys })
+
+      expect(name_for_locale(:wl)).to eq("World Language")
+    end
+
+    it "retuns the locale key if i18n.language.name translation is not found" do
+      expect(name_for_locale(:wl)).to eq("wl")
+    end
+
+  end
+end