Make better wording at the top of the page listing subsets of public bodies. At the same time, cause the tests not to rely on WDTK data. Fixes #396

1 files changed, 3 insertions, 4 deletions

diff --git a/lib/public_body_categories.rb b/lib/public_body_categories.rb
index 21a021d39..796b1d53d 100644
--- a/lib/public_body_categories.rb
+++ b/lib/public_body_categories.rb
@@ -20,7 +20,7 @@ class PublicBodyCategories
     end
 
     def PublicBodyCategories.get
-        load_categories() if @@CATEGORIES.nil?          
+        load_categories if @@CATEGORIES.empty?
         @@CATEGORIES[I18n.locale.to_s] || @@CATEGORIES[I18n.default_locale.to_s] || PublicBodyCategories.new([])
     end
 
@@ -30,10 +30,9 @@ class PublicBodyCategories
     end
     
     private
-    @@CATEGORIES = nil
+    @@CATEGORIES = {}
     
     def PublicBodyCategories.load_categories()
-        @@CATEGORIES = {} if @@CATEGORIES.nil?
         I18n.available_locales.each do |locale|
             begin
                 load "public_body_categories_#{locale}.rb"
@@ -41,4 +40,4 @@ class PublicBodyCategories
             end
         end
     end
-end
\ No newline at end of file
+end