diff --git a/config/locales/en/i18n.yml b/config/locales/en/i18n.yml
new file mode 100644
index 000000000..65fdd3ed5
--- /dev/null
+++ b/config/locales/en/i18n.yml
@@ -0,0 +1,4 @@
+en:
+  i18n:
+    language:
+      name: "English"
\ No newline at end of file
diff --git a/config/locales/es/i18n.yml b/config/locales/es/i18n.yml
new file mode 100644
index 000000000..8df5d7ec1
--- /dev/null
+++ b/config/locales/es/i18n.yml
@@ -0,0 +1,4 @@
+es:
+  i18n:
+    language:
+      name: "Español"
\ No newline at end of file
diff --git a/config/locales/fr/i18n.yml b/config/locales/fr/i18n.yml
new file mode 100644
index 000000000..911aa3352
--- /dev/null
+++ b/config/locales/fr/i18n.yml
@@ -0,0 +1,4 @@
+fr:
+  i18n:
+    language:
+      name: "Français"
\ No newline at end of file
diff --git a/config/locales/he/i18n.yml b/config/locales/he/i18n.yml
new file mode 100644
index 000000000..003edcd71
--- /dev/null
+++ b/config/locales/he/i18n.yml
@@ -0,0 +1,4 @@
+he:
+  i18n:
+    language:
+      name: "עברית"
\ No newline at end of file
diff --git a/config/locales/nl/i18n.yml b/config/locales/nl/i18n.yml
new file mode 100644
index 000000000..c85ec1294
--- /dev/null
+++ b/config/locales/nl/i18n.yml
@@ -0,0 +1,4 @@
+nl:
+  i18n:
+    language:
+      name: "Nederlands"
\ No newline at end of file
diff --git a/config/locales/pt-BR/i18n.yml b/config/locales/pt-BR/i18n.yml
new file mode 100644
index 000000000..a9a624a68
--- /dev/null
+++ b/config/locales/pt-BR/i18n.yml
@@ -0,0 +1,4 @@
+pt-BR:
+  i18n:
+    language:
+      name: "Português brasileiro"
\ No newline at end of file
diff --git a/config/locales/val/i18n.yml b/config/locales/val/i18n.yml
new file mode 100644
index 000000000..59e13344b
--- /dev/null
+++ b/config/locales/val/i18n.yml
@@ -0,0 +1,4 @@
+val:
+  i18n:
+    language:
+      name: "Valencià"
\ No newline at end of file
diff --git a/spec/features/localization_spec.rb b/spec/features/localization_spec.rb
index 255847991..edda6f693 100644
--- a/spec/features/localization_spec.rb
+++ b/spec/features/localization_spec.rb
@@ -52,7 +52,7 @@ feature 'Localization' do
   context "Missing language names" do
 
     let!(:default_enforce) { I18n.enforce_available_locales }
-    let!(:default_locales) { I18n.available_locales }
+    let!(:default_locales) { I18n.available_locales.dup }
 
     before do
       I18n.enforce_available_locales = false
@@ -63,6 +63,7 @@ feature 'Localization' do
     after do
       I18n.enforce_available_locales = default_enforce
       I18n.available_locales = default_locales
+      I18n.locale = I18n.default_locale
     end
 
     scenario 'Available locales without language translation display locale key' do