# HG changeset patch
# User bsw
# Date 1540385396 -7200
# Node ID 7cdc537f991f76ad9da01c80bbcb56ff48ee8965
# Parent  4f4a42bb84ec192cd7d28227ef8829c309728338
Show correct quorum in initiative not admitted info

diff -r 4f4a42bb84ec -r 7cdc537f991f app/main/initiative/_sidebar_state.lua
--- a/app/main/initiative/_sidebar_state.lua	Wed Oct 24 14:41:00 2018 +0200
+++ b/app/main/initiative/_sidebar_state.lua	Wed Oct 24 14:49:56 2018 +0200
@@ -71,7 +71,20 @@
     attr = { class = "sectionRow not_admitted_info" },
     content = function ()
       ui.heading { level = 1, content = _"Initiative not admitted" }
-      ui.container { content = _("This initiative has not been admitted! It failed the 2nd quorum of #{quorum}.", { quorum = format.percentage ( policy.initiative_quorum_num / policy.initiative_quorum_den ) } ) }
+      local num = policy.initiative_quorum_num                                                                                                        
+      local den = policy.initiative_quorum_den                                                                                                        
+      local quorums = {}                                                                                                                              
+      if num and num > 0 and den == 100 or den == 10 then                                                                                             
+        table.insert(quorums, _("#{percentage}%", { percentage = num * 100 / den }))                                                                  
+      elseif num and num > 0 and den and den > 0 then                                                                                                 
+        table.insert(quorums, num .. "/" .. den)                                                                                                      
+      end                                                                                                                                             
+      if policy.initiative_quorum then                                                                                                                
+        table.insert(quorums, policy.initiative_quorum)                                                                                               
+      end                                                                                                                                             
+      local quorum = table.concat(quorums, " / ")                                                                                                     
+                                                                                                                                                      
+      ui.container { content = _("This initiative has not been admitted! It failed the 2nd quorum of #{quorum}.", { quorum = quorum } ) }             
     end
   }
 end