Localisation updates from https://translatewiki.net.

[rails.git] / app / helpers / banner_helper.rb

diff --git a/app/helpers/banner_helper.rb b/app/helpers/banner_helper.rb
index 98308ae12a2b87e3a6f0bef937dd78a4a6206237..17c6eace3d4eb2cf4c4f24e5d208ab07925acdd7 100644 (file)
--- a/app/helpers/banner_helper.rb
+++ b/app/helpers/banner_helper.rb
@@ -4,10 +4,10 @@ module BannerHelper
       enddate = v[:enddate]
       begin
         parsed = enddate && Date.parse(enddate)
       enddate = v[:enddate]
       begin
         parsed = enddate && Date.parse(enddate)

-      rescue
+      rescue StandardError

         parsed = nil
       end
         parsed = nil
       end

-      parsed.is_a?(Date) && parsed.past?
+      !parsed.is_a?(Date) || (parsed.is_a?(Date) && parsed.past?)

     end
   end
 
     end
   end
 


@@ -17,6 +17,7 @@ module BannerHelper
     banner_key = nil
     cookie_key = nil
     min_index = 9999
     banner_key = nil
     cookie_key = nil
     min_index = 9999

+    min_date = Date.new(9999, 1, 1)

 
     banners.each do |k, v|
       ckey = banner_cookie(v[:id]).to_sym
 
     banners.each do |k, v|
       ckey = banner_cookie(v[:id]).to_sym


@@ -25,14 +26,19 @@ module BannerHelper
 
       # rotate all banner queue positions
       index = cval.to_i
 
       # rotate all banner queue positions
       index = cval.to_i

-      cookies[ckey] = index - 1 if index > 0
+      cookies[ckey] = index - 1 if index.positive?

 
 

-      # pick banner with mininum queue position
+      # pick banner with minimum queue position

       next if index > min_index
 
       next if index > min_index
 

+      # or if equal queue position, pick banner with soonest end date (i.e. next expiring)
+      end_date = Date.parse(v[:enddate])
+      next if index == min_index && end_date > min_date
+

       banner_key = k
       cookie_key = ckey
       min_index = index
       banner_key = k
       cookie_key = ckey
       min_index = index

+      min_date = end_date

     end
 
     unless banner_key.nil?
     end
 
     unless banner_key.nil?