Fixed deployment and added Spanish translations
This commit is contained in:
		
							parent
							
								
									6ad06697c5
								
							
						
					
					
						commit
						39c2486be0
					
				| @ -1,6 +1,4 @@ | |||||||
| class ConferenceRegistrationFormField < ActiveRecord::Base | class ConferenceRegistrationFormField < ActiveRecord::Base | ||||||
|     belongs_to :conference |     belongs_to :conference | ||||||
|     belongs_to :registration_form_field |     belongs_to :registration_form_field | ||||||
| 
 |  | ||||||
|     acts_as_list |  | ||||||
| end | end | ||||||
|  | |||||||
| @ -14,7 +14,7 @@ | |||||||
| 		- if locale.to_s != I18n.locale.to_s # don't show the current locale | 		- if locale.to_s != I18n.locale.to_s # don't show the current locale | ||||||
| 			%li | 			%li | ||||||
| 				- locale_translation = _("languages.#{locale}", locale: locale) | 				- locale_translation = _("languages.#{locale}", locale: locale) | ||||||
| 				%a{href: url_for(params.merge(url_params(locale)))} | 				%a{href: url_for_locale(locale)} | ||||||
| 					=_'translate.content.change_locale', "Read in #{locale_translation}", vars: {language: locale_translation}, locale: locale | 					=_'translate.content.change_locale', "Read in #{locale_translation}", vars: {language: locale_translation}, locale: locale | ||||||
| .copy | .copy | ||||||
| 	=_'links.footer.help_text.contributors', 'Who contributed to building this website' do |title| | 	=_'links.footer.help_text.contributors', 'Who contributed to building this website' do |title| | ||||||
|  | |||||||
| @ -203,19 +203,16 @@ Rails.application.config.sorcery.configure do |config| | |||||||
|     # use an external encryption class. |     # use an external encryption class. | ||||||
|     # Default: `nil` |     # Default: `nil` | ||||||
|     # |     # | ||||||
|     user.custom_encryption_provider = Sorcery::CryptoProviders::DrupalPassword |  | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
|     # encryption algorithm name. See 'encryption_algorithm=' for available options. |     # encryption algorithm name. See 'encryption_algorithm=' for available options. | ||||||
|     # Default: `:bcrypt` |     # Default: `:bcrypt` | ||||||
|     # |     # | ||||||
|     user.encryption_algorithm = :custom#:sha512 |  | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
|     # make this configuration inheritable for subclasses. Useful for ActiveRecord's STI. |     # make this configuration inheritable for subclasses. Useful for ActiveRecord's STI. | ||||||
|     # Default: `false` |     # Default: `false` | ||||||
|     # |     # | ||||||
|     user.subclasses_inherit_config = true |  | ||||||
| 
 | 
 | ||||||
| 
 | 
 | ||||||
|     # -- remember_me -- |     # -- remember_me -- | ||||||
|  | |||||||
| @ -1010,8 +1010,8 @@ es: | |||||||
|       Please_Confirm_Email: Página no encontrada |       Please_Confirm_Email: Página no encontrada | ||||||
|     '404': |     '404': | ||||||
|       Page_Not_Found: Crear un taller |       Page_Not_Found: Crear un taller | ||||||
|     Policy: 'Policy' |     Policy: 'Política' | ||||||
|     About: 'About' |     About: 'Acerca de' | ||||||
|   actions: |   actions: | ||||||
|     workshops: |     workshops: | ||||||
|       create: Crear |       create: Crear | ||||||
|  | |||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user