Merge branch 'master' of http://github.com/fnp/wolnelektury

[wolnelektury.git] / wolnelektury / static / js / jquery.countdown-pl.js

diff --git a/wolnelektury/static/js/jquery.countdown-pl.js b/wolnelektury/static/js/jquery.countdown-pl.js
index 4d6d1d4..77a8a17 100644 (file)
--- a/wolnelektury/static/js/jquery.countdown-pl.js
+++ b/wolnelektury/static/js/jquery.countdown-pl.js
@@ -1,22 +1,17 @@
 /* http://keith-wood.name/countdown.html\r
  * Polish initialisation for the jQuery countdown extension\r
- * Written by Pawel Lewtak lewtak@gmail.com (2008) \r
- * and Radek Czajka radoslaw.czajka@nowoczesnapolska.org.pl (2010) */\r
+ * Written by Pawel Lewtak lewtak@gmail.com (2008) */\r
 (function($) {\r
        $.countdown.regional['pl'] = {\r
                labels: ['lat', 'miesięcy', 'tygodni', 'dni', 'godzin', 'minut', 'sekund'],\r
                labels1: ['rok', 'miesiąc', 'tydzień', 'dzień', 'godzina', 'minuta', 'sekunda'],\r
-        labels2: ['lata', 'miesiące', 'tygodnie', 'dni', 'godziny', 'minuty', 'sekundy'],\r
-               compactLabels: ['l', 'm', 't', 'd'],\r
-               compactLabels1: ['r', 'm', 't', 'd'],\r
-        compactLabels2: ['l', 'm', 't', 'd'],\r
-               timeSeparator: ':', isRTL: false,\r
-               which: function(n){\r
-                       return n==1 ? 1 : n%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 2 : 0;\r
-\r
-                       \r
-                       n == 1 ? 1 : 0;\r
-               }\r
-       };\r
+               labels2: ['lata', 'miesiące', 'tygodnie', 'dni', 'godziny', 'minuty', 'sekundy'],\r
+               compactLabels: ['l', 'm', 't', 'd'], compactLabels1: ['r', 'm', 't', 'd'],\r
+               whichLabels: function(amount) {\r
+                       var units = amount % 10;\r
+                       var tens = Math.floor((amount % 100) / 10);\r
+                       return (amount == 1 ? 1 : (units >= 2 && units <= 4 && tens != 1 ? 2 : 0));\r
+               },\r
+               timeSeparator: ':', isRTL: false};\r
        $.countdown.setDefaults($.countdown.regional['pl']);\r
 })(jQuery);\r