1 files changed, 23 insertions, 23 deletions
diff --git a/lib/tasks/gettext.rake b/lib/tasks/gettext.rake
index c73c2584e..3f357213f 100644
--- a/lib/tasks/gettext.rake
+++ b/lib/tasks/gettext.rake
@@ -1,7 +1,3 @@
-# Rails won't automatically load rakefiles from gems - see
-# http://stackoverflow.com/questions/1878640/including-rake-tasks-in-gems
-Dir["#{Gem.searcher.find('gettext_i18n_rails').full_gem_path}/lib/tasks/**/*.rake"].each { |ext| load ext }
-
 namespace :gettext do
 
   desc 'Rewrite .po files into a consistent msgmerge format'
@@ -13,27 +9,31 @@ namespace :gettext do
     end
   end
 
-  desc "Update pot file only, without fuzzy guesses (these are done by Transifex)"
-  task :findpot => :environment do
+  desc "Update pot/po files for a theme."
+  task :find_theme => :environment do
+    theme = ENV['THEME']
+    unless theme
+        puts "Usage: Specify an Alaveteli-theme with THEME=[theme directory name]"
+        exit(0)
+    end
     load_gettext
-    $LOAD_PATH << File.join(File.dirname(__FILE__),'..','..','lib')
-    require 'gettext_i18n_rails/haml_parser'
-    files = files_to_translate
+    msgmerge = Rails.application.config.gettext_i18n_rails.msgmerge
+    msgmerge ||= %w[--sort-output --no-location --no-wrap]
+    GetText.update_pofiles_org(
+      text_domain,
+      theme_files_to_translate(theme),
+      "version 0.0.1",
+      :po_root => theme_locale_path(theme),
+      :msgmerge => msgmerge
+     )
+   end
 
-    #write found messages to tmp.pot
-    temp_pot = "tmp.pot"
-    GetText::rgettext(files, temp_pot)
+   def theme_files_to_translate(theme)
+       Dir.glob("{lib/themes/#{theme}/lib}/**/*.{rb,erb}")
+   end
 
-    #merge tmp.pot and existing pot
-    FileUtils.mkdir_p('locale')
-    GetText::msgmerge("locale/app.pot", temp_pot, "alaveteli",  :po_root => 'locale', :msgmerge=>[ :no_wrap, :sort_output ])
-    Dir.glob("locale/*/app.po") do |po_file|
-      GetText::msgmerge(po_file, temp_pot, "alaveteli", :po_root => 'locale', :msgmerge=>[ :no_wrap, :sort_output ])
-    end
-    File.delete(temp_pot)
-  end
+   def theme_locale_path(theme)
+     Rails.root.join "lib", "themes", theme, "locale-theme"
+   end
 
-  def files_to_translate
-    Dir.glob("{app,lib,config,locale}/**/*.{rb,erb,haml,rhtml}")
-  end
 end