app/controllers/settings_controller.rb in social_stream-base-0.12.0 vs app/controllers/settings_controller.rb in social_stream-base-0.12.1

@@ -25,10 +25,14 @@
       #Updating language
       if section.eql? "language"
         #Preferred language setting
         if params[:language].present?
           lang = params[:language].to_s
-          current_user.language = lang[0..1]
+          if lang == 'browser'
+            current_user.language = nil
+          else
+            current_user.language = lang[0..1]
+          end
         end
       end
 
       #Here sections to add
       #if section.eql? "section_name"