forked from External/greenlight
		
	Default to EN if language is not recognized (#805)
This commit is contained in:
		
				
					committed by
					
						 Jesus Federico
						Jesus Federico
					
				
			
			
				
	
			
			
			
						parent
						
							e13e762349
						
					
				
				
					commit
					6d29422c31
				
			| @@ -99,7 +99,14 @@ class ApplicationController < ActionController::Base | |||||||
|     else |     else | ||||||
|       http_accept_language.language_region_compatible_from(I18n.available_locales) |       http_accept_language.language_region_compatible_from(I18n.available_locales) | ||||||
|     end |     end | ||||||
|  |  | ||||||
|  |     begin | ||||||
|       I18n.locale = locale.tr('-', '_') unless locale.nil? |       I18n.locale = locale.tr('-', '_') unless locale.nil? | ||||||
|  |     rescue | ||||||
|  |       # Default to English if there are any issues in language | ||||||
|  |       logger.error("Support: User locale is not supported (#{locale}") | ||||||
|  |       I18n.locale = "en" | ||||||
|  |     end | ||||||
|   end |   end | ||||||
|  |  | ||||||
|   # Checks to make sure that the admin has changed his password from the default |   # Checks to make sure that the admin has changed his password from the default | ||||||
|   | |||||||
| @@ -80,6 +80,20 @@ describe ApplicationController do | |||||||
|     end |     end | ||||||
|   end |   end | ||||||
|  |  | ||||||
|  |   context "setters" do | ||||||
|  |     it "sets the user locale correctly" do | ||||||
|  |       user = create(:user, language: "ru-RU") | ||||||
|  |  | ||||||
|  |       expect(controller.user_locale(user)).to eql("ru_RU") | ||||||
|  |     end | ||||||
|  |  | ||||||
|  |     it "defaults to English locale if invalid language is set" do | ||||||
|  |       user = create(:user, language: "ru") | ||||||
|  |  | ||||||
|  |       expect(controller.user_locale(user)).to eql("en") | ||||||
|  |     end | ||||||
|  |   end | ||||||
|  |  | ||||||
|   context "allow_greenlight_accounts" do |   context "allow_greenlight_accounts" do | ||||||
|     it "allows if user sign up is turned on" do |     it "allows if user sign up is turned on" do | ||||||
|       allow(Rails.configuration).to receive(:loadbalanced_configuration).and_return(false) |       allow(Rails.configuration).to receive(:loadbalanced_configuration).and_return(false) | ||||||
|   | |||||||
		Reference in New Issue
	
	Block a user