Mercurial > hg > egg-tcls

changeset 125:42cf6a768c46

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
tj: Add support for years in the output.
author Matti Hamalainen <ccr@tnsp.org>
date Sun, 27 May 2012 10:36:03 +0300
parents ac5b1efabace
children 86500b3ac599
files tj.tcl
diffstat 1 files changed, 18 insertions(+), 12 deletions(-) [+]
line wrap: on
line diff
--- a/tj.tcl	Mon Jan 09 17:07:14 2012 +0200
+++ b/tj.tcl	Sun May 27 10:36:03 2012 +0300
@@ -116,6 +116,15 @@
 
 
 # ------------------------------------------------------------------------
+proc tj_append { qlause qaika qstr qadd } {
+  upvar $qlause lause
+  if {$qaika > 0} {
+    if {$lause != ""} { append lause $qadd }
+    append lause $qstr
+  }
+}
+
+# ------------------------------------------------------------------------
 proc tj_gettj {ihandle ichan} {
   global tj_defstarttj
   global tj_dateident
@@ -152,8 +161,11 @@
   }
 
   # Lasketaan TJ aamut, tunnit jne
-  set aamut [expr ($tmp / 86400)]
-  set tunnit [expr (($tmp % 86400) / 3600)]
+  set vuodet [expr ($tmp / (365*24*60*60))]
+  set rem [expr ($tmp % (365*24*60*60))]
+  set aamut [expr ($rem / (24*60*60))]
+  set rem [expr ($rem % (24*60*60))]
+  set tunnit [expr ($rem / (60*60))]
 
   # Maaritetaan sanalause
   if {$ichan != ""} {
@@ -164,16 +176,10 @@
     set tjmi "Sinä olet"
   }
 
-  if {$aamut > 0} {
-    set lause "$aamut aamua"
-  } else {
-    set lause ""
-  }
-
-  if {$tunnit > 0} {
-    if {$aamut > 0} { append lause " ja " }
-    append lause "$tunnit tuntia"
-  }
+  set lause ""
+  tj_append lause $vuodet "$vuodet vuotta" ""
+  tj_append lause $aamut "$aamut aamua" ", "
+  tj_append lause $tunnit "$tunnit tuntia" " ja "
 
   if {$aamut == 0 && $deltatj > 0} {
     if {$tunnit == 0} {