Prioritise strings[].name over strings[].community

[rails.git] / app / models / communities.rb

diff --git a/app/models/communities.rb b/app/models/communities.rb
index 05e330b265383c6cc0d90f56c0042a2f0f7fbf31..008735224ef89235e0faff8f36f3c5565b329484 100644 (file)
--- a/app/models/communities.rb
+++ b/app/models/communities.rb
@@ -4,11 +4,11 @@ class Communities
   @local_chapters = {}
 
   def self.local_chapters(locale)
-    @local_chapters[locale] = local_chapter_for(locale)
+    @local_chapters[locale] ||= local_chapter_for(locale)
   end
 
   def self.local_chapter_for(locale)
-    @local_chapters_index = load_local_chapters
+    @local_chapters_index ||= load_local_chapters
     locale_dict = locale_dict_for(locale)
     localised_chapters = []
     @local_chapters_index.each do |chapter|
@@ -29,7 +29,7 @@ class Communities
         next unless key == "type" && value == "osm-lc" && id != "OSMF"
 
         strings = resource["strings"]
-        chapter_name = strings["community"] || strings["name"]
+        chapter_name = strings["name"] || "!! " + strings["community"]
         url = strings["url"]
         local_chapters.push({ :id => id, :name => chapter_name, :url => url })
       end