Merge branch 'main' into release_1.0b2

nw/common.py

@@ -224,9 +224,9 @@ def fuzzyTime(secDiff):
         return "%d weeks ago" % int(round(secDiff/604800))
     elif secDiff < 3888000: # 45 days
         return "a month ago"
-    elif secDiff < 31104000: # 360 days
+    elif secDiff < 29808000: # 345 days
         return "%d months ago" % int(round(secDiff/2592000))
-    elif secDiff < 47304000: # 1.5 years
+    elif secDiff < 47336400: # 1.5 years
         return "a year ago"
     else:
         return "%d years ago" % int(round(secDiff/31557600))

nw/core/document.py

@@ -230,13 +230,13 @@ class NWDoc():
         for aClass in nwItemClass:
             if theMeta.startswith(aClass.name):
                 theClass = aClass
-                theMeta = theMeta.lstrip(aClass.name+":")
+                theMeta = theMeta[len(aClass.name)+1:]
 
         theLayout = nwItemLayout.NO_LAYOUT
         for aLayout in nwItemLayout:
             if theMeta.startswith(aLayout.name):
                 theLayout = aLayout
-                theMeta = theMeta.lstrip(aLayout.name+":")
+                theMeta = theMeta[len(aLayout.name)+1:]
 
         return theMeta, thePath, theClass, theLayout