rails-girls-summer-of-code · nileshgulia1 · Dec 27, 2017 · Dec 28, 2017 · Dec 30, 2017 · Dec 30, 2017
diff --git a/.env-example b/.env-example
@@ -6,4 +6,4 @@ CAMO_HOST=https://rgsoc-teams-camo.herokuapp.com
 CAMO_KEY=supersecret
 
 # Google Maps API key for e.g. city autocomplete
-GOOGLE_MAPS_API_KEY=YourGoogleMapsAPIKey
+GOOGLE_MAPS_API_KEY=YourGoogleMapsAPIKey
diff --git a/app/models/application_draft.rb b/app/models/application_draft.rb
@@ -173,19 +173,19 @@ def ready?
 
   def different_projects_required
     if project1 && project1 == project2
-      errors.add(:projects, 'must not be selected twice')
+      errors.add(:projects, :too_many_selected)
     end
   end
 
   def accepted_projects_required
     if projects.any? { |p| p && !p.accepted? } # if they don't exist, the presence validation will handle it
-      errors.add(:projects, 'must have been accepted')
+      errors.add(:projects, :none_accepted)
     end
   end
 
   def only_one_application_draft_allowed
     unless team.application_drafts.where(season: season).none?
-      errors.add(:base, 'Only one application may be lodged')
+      errors.add(:base, :too_many_applications)
     end
   end
 
@@ -195,7 +195,7 @@ def set_current_season
 
   def students_confirmed?
     unless team.present? && team.students.all?{|student| student.confirmed? }
-      errors.add(:base, 'Please make sure every student confirmed the email address.')
+      errors.add(:base, :unconfirmed_email_address)
     end
   end
 

diff --git a/app/models/conference.rb b/app/models/conference.rb
@@ -29,7 +29,7 @@ def date_range
 
   def chronological_dates
     unless starts_on <= ends_on
-      errors.add(:ends_on, 'must be a later date than start date')
+      errors.add(:ends_on, :chronology_violation)
     end
   end
 

diff --git a/app/models/team.rb b/app/models/team.rb
@@ -186,7 +186,7 @@ def disallow_duplicate_members
   def limit_number_of_students
     students = roles.select{|r| r.name == 'student' && !r.marked_for_destruction?}
     return unless students.size > 2
-    errors.add(:roles, 'there cannot be more than 2 students on a team.')
+    errors.add(:roles, :too_many_students)
   end
 
   def two_students_present?

diff --git a/app/models/user.rb b/app/models/user.rb
@@ -220,7 +220,7 @@ def complete_from_github
 
   def immutable_github_handle
     return if new_record?
-    errors.add(:github_handle, "can't be changed") if changes_include?(:github_handle)
+    errors.add(:github_handle, :immutabilty_violation) if changes_include?(:github_handle)
   end
 
 end
diff --git a/config/database.yml.example b/config/database.yml.example
@@ -12,4 +12,4 @@ test:
 production:
   adapter: postgresql
   database: rgsocteams_production
-  host: localhost
+host: localhost
diff --git a/config/locales/en.yml b/config/locales/en.yml
@@ -89,3 +89,24 @@ en:
             attributes:
               user:
                 too_many_reviewers: too many reviewers
+          application_draft:
+            attributes:
+              projects:
+                too_many_selected: must not be selected twice
+                none_accepted: must have been accepted
+              base:
+                too_many_applications: Only one application may be lodged
+                unconfirmed_email_address: Please make sure every student confirmed the email address.
+          conference:
+            attributes:
+              ends_on:
+                chronology_violation: must be a later date than start date
+          team:
+            attributes:
+              roles:
+                too_many_students: there cannot be more than 2 students on a team.
 MSGS = { 
   duplicate_student_roles_singular: "%s already is a student on another team for #{Season.current.name}.", 
   duplicate_student_roles_plural: "%s already are students on another team for #{Season.current.name}." 
 } 
 def disallow_multiple_student_roles 
   students = User.with_role('student').joins(roles: :team).where(id: roles.map(&:user_id)). 
     where.not('roles.team_id' => id).where('teams.season_id' => season_id) 
   return if students.empty? 
   msg = MSGS[:"duplicate_student_roles_#{students.size == 1 ? 'singular' : 'plural'}"] 
   errors.add :base, msg % students.map(&:name).join(', ') 
 end 
 def disallow_duplicate_members 
   new_members = roles.map { |role| role.user } 
   duplicate_role_users = new_members.find_all { |member| new_members.count(member) > 1 }.uniq 
   return if duplicate_role_users.empty? 
   msg = "%s can't have more than one role in this team!" 
   errors.add :base, msg % duplicate_role_users.map(&:name).join(', ') 
 end 
 MSGS = { 
   duplicate_student_roles_singular: "%s already is a student on another team for #{Season.current.name}.", 
   duplicate_student_roles_plural: "%s already are students on another team for #{Season.current.name}." 
 } 
  
 def disallow_multiple_student_roles 
   students = User.with_role('student').joins(roles: :team).where(id: roles.map(&:user_id)). 
     where.not('roles.team_id' => id).where('teams.season_id' => season_id) 
   return if students.empty? 
   msg = MSGS[:"duplicate_student_roles_#{students.size == 1 ? 'singular' : 'plural'}"] 
   errors.add :base, msg % students.map(&:name).join(', ') 
 end 
  
 def disallow_duplicate_members 
   new_members = roles.map { |role| role.user } 
   duplicate_role_users = new_members.find_all { |member| new_members.count(member) > 1 }.uniq 
   return if duplicate_role_users.empty? 
   msg = "%s can't have more than one role in this team!" 
   errors.add :base, msg % duplicate_role_users.map(&:name).join(', ') 
 end 
+          user:
+            attributes:
+              github_handle:
+                immutabilty_violation: can't be changed
+