# HG changeset patch
# User bsw
# Date 1331469013 -3600
# Node ID b04d1f79508e34e98296e66187bd4d5f20c4947e
# Parent  2cdbfb06a62b3709e7e40f13a4d67c5d4d0ad0ab
Fixed wrong information about next state when state_time_left negative

diff -r 2cdbfb06a62b -r b04d1f79508e app/main/issue/_list.lua
--- a/app/main/issue/_list.lua	Sun Mar 11 13:04:43 2012 +0100
+++ b/app/main/issue/_list.lua	Sun Mar 11 13:30:13 2012 +0100
@@ -148,7 +148,15 @@
                   if issue.state_time_left then
                     slot.put(" · ")
                     if issue.state_time_left:sub(1,1) == "-" then
-                      ui.tag{ content = _("Counting starts soon") }
+                      if issue.state == "new" then
+                        ui.tag{ content = _("Discussion starts soon") }
+                      elseif issue.state == "discussion" then
+                        ui.tag{ content = _("Verification starts soon") }
+                      elseif issue.state == "frozen" then
+                        ui.tag{ content = _("Voting starts soon") }
+                      elseif issue.state == "voting" then
+                        ui.tag{ content = _("Counting starts soon") }
+                      end
                     else
                       ui.tag{ content = _("#{time_left} left", { time_left = issue.state_time_left:gsub("days", _"days"):gsub("day", _"day") }) }
                     end
diff -r 2cdbfb06a62b -r b04d1f79508e app/main/issue/_show_head.lua
--- a/app/main/issue/_show_head.lua	Sun Mar 11 13:04:43 2012 +0100
+++ b/app/main/issue/_show_head.lua	Sun Mar 11 13:30:13 2012 +0100
@@ -56,11 +56,21 @@
 
       if issue.state_time_left then
         slot.put(" · ")
-        ui.tag{ content = _("#{time_left} left", { 
-          time_left = issue.state_time_left:gsub("days", _"days"):gsub("day", _"day")
-        }) }
+        if issue.state_time_left:sub(1,1) == "-" then
+          if issue.state == "new" then
+            ui.tag{ content = _("Discussion starts soon") }
+          elseif issue.state == "discussion" then
+            ui.tag{ content = _("Verification starts soon") }
+          elseif issue.state == "frozen" then
+            ui.tag{ content = _("Voting starts soon") }
+          elseif issue.state == "voting" then
+            ui.tag{ content = _("Counting starts soon") }
+          end
+        else
+          ui.tag{ content = _("#{time_left} left", { time_left = issue.state_time_left:gsub("days", _"days"):gsub("day", _"day") }) }
+        end
       end
-
+      
     end
   }
 
diff -r 2cdbfb06a62b -r b04d1f79508e locale/translations.de.lua
--- a/locale/translations.de.lua	Sun Mar 11 13:04:43 2012 +0100
+++ b/locale/translations.de.lua	Sun Mar 11 13:30:13 2012 +0100
@@ -180,6 +180,7 @@
 ["Discussion URL"] = "Diskussions-URL";
 ["Discussion on issue"] = "Diskussion zum Thema";
 ["Discussion started"] = "Diskussion gestartet";
+["Discussion starts soon"] = "Diskussion startet in Kürze";
 ["Discussion time"] = "Zeit für die Diskussion";
 ["Discussion with initiators"] = "Diskussion mit den Initiatoren";
 ["Discussion, frozen and voting phase"] = "Diskussions-, Eingefroren- und Abstimmphase";
@@ -314,7 +315,6 @@
 ["Locked?"] = "Gesperrt?";
 ["Login"] = "Anmeldung";
 ["Login name"] = "Anmeldename";
-["Login successful!"] = "Anmeldung erfolgreich";
 ["Logout"] = "Abmelden";
 ["Logout successful"] = "Abmeldung erfolgreich";
 ["Manage filter"] = "Filter verwalten";
@@ -605,8 +605,9 @@
 ["Updated drafts"] = "Neue Entwürfe";
 ["Upload images"] = "Bilder hochladen";
 ["Usage terms"] = "Nutzungsbedingungen";
-["Verification started"] = "Phase Überprüfung gestartet";
-["Verification time"] = "Zeit für die Überprüfung";
+["Verification started"] = "Phase Eingefroren gestartet";
+["Verification starts soon"] = "Phase Eingefroren startet in Kürze";
+["Verification time"] = "Zeit für Eingefroren";
 ["Version"] = "Version";
 ["Vote now"] = "Jetzt abstimmen";
 ["Voted"] = "Abgestimmt";
@@ -623,6 +624,7 @@
 ["Voting privileges"] = "Abstimmberechtigung";
 ["Voting proposal"] = "Abstimmungsvorlage";
 ["Voting started"] = "Abstimmung begonnen";
+["Voting starts soon"] = "Abstimmung beginnt in Kürze";
 ["Voting time"] = "Zeit für die Abstimmung";
 ["We couldn't deliver a confirmation mail to this address. Please check entered email address."] = "Wir konnten keine Bestätigungs-E-Mail versenden. Bitte überprüfe die E-Mail-Adresse.";
 ["We have sent an email with activation link already in the last hour. Please try again later."] = "Wir haben bereits innerhalb der letzten Stunde eine E-Mail mit Bestätigungslink gesendet. Bitte versuche es später erneut.";