Fixes singular for negative values of intervals.

Fixes #14

Author: sdispater

pendulum/interval.py

@@ -66,15 +66,15 @@ def months(self):
 
     @property
     def weeks(self):
-        return self.days // 7
+        return abs(self.days) // 7 * self._sign(self._days)
 
     @property
     def days(self):
         return self._days
 
     @property
     def days_exclude_weeks(self):
-        return self._days % 7 * self._sign(self._days)
+        return abs(self._days) % 7 * self._sign(self._days)
 
     @property
     def hours(self):
@@ -100,7 +100,7 @@ def minutes(self):
     def seconds(self):
         if self._s is None:
             self._s = self._seconds
-            self._s = self._s % 60 * self._sign(self._s)
+            self._s = abs(self._s) % 60 * self._sign(self._s)
 
         return self._s
 

pendulum/lang/af.py

@@ -52,13 +52,13 @@
     },
 
     # Units of time
-    'year': ['1 jaar', '{count} jare'],
-    'month': ['1 maand', '{count} maande'],
-    'week': ['1 week', '{count} weke'],
-    'day': ['1 dag', '{count} dae'],
-    'hour': ['1 uur', '{count} ure'],
-    'minute': ['1 minuut', '{count} minute'],
-    'second': ['1 sekond', '{count} sekondes'],
+    'year': ['{count} jaar', '{count} jare'],
+    'month': ['{count} maand', '{count} maande'],
+    'week': ['{count} week', '{count} weke'],
+    'day': ['{count} dag', '{count} dae'],
+    'hour': ['{count} uur', '{count} ure'],
+    'minute': ['{count} minuut', '{count} minute'],
+    'second': ['{count} sekond', '{count} sekondes'],
 
     # Relative time
     'ago': '{time} terug',

pendulum/lang/bg.py

@@ -52,13 +52,13 @@
     },
 
     # Units of time
-    'year': ['1 година', '{count} години'],
-    'month': ['1 месец', '{count} месеца'],
-    'week': ['1 седмица', '{count} седмици'],
-    'day': ['1 ден', '{count} дни'],
-    'hour': ['1 час', '{count} часа'],
-    'minute': ['1 минута', '{count} минути'],
-    'second': ['1 секунда', '{count} секунди'],
+    'year': ['{count} година', '{count} години'],
+    'month': ['{count} месец', '{count} месеца'],
+    'week': ['{count} седмица', '{count} седмици'],
+    'day': ['{count} ден', '{count} дни'],
+    'hour': ['{count} час', '{count} часа'],
+    'minute': ['{count} минута', '{count} минути'],
+    'second': ['{count} секунда', '{count} секунди'],
 
     # Relative time
     'ago': 'преди {time}',

pendulum/lang/ca.py

@@ -52,13 +52,13 @@
     },
 
     # Units of time
-    'year': ['1 any', '{count} anys'],
-    'month': ['1 mes', '{count} mesos'],
-    'week': ['1 setmana', '{count} setmanes'],
-    'day': ['1 dia', '{count} díes'],
-    'hour': ['1 hora', '{count} hores'],
-    'minute': ['1 minut', '{count} minuts'],
-    'second': ['1 segon', '{count} segons'],
+    'year': ['{count} any', '{count} anys'],
+    'month': ['{count} mes', '{count} mesos'],
+    'week': ['{count} setmana', '{count} setmanes'],
+    'day': ['{count} dia', '{count} díes'],
+    'hour': ['{count} hora', '{count} hores'],
+    'minute': ['{count} minut', '{count} minuts'],
+    'second': ['{count} segon', '{count} segons'],
 
     # Relative time
     'ago': 'Fa {time}',

pendulum/lang/cs.py

@@ -52,13 +52,13 @@
     },
 
     # Units of time
-    'year': ['1 rok', '{count} roky', '{count} let'],
-    'month': ['1 měsíc', '{count} měsíce', '{count} měsíců'],
-    'week': ['1 týden', '{count} týdny', '{count} týdnů'],
-    'day': ['1 den', '{count} dny', '{count} dní'],
-    'hour': ['1 hodina', '{count} hodiny', '{count} hodin'],
-    'minute': ['1 minuta', '{count} minuty', '{count} minut'],
-    'second': ['1 sekunda', '{count} sekundy', '{count} sekund'],
+    'year': ['{count} rok', '{count} roky', '{count} let'],
+    'month': ['{count} měsíc', '{count} měsíce', '{count} měsíců'],
+    'week': ['{count} týden', '{count} týdny', '{count} týdnů'],
+    'day': ['{count} den', '{count} dny', '{count} dní'],
+    'hour': ['{count} hodina', '{count} hodiny', '{count} hodin'],
+    'minute': ['{count} minuta', '{count} minuty', '{count} minut'],
+    'second': ['{count} sekunda', '{count} sekundy', '{count} sekund'],
 
     # Relative time
     'ago': '{time} nazpět',

pendulum/lang/da.py

@@ -52,13 +52,13 @@
     },
 
     # Units of time
-    'year': ['1 år', '{count} år'],
-    'month': ['1 måned', '{count} måneder'],
-    'week': ['1 uge', '{count} uger'],
-    'day': ['1 dag', '{count} dage'],
-    'hour': ['1 time', '{count} timer'],
-    'minute': ['1 minut', '{count} minutter'],
-    'second': ['1 sekund', '{count} sekunder'],
+    'year': ['{count} år', '{count} år'],
+    'month': ['{count} måned', '{count} måneder'],
+    'week': ['{count} uge', '{count} uger'],
+    'day': ['{count} dag', '{count} dage'],
+    'hour': ['{count} time', '{count} timer'],
+    'minute': ['{count} minut', '{count} minutter'],
+    'second': ['{count} sekund', '{count} sekunder'],
 
     # Relative time
     'ago': '{time} siden',

pendulum/lang/de.py

@@ -52,27 +52,27 @@
     },
 
     # Units of time
-    'year': ['1 Jahr', '{count} Jahre'],
-    'month': ['1 Monat', '{count} Monate'],
-    'week': ['1 Woche', '{count} Wochen'],
-    'day': ['1 Tag', '{count} Tage'],
-    'hour': ['1 Stunde', '{count} Stunden'],
-    'minute': ['1 Minute', '{count} Minuten'],
-    'second': ['1 Sekunde', '{count} Sekunden'],
+    'year': ['{count} Jahr', '{count} Jahre'],
+    'month': ['{count} Monat', '{count} Monate'],
+    'week': ['{count} Woche', '{count} Wochen'],
+    'day': ['{count} Tag', '{count} Tage'],
+    'hour': ['{count} Stunde', '{count} Stunden'],
+    'minute': ['{count} Minute', '{count} Minuten'],
+    'second': ['{count} Sekunde', '{count} Sekunden'],
 
     # Relative time
     'ago': 'vor {time}',
     'from_now': 'in {time}',
     'after': '{time} später',
     'before': '{time} zuvor',
 
-    'year_from_now': ['1 Jahr', '{count} Jahren'],
-    'month_from_now': ['1 Monat', '{count} Monaten'],
-    'week_from_now': ['1 Woche', '{count} Wochen'],
-    'day_from_now': ['1 Tag', '{count} Tagen'],
-    'year_ago': ['1 Jahr', '{count} Jahren'],
-    'month_ago': ['1 Monat', '{count} Monaten'],
-    'week_ago': ['1 Woche', '{count} Wochen'],
-    'day_ago': ['1 Tag', '{count} Tagen'],
+    'year_from_now': ['{count} Jahr', '{count} Jahren'],
+    'month_from_now': ['{count} Monat', '{count} Monaten'],
+    'week_from_now': ['{count} Woche', '{count} Wochen'],
+    'day_from_now': ['{count} Tag', '{count} Tagen'],
+    'year_ago': ['{count} Jahr', '{count} Jahren'],
+    'month_ago': ['{count} Monat', '{count} Monaten'],
+    'week_ago': ['{count} Woche', '{count} Wochen'],
+    'day_ago': ['{count} Tag', '{count} Tagen'],
 }
 

pendulum/lang/el.py

@@ -52,13 +52,13 @@
     },
 
     # Units of time
-    'year': ['1 χρόνος', '{count} χρόνια'],
-    'month': ['1 μήνας', '{count} μήνες'],
-    'week': ['1 εβδομάδα', '{count} εβδομάδες'],
-    'day': ['1 μέρα', '{count} μέρες'],
-    'hour': ['1 ώρα', '{count} ώρες'],
-    'minute': ['1 λεπτό', '{count} λεπτά'],
-    'second': ['1 δευτερόλεπτο', '{count} δευτερόλεπτα'],
+    'year': ['{count} χρόνος', '{count} χρόνια'],
+    'month': ['{count} μήνας', '{count} μήνες'],
+    'week': ['{count} εβδομάδα', '{count} εβδομάδες'],
+    'day': ['{count} μέρα', '{count} μέρες'],
+    'hour': ['{count} ώρα', '{count} ώρες'],
+    'minute': ['{count} λεπτό', '{count} λεπτά'],
+    'second': ['{count} δευτερόλεπτο', '{count} δευτερόλεπτα'],
 
     # Relative time
     'ago': 'πρίν απο {time}',

pendulum/lang/en.py

@@ -52,13 +52,13 @@
     },
 
     # Units of time
-    'year': ['1 year', '{count} years'],
-    'month': ['1 month', '{count} months'],
-    'week': ['1 week', '{count} weeks'],
-    'day': ['1 day', '{count} days'],
-    'hour': ['1 hour', '{count} hours'],
-    'minute': ['1 minute', '{count} minutes'],
-    'second': ['1 second', '{count} seconds'],
+    'year': ['{count} year', '{count} years'],
+    'month': ['{count} month', '{count} months'],
+    'week': ['{count} week', '{count} weeks'],
+    'day': ['{count} day', '{count} days'],
+    'hour': ['{count} hour', '{count} hours'],
+    'minute': ['{count} minute', '{count} minutes'],
+    'second': ['{count} second', '{count} seconds'],
 
     # Relative time
     'ago': '{time} ago',

pendulum/lang/eo.py

@@ -52,13 +52,13 @@
     },
 
     # Units of time
-    'year': ['1 jaro', '{count} jaroj'],
-    'month': ['1 monato', '{count} monatoj'],
-    'week': ['1 semajno', '{count} semajnoj'],
-    'day': ['1 tago', '{count} tagoj'],
-    'hour': ['1 horo', '{count} horoj'],
-    'minute': ['1 minuto', '{count} minutoj'],
-    'second': ['1 sekundo', '{count} sekundoj'],
+    'year': ['{count} jaro', '{count} jaroj'],
+    'month': ['{count} monato', '{count} monatoj'],
+    'week': ['{count} semajno', '{count} semajnoj'],
+    'day': ['{count} tago', '{count} tagoj'],
+    'hour': ['{count} horo', '{count} horoj'],
+    'minute': ['{count} minuto', '{count} minutoj'],
+    'second': ['{count} sekundo', '{count} sekundoj'],
 
     # Relative time
     'ago': 'antaŭ {time}',