Merge branch 'release/0.12' into wdtk

Conflicts:
    locale/he_IL/app.po
    locale/hr_HR/app.po
    locale/nb_NO/app.po
    locale/uk/app.po
    spec/models/info_request_spec.rb

1 files changed, 7 insertions, 5 deletions

diff --git a/lib/tasks/themes.rake b/lib/tasks/themes.rake
index cbd3d123e..a8d16f108 100644
--- a/lib/tasks/themes.rake
+++ b/lib/tasks/themes.rake
@@ -9,15 +9,17 @@ namespace :themes do
         File.join(plugin_dir, theme_name)
     end
 
+    def checkout(commitish)
+        puts "Checking out #{commitish}" if verbose
+        system "git checkout #{commitish}"
+    end
+
     def checkout_tag(version)
-        checkout_command = "git checkout #{usage_tag(version)}"
-        success = system(checkout_command)
-        puts "Using tag #{usage_tag(version)}" if verbose && success
-        success
+        checkout usage_tag(version)
     end
 
     def checkout_remote_branch(branch)
-        system("git checkout origin/#{branch}")
+        checkout "origin/#{branch}"
     end
 
     def usage_tag(version)