Merge pull request #298 from datavisyn/stoiber/297_date_of_persistent…

…_sessions_not_correct Fix date values in language strings
datavisyn · Feb 5, 2020 · bc2ea12 · bc2ea12
2 parents d8bcd40 + f3bfca6
commit bc2ea12
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/src/assets/locales/en/tdp.json b/src/assets/locales/en/tdp.json
@@ -86,9 +86,9 @@
       "hour": "an hour ago",
       "hour_plural": "{{count}} hours ago",
       "day": "a day ago",
-      "day_plural": "{{}} days ago",
+      "day_plural": "{{count}} days ago",
       "month": "a month ago",
-      "month_plural": "{{}} months ago",
+      "month_plural": "{{count}} months ago",
       "year": "a year ago",
       "farAway": "far far away",
 

diff --git a/tdp_core/xlsx.py b/tdp_core/xlsx.py
@@ -110,7 +110,7 @@ def to_header(v):
 
   def to_value(v, coltype):
     if coltype == 'date':
-      if isinstance(v, int) or isinstance(v, int):
+      if isinstance(v, int):
         return datetime.fromtimestamp(v)
       return dateutil.parser.parse(v)
     return v