From 1bf6faf54be2bd302045720bfaf44864f05f815a Mon Sep 17 00:00:00 2001
From: Godwin <goodgodwin@hotmail.com>
Date: Sat, 21 May 2016 13:57:09 -0700
Subject: [PATCH] Fixed deployment and added Spanish translations

---
 app/models/conference_registration_form_field.rb | 10 ++++------
 app/views/shared/_footer.html.haml               |  2 +-
 config/initializers/sorcery.rb                   |  3 ---
 config/locales/es.yml                            |  4 ++--
 4 files changed, 7 insertions(+), 12 deletions(-)

diff --git a/app/models/conference_registration_form_field.rb b/app/models/conference_registration_form_field.rb
index b70a7cc..2e400f5 100644
--- a/app/models/conference_registration_form_field.rb
+++ b/app/models/conference_registration_form_field.rb
@@ -1,6 +1,4 @@
-class ConferenceRegistrationFormField < ActiveRecord::Base
-    belongs_to :conference
-    belongs_to :registration_form_field
-
-    acts_as_list
-end
+class ConferenceRegistrationFormField < ActiveRecord::Base
+    belongs_to :conference
+    belongs_to :registration_form_field
+end
diff --git a/app/views/shared/_footer.html.haml b/app/views/shared/_footer.html.haml
index 10261f6..13dc095 100644
--- a/app/views/shared/_footer.html.haml
+++ b/app/views/shared/_footer.html.haml
@@ -14,7 +14,7 @@
 		- if locale.to_s != I18n.locale.to_s # don't show the current locale
 			%li
 				- 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
 .copy
 	=_'links.footer.help_text.contributors', 'Who contributed to building this website' do |title|
diff --git a/config/initializers/sorcery.rb b/config/initializers/sorcery.rb
index 28cdd99..a385746 100644
--- a/config/initializers/sorcery.rb
+++ b/config/initializers/sorcery.rb
@@ -203,19 +203,16 @@ Rails.application.config.sorcery.configure do |config|
     # use an external encryption class.
     # Default: `nil`
     #
-    user.custom_encryption_provider = Sorcery::CryptoProviders::DrupalPassword
 
 
     # encryption algorithm name. See 'encryption_algorithm=' for available options.
     # Default: `:bcrypt`
     #
-    user.encryption_algorithm = :custom#:sha512
 
 
     # make this configuration inheritable for subclasses. Useful for ActiveRecord's STI.
     # Default: `false`
     #
-    user.subclasses_inherit_config = true
 
 
     # -- remember_me --
diff --git a/config/locales/es.yml b/config/locales/es.yml
index 3a19972..6df896b 100644
--- a/config/locales/es.yml
+++ b/config/locales/es.yml
@@ -1010,8 +1010,8 @@ es:
       Please_Confirm_Email: Página no encontrada
     '404':
       Page_Not_Found: Crear un taller
-    Policy: 'Policy'
-    About: 'About'
+    Policy: 'Política'
+    About: 'Acerca de'
   actions:
     workshops:
       create: Crear