From 35f5ec137bac4b6a9b563afdaf593b3596c1542f Mon Sep 17 00:00:00 2001 From: Benjamin Kellermann Date: Tue, 1 Mar 2011 08:55:46 +0100 Subject: new feature: sort comments --- charset.rb | 4 ++ classic.css | 4 ++ default.css | 6 +- dudle.rb | 2 +- locale/cs/dudle.po | 158 ++++++++++++++++++++++++++++--------------------- locale/de/dudle.po | 171 ++++++++++++++++++++++++++++++----------------------- locale/sv/dudle.po | 158 ++++++++++++++++++++++++++++--------------------- poll.rb | 28 ++++++++- print.css | 2 +- 9 files changed, 314 insertions(+), 219 deletions(-) diff --git a/charset.rb b/charset.rb index b5e513d..68606ca 100644 --- a/charset.rb +++ b/charset.rb @@ -27,6 +27,8 @@ if $USEUTF NOSORT = CGI.escapeHTML('▾▴') SORT = CGI.escapeHTML('▴') REVERSESORT = CGI.escapeHTML('▾') + GODOWN = CGI.escapeHTML('⇩') + GOUP = CGI.escapeHTML('⇧') YES = CGI.escapeHTML('✔') NO = CGI.escapeHTML('✘') @@ -48,6 +50,8 @@ else NOSORT = '' SORT = CGI.escapeHTML('^') REVERSESORT = CGI.escapeHTML('reverse') + GODOWN = CGI.escapeHTML('down') + GOUP = CGI.escapeHTML('up') YES = CGI.escapeHTML('OK') NO = CGI.escapeHTML('NO') diff --git a/classic.css b/classic.css index c67b2f1..6fe50e0 100644 --- a/classic.css +++ b/classic.css @@ -22,6 +22,10 @@ background-color: #FFF; } +a.comment_sort, a.top_bottom_ref { + font-size: small; +} + td.ayes, td.bmaybe, td.cno { cursor:default; } td.ayes{ background-color:#0F0; } diff --git a/default.css b/default.css index 6d02e23..8239e9b 100644 --- a/default.css +++ b/default.css @@ -1,5 +1,6 @@ /*************************************************************************** -* Copyright 2009,2010 Benjamin Kellermann, Stefanie Pötzsch * +* Copyright 2009,2010,2011 Benjamin Kellermann * +* 2010 Stefanie Pötzsch * * * * This file is part of dudle. * * * @@ -31,6 +32,9 @@ a:hover, a:active { color:#36c; text-decoration:underline; } +a.comment_sort, a.top_bottom_ref { + font-size: small; +} td.ayes, td.bmaybe, td.cno { cursor:default;} td.ayes, tr.input-ayes td, input.chosen { background-color:#9C6} diff --git a/dudle.rb b/dudle.rb index ff56d08..c6bd7dc 100644 --- a/dudle.rb +++ b/dudle.rb @@ -172,7 +172,7 @@ class Dudle } @html << < +

diff --git a/locale/cs/dudle.po b/locale/cs/dudle.po index 16c2f6b..4b29242 100644 --- a/locale/cs/dudle.po +++ b/locale/cs/dudle.po @@ -19,7 +19,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2011-01-12 09:45+0100\n" +"POT-Creation-Date: 2011-03-01 08:51+0100\n" "PO-Revision-Date: \n" "Last-Translator: Benjamin Kellermann \n" "Language-Team: \n" @@ -60,27 +60,27 @@ msgstr "" "Zdrojový kód lze získat pomocí nástroje bazaar:" -#: authorization_required.cgi:30 authorization_required.cgi:41 +#: authorization_required.cgi:36 authorization_required.cgi:53 msgid "Authorization Required" msgstr "" -#: authorization_required.cgi:33 +#: authorization_required.cgi:39 msgid "The configuration of this Poll is protected by password!" msgstr "" -#: authorization_required.cgi:35 +#: authorization_required.cgi:41 msgid "This Poll is protected by password!" msgstr "" -#: authorization_required.cgi:37 +#: authorization_required.cgi:43 msgid "In order to proceed, you have to give the password for user %{user}." msgstr "" -#: authorization_required.cgi:42 not_found.cgi:33 +#: authorization_required.cgi:54 not_found.cgi:36 msgid "Return to dudle home and Schedule a new Poll" msgstr "Návrat zpět na domovskou stránku dudle a naplánovat nové hlasování" -#: authorization_required.cgi:43 +#: authorization_required.cgi:55 msgid "You have to authorize in order to request this page!" msgstr "" @@ -137,24 +137,24 @@ msgstr "Uživatelské jméno:" msgid "Edit" msgstr "Upravit" -#: customize.cgi:117 access_control.rb:123 customize.rb:117 poll.rb:293 +#: customize.cgi:117 access_control.rb:123 customize.rb:117 poll.rb:294 msgid "Save" msgstr "Uložit" #: customize.cgi:120 access_control.rb:119 customize.rb:120 delete_poll.rb:103 -#: poll.rb:313 +#: poll.rb:332 msgid "Delete" msgstr "Smazat" -#: error.cgi:23 +#: error.cgi:25 error.cgi:27 msgid "Error" msgstr "" -#: error.cgi:41 +#: error.cgi:46 msgid "The following error was printed:" msgstr "" -#: error.cgi:45 +#: error.cgi:50 msgid "" "Hi!\n" "\n" @@ -169,21 +169,21 @@ msgid "" "Yours,\n" msgstr "" -#: error.cgi:46 +#: error.cgi:51 msgid "Bug in dudle" msgstr "" -#: error.cgi:48 +#: error.cgi:53 msgid "" "An error occured while executing dudle.
Please send an error report, " "including your browser, operating system, and what you did to %{admin}." msgstr "" -#: error.cgi:51 +#: error.cgi:56 msgid "Please include the following as well:" msgstr "" -#: example.cgi:60 dudle.rb:66 +#: example.cgi:60 dudle.rb:88 msgid "Examples" msgstr "Příklady" @@ -244,30 +244,30 @@ msgstr "Muže obsahovat písmena, čísla a pomlčky." msgid "Create" msgstr "Vytvořit" -#: not_found.cgi:26 +#: not_found.cgi:29 #, fuzzy msgid "Poll Not Found" msgstr "Nevybráno" -#: not_found.cgi:28 +#: not_found.cgi:31 msgid "The requested Poll was not found." msgstr "" -#: not_found.cgi:29 +#: not_found.cgi:32 msgid "There are several reasons, why a Poll is deleted:" msgstr "" -#: not_found.cgi:30 +#: not_found.cgi:33 msgid "Somebody klicked on “Delete Poll” and deleted the poll manually." msgstr "" -#: not_found.cgi:31 +#: not_found.cgi:34 msgid "" "The Poll was deleted by the administrator because it was not accessed for a " "long time." msgstr "" -#: not_found.cgi:32 +#: not_found.cgi:35 msgid "" "If you think, the deletion was done by error, please contact the " "adminsistrator of the system." @@ -348,11 +348,11 @@ msgstr "Pouze uživatel ‘účastník’ má přístup k hlasovacímu rozhraní msgid "Access control:" msgstr "Řízení přístupu:" -#: config_sample.rb:86 +#: config_sample.rb:99 msgid "Event Schedule Poll" msgstr "Hlasování Plánu Události" -#: config_sample.rb:90 +#: config_sample.rb:103 msgid "Normal Poll" msgstr "Normální Hlasování" @@ -429,63 +429,67 @@ msgstr "" "Pokud chceš opravdu vykonat tuto akci, prosím napiš do vstupního pole " "“%{question}”." -#: dudle.rb:57 +#: dudle.rb:72 msgid "Home" msgstr "Domů" -#: dudle.rb:67 -msgid "About" -msgstr "O aplikaci" - -#: dudle.rb:85 -msgid "Customize" -msgstr "Přizpůsobit" - -#: dudle.rb:89 +#: dudle.rb:75 msgid "Poll" msgstr "Hlasování" -#: dudle.rb:90 history.rb:35 +#: dudle.rb:76 history.rb:35 msgid "History" msgstr "Historie" -#: dudle.rb:93 +#: dudle.rb:79 msgid "Edit Columns" msgstr "Edituj sloupce" -#: dudle.rb:94 invite_participants.rb:38 +#: dudle.rb:80 invite_participants.rb:38 msgid "Invite Participants" msgstr "Pozvat účastníky" -#: dudle.rb:95 +#: dudle.rb:81 msgid "Access Control" msgstr "Řízení Přístupu" -#: dudle.rb:96 +#: dudle.rb:82 msgid "Overview" msgstr "Přehled" -#: dudle.rb:98 +#: dudle.rb:85 msgid "Delete Poll" msgstr "Smazat hlasování" -#: dudle.rb:185 dudle.rb:203 +#: dudle.rb:89 +msgid "About" +msgstr "O aplikaci" + +#: dudle.rb:91 +msgid "Customize" +msgstr "Přizpůsobit" + +#: dudle.rb:103 +msgid "Dudle Home" +msgstr "" + +#: dudle.rb:200 dudle.rb:218 msgid "Previous" msgstr "Předchozí" -#: dudle.rb:186 dudle.rb:204 +#: dudle.rb:201 dudle.rb:219 msgid "Next" msgstr "Následující" -#: dudle.rb:187 dudle.rb:205 +#: dudle.rb:202 dudle.rb:220 msgid "Finish" msgstr "Dokončit" -#: dudle.rb:210 +#: dudle.rb:225 msgid "All changes were saved sucessfully." msgstr "Všechny změny byly úspěšně uloženy." -#: dudle.rb:210 +#: dudle.rb:225 msgid "Proceed!" msgstr "Vykonat!" @@ -563,102 +567,118 @@ msgstr "Upravit uživatele %{user}" msgid "Delete user %{user}..." msgstr "Upravit uživatele %{user}" -#: poll.rb:137 +#: poll.rb:138 #, fuzzy msgid "Total" msgstr "celkem" -#: poll.rb:179 +#: poll.rb:180 msgid "Invite" msgstr "Pozvat" -#: poll.rb:180 pollhead.rb:62 timepollhead.rb:158 +#: poll.rb:181 pollhead.rb:62 timepollhead.rb:158 msgid "Name" msgstr "Jméno" -#: poll.rb:225 +#: poll.rb:226 msgid "Save Changes" msgstr "Uložit Změny" -#: poll.rb:229 +#: poll.rb:230 msgid "Cancel" msgstr "" -#: poll.rb:251 +#: poll.rb:252 msgid "Do you really want to delete user %{user}?" msgstr "" -#: poll.rb:254 +#: poll.rb:255 msgid "Confirm" msgstr "" -#: poll.rb:302 +#: poll.rb:303 msgid "Comments" msgstr "Komentáře" -#: poll.rb:308 +#: poll.rb:306 +msgid "Sort oldest comment first" +msgstr "" + +#: poll.rb:309 +msgid "Sort newest comment first" +msgstr "" + +#: poll.rb:314 +msgid "Go to last comment" +msgstr "" + +#: poll.rb:327 msgid "%{user} said on %{time}" msgstr "%{user} řekl v %{time}" -#: poll.rb:323 +#: poll.rb:341 +msgid "Go Up" +msgstr "" + +#: poll.rb:346 msgid "says" msgstr "říká" -#: poll.rb:324 +#: poll.rb:347 msgid "Submit Comment" msgstr "Odešli Komentář" -#: poll.rb:342 +#: poll.rb:365 msgid "Show history items:" msgstr "Zobraz položky historie" -#: poll.rb:349 +#: poll.rb:372 msgid "All" msgstr "Vše" -#: poll.rb:350 +#: poll.rb:373 msgid "Participant related" msgstr "Související s účastníkem" -#: poll.rb:351 +#: poll.rb:374 msgid "Column related" msgstr "Související se sloupcem" -#: poll.rb:352 +#: poll.rb:375 msgid "Comment related" msgstr "Související s komentářem" -#: poll.rb:353 +#: poll.rb:376 msgid "Access Control related" msgstr "Související s řízením přistupu" -#: poll.rb:359 +#: poll.rb:382 msgid "Update" msgstr "Aktualizace" -#: pollhead.rb:88 timepollhead.rb:162 +#: pollhead.rb:87 timepollhead.rb:162 msgid "Last Edit" msgstr "Poslední Úprava" -#: pollhead.rb:100 +#: pollhead.rb:99 #, fuzzy msgid "Alternative" msgstr "Název sloupce" -#: pollhead.rb:101 +#: pollhead.rb:100 #, fuzzy msgid "Description (optional)" msgstr "Popis" -#: pollhead.rb:102 +#: pollhead.rb:101 msgid "Add/Edit Column" msgstr "Přidat/Editovat sloupec" -#: pollhead.rb:103 +#: pollhead.rb:102 msgid "Preview" msgstr "Náhled" -#: pollhead.rb:104 +#: pollhead.rb:103 msgid "" "Enter all alternatives (columns), you want to ask the participants of the " "poll. The participants will state one vote for every alternative you give " diff --git a/locale/de/dudle.po b/locale/de/dudle.po index 5061e85..1f38945 100644 --- a/locale/de/dudle.po +++ b/locale/de/dudle.po @@ -19,8 +19,8 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2011-01-12 09:45+0100\n" -"PO-Revision-Date: 2011-01-12 09:46+0100\n" +"POT-Creation-Date: 2011-03-01 08:51+0100\n" +"PO-Revision-Date: 2011-03-01 08:55+0100\n" "Last-Translator: Benjamin Kellermann \n" "Language-Team: \n" "Language: \n" @@ -49,29 +49,29 @@ msgstr "Der Sourcecode zu dieser Applikation ist unter der Lizenz bazaar:" msgstr "Sie können sich den Quellcode mit bazaar herunterladen:" -#: authorization_required.cgi:30 -#: authorization_required.cgi:41 +#: authorization_required.cgi:36 +#: authorization_required.cgi:53 msgid "Authorization Required" msgstr "Anmeldung Erforderlich" -#: authorization_required.cgi:33 +#: authorization_required.cgi:39 msgid "The configuration of this Poll is protected by password!" msgstr "Die Konfiguration dieser Umfrage ist passwortgeschützt!" -#: authorization_required.cgi:35 +#: authorization_required.cgi:41 msgid "This Poll is protected by password!" msgstr "Diese Umfrage ist passwortgeschützt!" -#: authorization_required.cgi:37 +#: authorization_required.cgi:43 msgid "In order to proceed, you have to give the password for user %{user}." msgstr "Um fortzufahren müssen Sie das Passwort für den Benutzer %{user} eingeben." -#: authorization_required.cgi:42 -#: not_found.cgi:33 +#: authorization_required.cgi:54 +#: not_found.cgi:36 msgid "Return to dudle home and Schedule a new Poll" msgstr "Zurück zur dudle Hauptseite um eine neue Umfrage zu erstellen" -#: authorization_required.cgi:43 +#: authorization_required.cgi:55 msgid "You have to authorize in order to request this page!" msgstr "Um auf diese Seite zugreifen zu können müssen Sie sich autorisieren." @@ -144,7 +144,7 @@ msgstr "Bearbeiten" #: customize.cgi:117 #: access_control.rb:123 #: customize.rb:117 -#: poll.rb:293 +#: poll.rb:294 msgid "Save" msgstr "Speichern" @@ -152,19 +152,20 @@ msgstr "Speichern" #: access_control.rb:119 #: customize.rb:120 #: delete_poll.rb:103 -#: poll.rb:313 +#: poll.rb:332 msgid "Delete" msgstr "Löschen" -#: error.cgi:23 +#: error.cgi:25 +#: error.cgi:27 msgid "Error" msgstr "Fehler" -#: error.cgi:41 +#: error.cgi:46 msgid "The following error was printed:" msgstr "Der folgende Fehler wurde ausgegeben:" -#: error.cgi:45 +#: error.cgi:50 msgid "" "Hi!\n" "\n" @@ -190,20 +191,20 @@ msgstr "" "%{errormessage}\n" "Mit freundlichen Grüßen,\n" -#: error.cgi:46 +#: error.cgi:51 msgid "Bug in dudle" msgstr "Fehler im dudle" -#: error.cgi:48 +#: error.cgi:53 msgid "An error occured while executing dudle.
Please send an error report, including your browser, operating system, and what you did to %{admin}." msgstr "Während der Ausführung von dudle gab es einen Fehler.
Bitte schicken Sie einen Fehlerbericht in dem Sie den Namen Ihres Browsers, Ihres Betriebssystems und was Sie gemacht haben angeben an %{admin}." -#: error.cgi:51 +#: error.cgi:56 msgid "Please include the following as well:" msgstr "Bitte schicken Sie auch die folgende Fehlermeldung:" #: example.cgi:60 -#: dudle.rb:66 +#: dudle.rb:88 msgid "Examples" msgstr "Beispiele" @@ -259,27 +260,27 @@ msgstr "Kann Buchstaben, Zahlen, Bindestriche und Unterstriche enthalten." msgid "Create" msgstr "Erstellen" -#: not_found.cgi:26 +#: not_found.cgi:29 msgid "Poll Not Found" msgstr "Umfrage nicht gefunden" -#: not_found.cgi:28 +#: not_found.cgi:31 msgid "The requested Poll was not found." msgstr "Die angeforderte Umfrage wurde nicht gefunden." -#: not_found.cgi:29 +#: not_found.cgi:32 msgid "There are several reasons, why a Poll is deleted:" msgstr "Es gibt mehrere Gründe, warum eine Umfrage gelöscht wurde:" -#: not_found.cgi:30 +#: not_found.cgi:33 msgid "Somebody klicked on “Delete Poll” and deleted the poll manually." msgstr "Jemand hat auf „Umfrage löschen“ geklickt und die Umfrage manuell gelöscht" -#: not_found.cgi:31 +#: not_found.cgi:34 msgid "The Poll was deleted by the administrator because it was not accessed for a long time." msgstr "Die Umfrage wurde vom Administrator gelöscht, weil lange nicht auf sie zugegriffen wurde." -#: not_found.cgi:32 +#: not_found.cgi:35 msgid "If you think, the deletion was done by error, please contact the adminsistrator of the system." msgstr "Bitte kontaktieren Sie den Administrator des Systems, wenn Sie denken, dass die Umfrage versehentlich gelöscht wurde." @@ -347,11 +348,11 @@ msgstr "Der Benutzer „participant“ hat nur zur Abstimmungsoberfläche Zugrif msgid "Access control:" msgstr "Zugriffskontrolle:" -#: config_sample.rb:86 +#: config_sample.rb:99 msgid "Event Schedule Poll" msgstr "Nach einer Zeit fragen" -#: config_sample.rb:90 +#: config_sample.rb:103 msgid "Normal Poll" msgstr "Eine normale Umfrage" @@ -419,68 +420,72 @@ msgstr "Das Löschen der gesamten Umfrage ist unwiederrufbar!" msgid "If you are sure in what you are doing, please type “%{question}” into the form." msgstr "Wenn Sie sich sicher sind, dann geben Sie bitte „%{question}“ in das folgende Formular ein." -#: dudle.rb:57 +#: dudle.rb:72 msgid "Home" msgstr "Hauptseite" -#: dudle.rb:67 -msgid "About" -msgstr "Über dudle" - -#: dudle.rb:85 -msgid "Customize" -msgstr "Personalisieren" - -#: dudle.rb:89 +#: dudle.rb:75 msgid "Poll" msgstr "Umfrage" -#: dudle.rb:90 +#: dudle.rb:76 #: history.rb:35 msgid "History" msgstr "Versionen" -#: dudle.rb:93 +#: dudle.rb:79 msgid "Edit Columns" msgstr "Spalten bearbeiten" -#: dudle.rb:94 +#: dudle.rb:80 #: invite_participants.rb:38 msgid "Invite Participants" msgstr "Teilnehmer einladen" -#: dudle.rb:95 +#: dudle.rb:81 msgid "Access Control" msgstr "Zugriffskontrolle" -#: dudle.rb:96 +#: dudle.rb:82 msgid "Overview" msgstr "Übersicht" -#: dudle.rb:98 +#: dudle.rb:85 msgid "Delete Poll" msgstr "Umfrage löschen" -#: dudle.rb:185 -#: dudle.rb:203 +#: dudle.rb:89 +msgid "About" +msgstr "Über dudle" + +#: dudle.rb:91 +msgid "Customize" +msgstr "Personalisieren" + +#: dudle.rb:103 +msgid "Dudle Home" +msgstr "Dudle Startseite" + +#: dudle.rb:200 +#: dudle.rb:218 msgid "Previous" msgstr "Zurück" -#: dudle.rb:186 -#: dudle.rb:204 +#: dudle.rb:201 +#: dudle.rb:219 msgid "Next" msgstr "Weiter" -#: dudle.rb:187 -#: dudle.rb:205 +#: dudle.rb:202 +#: dudle.rb:220 msgid "Finish" msgstr "Fertig" -#: dudle.rb:210 +#: dudle.rb:225 msgid "All changes were saved sucessfully." msgstr "Alle Änderungen wurden erfolgreich gespeichert." -#: dudle.rb:210 +#: dudle.rb:225 msgid "Proceed!" msgstr "Weiter" @@ -563,102 +568,118 @@ msgstr "Bearbeite Teilnehmer %{user}..." msgid "Delete user %{user}..." msgstr "Lösche Teilnehmer %{user}..." -#: poll.rb:137 +#: poll.rb:138 msgid "Total" msgstr "Summe" -#: poll.rb:179 +#: poll.rb:180 msgid "Invite" msgstr "Einladen" -#: poll.rb:180 +#: poll.rb:181 #: pollhead.rb:62 #: timepollhead.rb:158 msgid "Name" msgstr "Name" -#: poll.rb:225 +#: poll.rb:226 msgid "Save Changes" msgstr "Speichern" -#: poll.rb:229 +#: poll.rb:230 msgid "Cancel" msgstr "Abbrechen" -#: poll.rb:251 +#: poll.rb:252 msgid "Do you really want to delete user %{user}?" msgstr "Wollen Sie den Teilnehmer %{user} wirklich löschen?" -#: poll.rb:254 +#: poll.rb:255 msgid "Confirm" msgstr "Bestätigen" -#: poll.rb:302 +#: poll.rb:303 msgid "Comments" msgstr "Kommentare" -#: poll.rb:308 +#: poll.rb:306 +msgid "Sort oldest comment first" +msgstr "Sortiere das älteste Kommentar als erstes" + +#: poll.rb:309 +msgid "Sort newest comment first" +msgstr "Sortiere das neueste Kommentar als erstes" + +#: poll.rb:314 +msgid "Go to last comment" +msgstr "Springe zum letzten Kommentar" + +#: poll.rb:327 msgid "%{user} said on %{time}" msgstr "%{user} sagte am %{time}" -#: poll.rb:323 +#: poll.rb:341 +msgid "Go Up" +msgstr "Gehe nach oben" + +#: poll.rb:346 msgid "says" msgstr "sagt" -#: poll.rb:324 +#: poll.rb:347 msgid "Submit Comment" msgstr "Sende Kommentar" -#: poll.rb:342 +#: poll.rb:365 msgid "Show history items:" msgstr "Zeige nur folgende Versionen:" -#: poll.rb:349 +#: poll.rb:372 msgid "All" msgstr "Alle" -#: poll.rb:350 +#: poll.rb:373 msgid "Participant related" msgstr "Teilnehmer betreffend" -#: poll.rb:351 +#: poll.rb:374 msgid "Column related" msgstr "Spalten betreffend" -#: poll.rb:352 +#: poll.rb:375 msgid "Comment related" msgstr "Kommentare betreffend" -#: poll.rb:353 +#: poll.rb:376 msgid "Access Control related" msgstr "Zugriffskontrolle betreffend" -#: poll.rb:359 +#: poll.rb:382 msgid "Update" msgstr "Aktualisieren" -#: pollhead.rb:88 +#: pollhead.rb:87 #: timepollhead.rb:162 msgid "Last Edit" msgstr "Letzte Änderung" -#: pollhead.rb:100 +#: pollhead.rb:99 msgid "Alternative" msgstr "Alternative" -#: pollhead.rb:101 +#: pollhead.rb:100 msgid "Description (optional)" msgstr "Beschreibung (optional)" -#: pollhead.rb:102 +#: pollhead.rb:101 msgid "Add/Edit Column" msgstr "Spalte bearbeiten/hinzufügen" -#: pollhead.rb:103 +#: pollhead.rb:102 msgid "Preview" msgstr "Vorschau" -#: pollhead.rb:104 +#: pollhead.rb:103 msgid "Enter all alternatives (columns), you want to ask the participants of the poll. The participants will state one vote for every alternative you give here separately." msgstr "Geben Sie alle Alternativen (Spalten) ein, nach denen in der Umfrage gefragt werden soll. Die Teilnehmer der Umfrage können für jede Alternative einzeln ihre Stimme abgeben." diff --git a/locale/sv/dudle.po b/locale/sv/dudle.po index 271a2be..f4428ec 100644 --- a/locale/sv/dudle.po +++ b/locale/sv/dudle.po @@ -19,7 +19,7 @@ msgid "" msgstr "" "Project-Id-Version: \n" -"POT-Creation-Date: 2011-01-12 09:45+0100\n" +"POT-Creation-Date: 2011-03-01 08:51+0100\n" "PO-Revision-Date: \n" "Last-Translator: Benjamin Kellermann \n" "Language-Team: \n" @@ -59,27 +59,27 @@ msgstr "" "Du kan få tillgång till koden om du använder bazaar:" -#: authorization_required.cgi:30 authorization_required.cgi:41 +#: authorization_required.cgi:36 authorization_required.cgi:53 msgid "Authorization Required" msgstr "" -#: authorization_required.cgi:33 +#: authorization_required.cgi:39 msgid "The configuration of this Poll is protected by password!" msgstr "" -#: authorization_required.cgi:35 +#: authorization_required.cgi:41 msgid "This Poll is protected by password!" msgstr "" -#: authorization_required.cgi:37 +#: authorization_required.cgi:43 msgid "In order to proceed, you have to give the password for user %{user}." msgstr "" -#: authorization_required.cgi:42 not_found.cgi:33 +#: authorization_required.cgi:54 not_found.cgi:36 msgid "Return to dudle home and Schedule a new Poll" msgstr "Tillbaka till dudle hem och skapa en ny omröstning" -#: authorization_required.cgi:43 +#: authorization_required.cgi:55 msgid "You have to authorize in order to request this page!" msgstr "" @@ -136,24 +136,24 @@ msgstr "Användarnamn:" msgid "Edit" msgstr "Redigera" -#: customize.cgi:117 access_control.rb:123 customize.rb:117 poll.rb:293 +#: customize.cgi:117 access_control.rb:123 customize.rb:117 poll.rb:294 msgid "Save" msgstr "Spara" #: customize.cgi:120 access_control.rb:119 customize.rb:120 delete_poll.rb:103 -#: poll.rb:313 +#: poll.rb:332 msgid "Delete" msgstr "Radera" -#: error.cgi:23 +#: error.cgi:25 error.cgi:27 msgid "Error" msgstr "" -#: error.cgi:41 +#: error.cgi:46 msgid "The following error was printed:" msgstr "" -#: error.cgi:45 +#: error.cgi:50 msgid "" "Hi!\n" "\n" @@ -168,21 +168,21 @@ msgid "" "Yours,\n" msgstr "" -#: error.cgi:46 +#: error.cgi:51 msgid "Bug in dudle" msgstr "" -#: error.cgi:48 +#: error.cgi:53 msgid "" "An error occured while executing dudle.
Please send an error report, " "including your browser, operating system, and what you did to %{admin}." msgstr "" -#: error.cgi:51 +#: error.cgi:56 msgid "Please include the following as well:" msgstr "" -#: example.cgi:60 dudle.rb:66 +#: example.cgi:60 dudle.rb:88 msgid "Examples" msgstr "Exempel" @@ -243,30 +243,30 @@ msgstr "Bör innehålla bokstäver, nummer och tankestreck" msgid "Create" msgstr "Skapa" -#: not_found.cgi:26 +#: not_found.cgi:29 #, fuzzy msgid "Poll Not Found" msgstr "Inte vald" -#: not_found.cgi:28 +#: not_found.cgi:31 msgid "The requested Poll was not found." msgstr "" -#: not_found.cgi:29 +#: not_found.cgi:32 msgid "There are several reasons, why a Poll is deleted:" msgstr "" -#: not_found.cgi:30 +#: not_found.cgi:33 msgid "Somebody klicked on “Delete Poll” and deleted the poll manually." msgstr "" -#: not_found.cgi:31 +#: not_found.cgi:34 msgid "" "The Poll was deleted by the administrator because it was not accessed for a " "long time." msgstr "" -#: not_found.cgi:32 +#: not_found.cgi:35 msgid "" "If you think, the deletion was done by error, please contact the " "adminsistrator of the system." @@ -349,11 +349,11 @@ msgstr "’Deltagare’ har bara access till gränssnittet för omröstning" msgid "Access control:" msgstr "Åtkomstkontroll:" -#: config_sample.rb:86 +#: config_sample.rb:99 msgid "Event Schedule Poll" msgstr "Händelseschema Omröstning" -#: config_sample.rb:90 +#: config_sample.rb:103 msgid "Normal Poll" msgstr "Normal omröstning" @@ -429,63 +429,67 @@ msgid "" "form." msgstr "Om du vet vad du gör, vänligen skriv “%{question}” i formuläret." -#: dudle.rb:57 +#: dudle.rb:72 msgid "Home" msgstr "Hem" -#: dudle.rb:67 -msgid "About" -msgstr "Om" - -#: dudle.rb:85 -msgid "Customize" -msgstr "Egna inställningar" - -#: dudle.rb:89 +#: dudle.rb:75 msgid "Poll" msgstr "Omröstning" -#: dudle.rb:90 history.rb:35 +#: dudle.rb:76 history.rb:35 msgid "History" msgstr "Historia" -#: dudle.rb:93 +#: dudle.rb:79 msgid "Edit Columns" msgstr "Redigera kolumner" -#: dudle.rb:94 invite_participants.rb:38 +#: dudle.rb:80 invite_participants.rb:38 msgid "Invite Participants" msgstr "Bjud in deltagare" -#: dudle.rb:95 +#: dudle.rb:81 msgid "Access Control" msgstr "Åtkomstkontroll" -#: dudle.rb:96 +#: dudle.rb:82 msgid "Overview" msgstr "Översikt" -#: dudle.rb:98 +#: dudle.rb:85 msgid "Delete Poll" msgstr "Radera omröstning" -#: dudle.rb:185 dudle.rb:203 +#: dudle.rb:89 +msgid "About" +msgstr "Om" + +#: dudle.rb:91 +msgid "Customize" +msgstr "Egna inställningar" + +#: dudle.rb:103 +msgid "Dudle Home" +msgstr "" + +#: dudle.rb:200 dudle.rb:218 msgid "Previous" msgstr "Föregående" -#: dudle.rb:186 dudle.rb:204 +#: dudle.rb:201 dudle.rb:219 msgid "Next" msgstr "Nästa" -#: dudle.rb:187 dudle.rb:205 +#: dudle.rb:202 dudle.rb:220 msgid "Finish" msgstr "Klar" -#: dudle.rb:210 +#: dudle.rb:225 msgid "All changes were saved sucessfully." msgstr "Alla ändringar sparades." -#: dudle.rb:210 +#: dudle.rb:225 msgid "Proceed!" msgstr "Fortsätt!" @@ -563,102 +567,118 @@ msgstr "Redigera användare %{user}" msgid "Delete user %{user}..." msgstr "Redigera användare %{user}" -#: poll.rb:137 +#: poll.rb:138 msgid "Total" msgstr "Total" -#: poll.rb:179 +#: poll.rb:180 msgid "Invite" msgstr "Bjud in" -#: poll.rb:180 pollhead.rb:62 timepollhead.rb:158 +#: poll.rb:181 pollhead.rb:62 timepollhead.rb:158 msgid "Name" msgstr "Namn" -#: poll.rb:225 +#: poll.rb:226 msgid "Save Changes" msgstr "Spara ändringar" -#: poll.rb:229 +#: poll.rb:230 msgid "Cancel" msgstr "" -#: poll.rb:251 +#: poll.rb:252 #, fuzzy msgid "Do you really want to delete user %{user}?" msgstr "Redigera användare %{user}" -#: poll.rb:254 +#: poll.rb:255 msgid "Confirm" msgstr "" -#: poll.rb:302 +#: poll.rb:303 msgid "Comments" msgstr "Kommentarer" -#: poll.rb:308 +#: poll.rb:306 +msgid "Sort oldest comment first" +msgstr "" + +#: poll.rb:309 +msgid "Sort newest comment first" +msgstr "" + +#: poll.rb:314 +msgid "Go to last comment" +msgstr "" + +#: poll.rb:327 msgid "%{user} said on %{time}" msgstr "sa %{user} %{time}" -#: poll.rb:323 +#: poll.rb:341 +msgid "Go Up" +msgstr "" + +#: poll.rb:346 msgid "says" msgstr "säger" -#: poll.rb:324 +#: poll.rb:347 msgid "Submit Comment" msgstr "Skicka kommentarer" -#: poll.rb:342 +#: poll.rb:365 msgid "Show history items:" msgstr "Visa historik:" -#: poll.rb:349 +#: poll.rb:372 msgid "All" msgstr "Alla" -#: poll.rb:350 +#: poll.rb:373 msgid "Participant related" msgstr "Tillhörande deltagare" -#: poll.rb:351 +#: poll.rb:374 msgid "Column related" msgstr "Tillhörande kolumn" -#: poll.rb:352 +#: poll.rb:375 msgid "Comment related" msgstr "Tillhörande kommentar" -#: poll.rb:353 +#: poll.rb:376 msgid "Access Control related" msgstr "Tillhörande åtkomstkontroll" -#: poll.rb:359 +#: poll.rb:382 msgid "Update" msgstr "Uppdatera" -#: pollhead.rb:88 timepollhead.rb:162 +#: pollhead.rb:87 timepollhead.rb:162 msgid "Last Edit" msgstr "Senast ändrat" -#: pollhead.rb:100 +#: pollhead.rb:99 #, fuzzy msgid "Alternative" msgstr "Kolumntitel" -#: pollhead.rb:101 +#: pollhead.rb:100 #, fuzzy msgid "Description (optional)" msgstr "Beskrivning" -#: pollhead.rb:102 +#: pollhead.rb:101 msgid "Add/Edit Column" msgstr "Lägg till/redigera kolumn" -#: pollhead.rb:103 +#: pollhead.rb:102 msgid "Preview" msgstr "Förhandsgranska" -#: pollhead.rb:104 +#: pollhead.rb:103 msgid "" "Enter all alternatives (columns), you want to ask the participants of the " "poll. The participants will state one vote for every alternative you give " diff --git a/poll.rb b/poll.rb index 9b3f9d2..fac4252 100644 --- a/poll.rb +++ b/poll.rb @@ -300,12 +300,30 @@ TR def comment_to_html(editable = true) ret = "

" - ret += "

" + _("Comments") + "

" if !@comment.empty? || editable + ret += "

" + _("Comments") if !@comment.empty? || editable + if $cgi.include?("comments_reverse") + ret += " #{REVERSESORT}" + else + ret += " #{SORT}" + end + + if @comment.size > 5 + ret += " #{GODOWN}" + end + + ret += "

" if !@comment.empty? || editable unless @comment.empty? - @comment.each{|time,name,comment| + i = 0 # for commentanchor + c = @comment.dup + c.reverse! if $cgi.include?("comments_reverse") + c.each{|time,name,comment| ret += "

" - ret += "

" + ret += "
" + i += 1 ret += _("%{user} said on %{time}") % {:user => name, :time => time.strftime("%d.%m., %H:%M")} if editable ret += "" @@ -318,6 +336,10 @@ TR ret += "" } end + + ret += "#{GOUP}" if @comment.size > 5 + if editable # ADD COMMENT diff --git a/print.css b/print.css index b94b7ec..527ef68 100644 --- a/print.css +++ b/print.css @@ -221,7 +221,7 @@ tr.participantrow:hover { background: #AAA; } -div#add_comment,div#edit_column, div#history, div#backlink, input.delete_comment_button, tr#add_participant, div#configlink, div#tabs, p#history, span.edituser, span.sortsymb, div#languageChooser, input[type=submit], div#breadcrumbs { +div#add_comment,div#edit_column, div#history, div#backlink, input.delete_comment_button, tr#add_participant, div#configlink, div#tabs, p#history, span.edituser, span.sortsymb, div#languageChooser, input[type=submit], div#breadcrumbs, a.comment_sort, a.top_bottom_ref { display: none; } -- cgit v1.2.3