2 files changed, 19 insertions, 8 deletions
diff --git a/Library/Contributions/cmd/brew-aspell-dictionaries b/Library/Contributions/cmd/brew-aspell-dictionaries
index 61a5e085e..86ce14904 100755
--- a/Library/Contributions/cmd/brew-aspell-dictionaries
+++ b/Library/Contributions/cmd/brew-aspell-dictionaries
@@ -40,8 +40,10 @@ EOF
 done
 
 cat <<EOF >> $brew_formulae_tmp_file
-def aspell_available_languages
-  %w(${langs})
+class Aspell < Formula
+  def self.available_languages
+    %w(${langs})
+  end
 end
 # END generated with `basename $0`
 EOF
diff --git a/Library/Formula/aspell.rb b/Library/Formula/aspell.rb
index dedf0679c..31fc743e4 100644
--- a/Library/Formula/aspell.rb
+++ b/Library/Formula/aspell.rb
@@ -465,8 +465,10 @@ class Aspell_zu < AspellLang
   mirror 'http://ftp.gnu.org/gnu/aspell/dict/zu/aspell-zu-0.50-0.tar.bz2'
   sha1 '0cba6163d1a1b9f63b1f5eaaeba466cdaf5f0742'
 end
-def aspell_available_languages
-  %w( af am ar ast az be bg bn br ca cs csb cy da de de_alt el en eo es et fa fi fo fr fy ga gd gl grc gu gv he hi hil hr hsb hu hus hy ia id is it kn ku ky la lt lv mg mi mk ml mn mr ms mt nb nds nl nn ny or pa pl pt_BR pt_PT qu ro ru rw sc sk sl sr sv sw ta te tet tk tl tn tr uk uz vi wa yi zu)
+class Aspell < Formula
+  def self.available_languages
+    %w( af am ar ast az be bg bn br ca cs csb cy da de de_alt el en eo es et fa fi fo fr fy ga gd gl grc gu gv he hi hil hr hsb hu hus hy ia id is it kn ku ky la lt lv mg mi mk ml mn mr ms mt nb nds nl nn ny or pa pl pt_BR pt_PT qu ro ru rw sc sk sl sr sv sw ta te tet tk tl tn tr uk uz vi wa yi zu)
+  end
 end
 # END generated with brew-aspell-dictionaries
 
@@ -482,7 +484,14 @@ class Aspell < Formula
   end
 
   option "all", "Install all available dictionaries"
-  aspell_available_languages.each { |lang| option "with-lang-#{lang}", "Install #{lang} dictionary" }
+
+  available_languages.each do |lang|
+    option "with-lang-#{lang}", "Install #{lang} dictionary"
+  end
+
+  def available_languages
+    self.class.available_languages
+  end
 
   def install
     system "./configure", "--prefix=#{prefix}"
@@ -490,17 +499,17 @@ class Aspell < Formula
 
     languages = []
 
-    aspell_available_languages.each do |lang|
+    available_languages.each do |lang|
       languages << lang if build.with? "lang-#{lang}"
     end
 
     if build.include? 'all'
-      languages << aspell_available_languages.to_a
+      languages.concat(available_languages)
     elsif languages.empty?
       languages << "en"
     end
 
-    languages.flatten.each do |lang|
+    languages.each do |lang|
       begin
         formula = Object.const_get("Aspell_" + lang).new
       rescue