merged in changes from devel

[selectricity] / config / environment.rb

diff --git a/config/environment.rb b/config/environment.rb
index 82c746617b7da09e2ca108fe147f9e934ca55afd..ccd9ad0990874b6b4bb92d6260caa52a891b9982 100644 (file)
--- a/config/environment.rb
+++ b/config/environment.rb
@@ -66,10 +66,10 @@ require 'randarray'
 require 'gruff-0.2.8/lib/gruff'
 require 'sparklines'
 require 'rubyvote'
 require 'gruff-0.2.8/lib/gruff'
 require 'sparklines'
 require 'rubyvote'

-ELECTION_TYPES = {'ssd' => "Schulze Sequential Dropping",
-                  'plurality' => "Plurality/First Past the Post",
-                  'approval' => "Approval (Top Two)",
-                  'condorcet' => "Simple Condorcet",
+ELECTION_TYPES = {'ssd' => "Schulze Method",
+                  'plurality' => "Plurality",
+                  'approval' => "Approval",
+                  'condorcet' => "Condorcet",

                   'borda' => "Borda Count"}
 
 class String
                   'borda' => "Borda Count"}
 
 class String