Updated Polish translation

[empathy.git] / libempathy / empathy-time.c

diff --git a/libempathy/empathy-time.c b/libempathy/empathy-time.c
index a482f4dc3d2b12bc6f714f11d115da813e5add51..a39636dde6f0101c14382dd7585504c1b0c1bc98 100644 (file)
--- a/libempathy/empathy-time.c
+++ b/libempathy/empathy-time.c
@@ -40,18 +40,18 @@ empathy_time_get_current (void)
 time_t
 empathy_time_get_local_time (struct tm *tm)
 {
-       const gchar *timezone;
+       const gchar *tz;
        time_t       t;
-       
-       timezone = g_getenv ("TZ");
+
+       tz = g_getenv ("TZ");
        g_setenv ("TZ", "", TRUE);
 
        tzset ();
 
        t = mktime (tm);
 
-       if (timezone) {
-               g_setenv ("TZ", timezone, TRUE);
+       if (tz) {
+               g_setenv ("TZ", tz, TRUE);
        } else {
                g_unsetenv ("TZ");
        }
@@ -134,7 +134,6 @@ empathy_time_to_string_relative (time_t then)
 
        if (seconds > 0) {
                if (seconds < 60) {
-                       seconds /= 60;
                        return g_strdup_printf (ngettext ("%d second ago",
                                "%d seconds ago", seconds), seconds);
                }
@@ -153,6 +152,11 @@ empathy_time_to_string_relative (time_t then)
                        return g_strdup_printf (ngettext ("%d day ago",
                                "%d days ago", seconds), seconds);
                }
+               else if (seconds < (60 * 60 * 24 * 30)) {
+                       seconds /= 60 * 60 * 24 * 7;
+                       return g_strdup_printf (ngettext ("%d week ago",
+                               "%d weeks ago", seconds), seconds);
+               }
                else {
                        seconds /= 60 * 60 * 24 * 30;
                        return g_strdup_printf (ngettext ("%d month ago",
@@ -160,6 +164,6 @@ empathy_time_to_string_relative (time_t then)
                }
        }
        else {
-               return g_strdup ("in the future");
+               return g_strdup (_("in the future"));
        }
 }