[language-selection] Making languages only save the language abbreviation

Rodrigo Souto
1 parent 407767bb
Showing 2 changed files with 13 additions and 13 deletions Show diff stats
app/models/environment.rb
test/unit/environment_test.rb
@@ -777,7 +777,11 @@ class Environment &lt; ActiveRecord::Base
   validate :languages_available
   def locales
-    languages || Noosfero.locales
+    if languages.present?
+      languages.inject({}) {|r, l| r.merge({l => Noosfero.locales[l]})}
+    else
+      Noosfero.locales
+    end
   end
   def default_locale
@@ -803,8 +807,8 @@ class Environment &lt; ActiveRecord::Base
   def languages_available
     if languages.present?
-      languages.each do |key, value|
-        if Noosfero.locales[key] != value
+      languages.each do |language|
+        if !Noosfero.available_locales.include?(language)
           errors.add(:languages, _('have unsupported languages.'))
           break
         end
@@ -1246,17 +1246,12 @@ class EnvironmentTest &lt; ActiveSupport::TestCase
   should 'allow only languages there are defined in locales' do
     environment = Environment.default
-    Noosfero.stubs(:locales).returns({'en' => 'English'})
-    environment.languages = {'pt' => 'Português'}
+    environment.languages = ['zz']
     environment.valid?
     assert environment.errors.invalid?(:languages)
-    environment.languages = {'en' => 'Bli blo'}
-    environment.valid?
-    assert environment.errors.invalid?(:languages)
-
-    environment.languages = {'en' => 'English'}
+    environment.languages = ['en']
     environment.valid?
     assert !environment.errors.invalid?(:languages)
   end
@@ -1267,9 +1262,10 @@ class EnvironmentTest &lt; ActiveSupport::TestCase
     environment.save!
     assert_equal Noosfero.locales, environment.locales
-    environment.languages = {'en' => 'English'}
+    environment.languages = ['en']
     environment.save!
-    assert_equal environment.languages, environment.locales
+    hash = {'en' => 'English'}
+    assert_equal hash, environment.locales
   end
   should 'define available_locales or use the config available_locales' do
@@ -1278,7 +1274,7 @@ class EnvironmentTest &lt; ActiveSupport::TestCase
     environment.save!
     assert_equal Noosfero.available_locales, environment.available_locales
-    environment.languages = {'pt' => 'Português', 'en' => 'English'}
+    environment.languages = ['pt', 'en']
     environment.save!
     assert_equal ['en', 'pt'], environment.available_locales
   end