Improve error message when postsignin (probably from openid) fails due to

cookies not being enabled. Adds a new translatable string..

diff --git a/IkiWiki/CGI.pm b/IkiWiki/CGI.pm
index b1f770b05e2d1b677acee15e8b5ffac81b08bcd3..71a3299a47ce4807947c227e8242df0cb9610bc7 100644 (file)
--- a/IkiWiki/CGI.pm
+++ b/IkiWiki/CGI.pm
@@ -646,6 +646,9 @@ sub cgi (;$$) { #{{{
                $q->param('do', 'create');
                cgi_editpage($q, $session);
        }
+       elsif ($do eq 'postsignin') {
+               error(gettext("login failed, perhaps you need to turn on cookies?"));
+       }
        else {
                error("unknown do parameter");
        }

diff --git a/doc/bugs/openid_postsignin_failure.mdwn b/doc/bugs/openid_postsignin_failure.mdwn
index df8f3997dbf73b0fcb7659c5e15784e4d679fd15..b18187c48dc31d66d6de3dbb2ecdaa5ba7713d88 100644 (file)
--- a/doc/bugs/openid_postsignin_failure.mdwn
+++ b/doc/bugs/openid_postsignin_failure.mdwn
@@ -45,4 +45,8 @@ it would be nice to let the user know that they can't sign in
 w/o cookies, but I don't see any easy way of detecting that 
 from CGI::Session. Maybe you know a way -- I have never used 
 CGI.pm before, this isn't my forte (in case that  wasn't obvious).
---Ethan
\ No newline at end of file
+--Ethan
+
+> It's not easily possible to test for cookies, but it is possible to
+> display a better error message in this failure mode. [[bugs/done]]
+> --[[Joey]]

diff --git a/po/bg.po b/po/bg.po
index 81905d0eb760b81a1d1d15cec23e103c9970b5e6..80dad8320ed982150bc5e2935bce6668c6b5421d 100644 (file)
--- a/po/bg.po
+++ b/po/bg.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki-bg\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-10 15:32-0500\n"
+"POT-Creation-Date: 2007-01-12 15:56-0500\n"
 "PO-Revision-Date: 2007-01-12 01:19+0200\n"
 "Last-Translator: Damyan Ivanov <dam@modsodtsys.com>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
@@ -21,35 +21,40 @@ msgstr ""
 #: ../IkiWiki/CGI.pm:51
 #, perl-format
 msgid "%s is locked by %s and cannot be edited"
-msgstr "Страницата „%s” е заключена от потребителя „%s” и не може да бъде променяна"
+msgstr ""
+"Страницата „%s” е заключена от потребителя „%s” и не може да бъде променяна"
 
-#: ../IkiWiki/CGI.pm:141
+#: ../IkiWiki/CGI.pm:140
 msgid "You need to log in first."
 msgstr "Първо трябва да влезете."
 
-#: ../IkiWiki/CGI.pm:259
+#: ../IkiWiki/CGI.pm:257
 msgid "Preferences saved."
 msgstr "Предпочитанията са запазени."
 
-#: ../IkiWiki/CGI.pm:410 ../IkiWiki/Plugin/inline.pm:162
+#: ../IkiWiki/CGI.pm:407 ../IkiWiki/Plugin/inline.pm:162
 #: ../IkiWiki/Render.pm:97 ../IkiWiki/Render.pm:161
 msgid "discussion"
 msgstr "дискусия"
 
-#: ../IkiWiki/CGI.pm:449
+#: ../IkiWiki/CGI.pm:446
 #, perl-format
 msgid "creating %s"
 msgstr "създаване на %s"
 
-#: ../IkiWiki/CGI.pm:466 ../IkiWiki/CGI.pm:509
+#: ../IkiWiki/CGI.pm:463 ../IkiWiki/CGI.pm:506
 #, perl-format
 msgid "editing %s"
 msgstr "промяна на %s"
 
-#: ../IkiWiki/CGI.pm:626
+#: ../IkiWiki/CGI.pm:623
 msgid "You are banned."
 msgstr "Достъпът ви е забранен."
 
+#: ../IkiWiki/CGI.pm:650
+msgid "login failed, perhaps you need to turn on cookies?"
+msgstr ""
+
 #: ../IkiWiki/Plugin/aggregate.pm:61
 #, perl-format
 msgid "aggregate plugin missing %s parameter"
@@ -115,7 +120,9 @@ msgstr "приставката „googlecalendar” не намери URL в HTM
 
 #: ../IkiWiki/Plugin/inline.pm:37
 msgid "Must specify url to wiki with --url when using --rss or --atom"
-msgstr "Когато се използва „--rss” или „--atom” трябва да се укаже и местоположението на уикито посредством параметъра „--url”"
+msgstr ""
+"Когато се използва „--rss” или „--atom” трябва да се укаже и "
+"местоположението на уикито посредством параметъра „--url”"
 
 #: ../IkiWiki/Plugin/inline.pm:97
 #, perl-format
@@ -133,7 +140,9 @@ msgstr "приставката „linkmap”: грешка при изпълне
 #: ../IkiWiki/Plugin/mdwn.pm:37
 #, perl-format
 msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)"
-msgstr "грешка при зареждането на perl-модула „Markdown.pm” (%s) или „/usr/bin/markdown” (%s)"
+msgstr ""
+"грешка при зареждането на perl-модула „Markdown.pm” (%s) или „/usr/bin/"
+"markdown” (%s)"
 
 #: ../IkiWiki/Plugin/mirrorlist.pm:23
 msgid "Mirrors"
@@ -241,7 +250,9 @@ msgstr "функцията „getctime” не е реализирана"
 msgid ""
 "REV is not set, not running from svn post-commit hook, cannot send "
 "notifications"
-msgstr "Променливата от обкръжението „REV” не е указана. Програмата не се изпълнява като „svn post-commit hook”. Няма да бъдат разпратени известявания"
+msgstr ""
+"Променливата от обкръжението „REV” не е указана. Програмата не се изпълнява "
+"като „svn post-commit hook”. Няма да бъдат разпратени известявания"
 
 #: ../IkiWiki/Render.pm:98
 msgid "Discussion"
@@ -362,7 +373,9 @@ msgstr "формат: ikiwiki [опции] източник местоназна
 
 #: ../IkiWiki.pm:99
 msgid "Must specify url to wiki with --url when using --cgi"
-msgstr "При използване на пареметъра „--cgi” е необходимо да се укаже и местоположението на уикито чрез параметъра „--url”"
+msgstr ""
+"При използване на пареметъра „--cgi” е необходимо да се укаже и "
+"местоположението на уикито чрез параметъра „--url”"
 
 #: ../IkiWiki.pm:144 ../IkiWiki.pm:145
 msgid "Error"
@@ -376,4 +389,3 @@ msgstr "Грешка"
 #, perl-format
 msgid "%s preprocessing loop detected on %s at depth %i"
 msgstr "открита е циклична завидимост при %s на „%s” на дълбочина %i"
-

diff --git a/po/cs.po b/po/cs.po
index 9f82eb05b0238ed96428717a8a64baf8372ad364..3c888601bdb13a2eb83a13c2ff7a64d6b727e35a 100644 (file)
--- a/po/cs.po
+++ b/po/cs.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-06 13:36+0100\n"
+"POT-Creation-Date: 2007-01-12 15:56-0500\n"
 "PO-Revision-Date: 2007-01-07 11:59+0100\n"
 "Last-Translator: Miroslav Kure <kurem@debian.cz>\n"
 "Language-Team: Czech <debian-l10n-czech@lists.debian.org>\n"
@@ -22,33 +22,37 @@ msgstr ""
 msgid "%s is locked by %s and cannot be edited"
 msgstr "Stránka %s je zamknutá uživatelem %s a nelze ji měnit"
 
-#: ../IkiWiki/CGI.pm:141
+#: ../IkiWiki/CGI.pm:140
 msgid "You need to log in first."
 msgstr "Nejprve se musíte přihlásit."
 
-#: ../IkiWiki/CGI.pm:259
+#: ../IkiWiki/CGI.pm:257
 msgid "Preferences saved."
 msgstr "Nastavení uloženo."
 
-#: ../IkiWiki/CGI.pm:410 ../IkiWiki/Plugin/inline.pm:162
+#: ../IkiWiki/CGI.pm:407 ../IkiWiki/Plugin/inline.pm:162
 #: ../IkiWiki/Render.pm:97 ../IkiWiki/Render.pm:161
 msgid "discussion"
 msgstr "diskuse"
 
-#: ../IkiWiki/CGI.pm:449
+#: ../IkiWiki/CGI.pm:446
 #, perl-format
 msgid "creating %s"
 msgstr "vytvářím %s"
 
-#: ../IkiWiki/CGI.pm:466 ../IkiWiki/CGI.pm:509
+#: ../IkiWiki/CGI.pm:463 ../IkiWiki/CGI.pm:506
 #, perl-format
 msgid "editing %s"
 msgstr "upravuji %s"
 
-#: ../IkiWiki/CGI.pm:626
+#: ../IkiWiki/CGI.pm:623
 msgid "You are banned."
 msgstr "Jste vyhoštěni."
 
+#: ../IkiWiki/CGI.pm:650
+msgid "login failed, perhaps you need to turn on cookies?"
+msgstr ""
+
 #: ../IkiWiki/Plugin/aggregate.pm:61
 #, perl-format
 msgid "aggregate plugin missing %s parameter"

diff --git a/po/es.po b/po/es.po
index 912c8f1f4d17ffbbcce5dfbc55c96898e7a7df79..9aab1be892ab7e8626aa97162923a5b2e1d264b3 100644 (file)
--- a/po/es.po
+++ b/po/es.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-04 06:58-0500\n"
+"POT-Creation-Date: 2007-01-12 15:56-0500\n"
 "PO-Revision-Date: 2007-01-03 09:37+0100\n"
 "Last-Translator: Víctor Moral <victor@taquiones.net>\n"
 "Language-Team: spanish <es@li.org>\n"
@@ -23,33 +23,37 @@ msgstr ""
 msgid "%s is locked by %s and cannot be edited"
 msgstr "La página %s está bloqueada por %s y no puede modificarse"
 
-#: ../IkiWiki/CGI.pm:141
+#: ../IkiWiki/CGI.pm:140
 msgid "You need to log in first."
 msgstr "Antes es necesario identificarse"
 
-#: ../IkiWiki/CGI.pm:259
+#: ../IkiWiki/CGI.pm:257
 msgid "Preferences saved."
 msgstr "Las preferencias se han guardado."
 
-#: ../IkiWiki/CGI.pm:410 ../IkiWiki/Plugin/inline.pm:162
+#: ../IkiWiki/CGI.pm:407 ../IkiWiki/Plugin/inline.pm:162
 #: ../IkiWiki/Render.pm:97 ../IkiWiki/Render.pm:161
 msgid "discussion"
 msgstr "comentarios"
 
-#: ../IkiWiki/CGI.pm:449
+#: ../IkiWiki/CGI.pm:446
 #, perl-format
 msgid "creating %s"
 msgstr "creando página %s"
 
-#: ../IkiWiki/CGI.pm:466 ../IkiWiki/CGI.pm:509
+#: ../IkiWiki/CGI.pm:463 ../IkiWiki/CGI.pm:506
 #, perl-format
 msgid "editing %s"
 msgstr "modificando página %s"
 
-#: ../IkiWiki/CGI.pm:626
+#: ../IkiWiki/CGI.pm:623
 msgid "You are banned."
 msgstr "Ha sido expulsado."
 
+#: ../IkiWiki/CGI.pm:650
+msgid "login failed, perhaps you need to turn on cookies?"
+msgstr ""
+
 #: ../IkiWiki/Plugin/aggregate.pm:61
 #, perl-format
 msgid "aggregate plugin missing %s parameter"

diff --git a/po/gu.po b/po/gu.po
index 7dce574e9c2009a4400ccc2c7114aa6ddf61ac0e..fae69ed0f33f82f09eaed9cb44c38c6aef6643cc 100644 (file)
--- a/po/gu.po
+++ b/po/gu.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki-gu\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-10 15:32-0500\n"
+"POT-Creation-Date: 2007-01-12 15:56-0500\n"
 "PO-Revision-Date: 2007-01-11 16:05+0530\n"
 "Last-Translator: Kartik Mistry <kartik.mistry@gmail.com>\n"
 "Language-Team: Gujarati <team@utkarsh.org>\n"
@@ -22,33 +22,37 @@ msgstr ""
 msgid "%s is locked by %s and cannot be edited"
 msgstr "%s એ %s દ્વારા તાળું મરાયેલ છે અને તેમાં સુધારો કરી શકાશે નહી"
 
-#: ../IkiWiki/CGI.pm:141
+#: ../IkiWiki/CGI.pm:140
 msgid "You need to log in first."
 msgstr "તમારે પ્રથમ લોગ ઇન થવું પડશે."
 
-#: ../IkiWiki/CGI.pm:259
+#: ../IkiWiki/CGI.pm:257
 msgid "Preferences saved."
 msgstr "પ્રાથમિકતાઓ સંગ્રહાઇ."
 
-#: ../IkiWiki/CGI.pm:410 ../IkiWiki/Plugin/inline.pm:162
+#: ../IkiWiki/CGI.pm:407 ../IkiWiki/Plugin/inline.pm:162
 #: ../IkiWiki/Render.pm:97 ../IkiWiki/Render.pm:161
 msgid "discussion"
 msgstr "ચર્ચા"
 
-#: ../IkiWiki/CGI.pm:449
+#: ../IkiWiki/CGI.pm:446
 #, perl-format
 msgid "creating %s"
 msgstr "%s બનાવે છે"
 
-#: ../IkiWiki/CGI.pm:466 ../IkiWiki/CGI.pm:509
+#: ../IkiWiki/CGI.pm:463 ../IkiWiki/CGI.pm:506
 #, perl-format
 msgid "editing %s"
 msgstr "%s સુધારે છે"
 
-#: ../IkiWiki/CGI.pm:626
+#: ../IkiWiki/CGI.pm:623
 msgid "You are banned."
 msgstr "તમારા પર પ્રતિબંધ છે."
 
+#: ../IkiWiki/CGI.pm:650
+msgid "login failed, perhaps you need to turn on cookies?"
+msgstr ""
+
 #: ../IkiWiki/Plugin/aggregate.pm:61
 #, perl-format
 msgid "aggregate plugin missing %s parameter"
@@ -240,9 +244,7 @@ msgstr "getctime અમલમાં મૂકાયેલ નથી"
 msgid ""
 "REV is not set, not running from svn post-commit hook, cannot send "
 "notifications"
-msgstr ""
-"REV ગોઠવેલ નથી, svn post-commit hook માંથી ચાલતું નથી, નોંધ મોકલી "
-"શકાશે નહી"
+msgstr "REV ગોઠવેલ નથી, svn post-commit hook માંથી ચાલતું નથી, નોંધ મોકલી શકાશે નહી"
 
 #: ../IkiWiki/Render.pm:98
 msgid "Discussion"

diff --git a/po/pl.po b/po/pl.po
index cff5349ce470cd4f63fe8cd4b2a4c0af78d0c41b..1e031cbd244e8dd5f7e26b58cdb0f2fca4d0739a 100644 (file)
--- a/po/pl.po
+++ b/po/pl.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki 1.37\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-05 13:13-0500\n"
+"POT-Creation-Date: 2007-01-12 15:56-0500\n"
 "PO-Revision-Date: 2007-01-05 16:33+100\n"
 "Last-Translator: Paweł Tęcza <ptecza@net.icm.edu.pl>\n"
 "Language-Team: Debian L10n Polish <debian-l10n-polish@lists.debian.org>\n"
@@ -25,33 +25,37 @@ msgstr ""
 "strona %s jest tymczasowo zablokowana przez użytkownika %s i nie może być "
 "teraz edytowana"
 
-#: ../IkiWiki/CGI.pm:141
+#: ../IkiWiki/CGI.pm:140
 msgid "You need to log in first."
 msgstr "Konieczne jest zalogowanie się."
 
-#: ../IkiWiki/CGI.pm:259
+#: ../IkiWiki/CGI.pm:257
 msgid "Preferences saved."
 msgstr "Ustawienia zostały zapisane."
 
-#: ../IkiWiki/CGI.pm:410 ../IkiWiki/Plugin/inline.pm:162
+#: ../IkiWiki/CGI.pm:407 ../IkiWiki/Plugin/inline.pm:162
 #: ../IkiWiki/Render.pm:97 ../IkiWiki/Render.pm:161
 msgid "discussion"
 msgstr "dyskusja"
 
-#: ../IkiWiki/CGI.pm:449
+#: ../IkiWiki/CGI.pm:446
 #, perl-format
 msgid "creating %s"
 msgstr "tworzenie strony %s"
 
-#: ../IkiWiki/CGI.pm:466 ../IkiWiki/CGI.pm:509
+#: ../IkiWiki/CGI.pm:463 ../IkiWiki/CGI.pm:506
 #, perl-format
 msgid "editing %s"
 msgstr "edycja strony %s"
 
-#: ../IkiWiki/CGI.pm:626
+#: ../IkiWiki/CGI.pm:623
 msgid "You are banned."
 msgstr "Dostęp został zabroniony przez administratora."
 
+#: ../IkiWiki/CGI.pm:650
+msgid "login failed, perhaps you need to turn on cookies?"
+msgstr ""
+
 #: ../IkiWiki/Plugin/aggregate.pm:61
 #, perl-format
 msgid "aggregate plugin missing %s parameter"

diff --git a/po/sv.po b/po/sv.po
index 77f8d8a3d0d15c2d442cfb7e1c94e3fc40c4dba0..49acaa90f37dbfe68ff6c2944307fa0302ba0d7f 100644 (file)
--- a/po/sv.po
+++ b/po/sv.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: ikiwiki\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2007-01-10 15:32-0500\n"
+"POT-Creation-Date: 2007-01-12 15:56-0500\n"
 "PO-Revision-Date: 2007-01-10 23:47+0100\n"
 "Last-Translator: Daniel Nylander <po@danielnylander.se>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
@@ -22,36 +22,37 @@ msgstr ""
 msgid "%s is locked by %s and cannot be edited"
 msgstr "%s är låst av %s och kan inte redigeras"
 
-#: ../IkiWiki/CGI.pm:141
+#: ../IkiWiki/CGI.pm:140
 msgid "You need to log in first."
 msgstr "Du måste logga in först."
 
-#: ../IkiWiki/CGI.pm:259
+#: ../IkiWiki/CGI.pm:257
 msgid "Preferences saved."
 msgstr "Inställningar sparades."
 
-#: ../IkiWiki/CGI.pm:410
-#: ../IkiWiki/Plugin/inline.pm:162
-#: ../IkiWiki/Render.pm:97
-#: ../IkiWiki/Render.pm:161
+#: ../IkiWiki/CGI.pm:407 ../IkiWiki/Plugin/inline.pm:162
+#: ../IkiWiki/Render.pm:97 ../IkiWiki/Render.pm:161
 msgid "discussion"
 msgstr "diskussion"
 
-#: ../IkiWiki/CGI.pm:449
+#: ../IkiWiki/CGI.pm:446
 #, perl-format
 msgid "creating %s"
 msgstr "skapar %s"
 
-#: ../IkiWiki/CGI.pm:466
-#: ../IkiWiki/CGI.pm:509
+#: ../IkiWiki/CGI.pm:463 ../IkiWiki/CGI.pm:506
 #, perl-format
 msgid "editing %s"
 msgstr "redigerar %s"
 
-#: ../IkiWiki/CGI.pm:626
+#: ../IkiWiki/CGI.pm:623
 msgid "You are banned."
 msgstr "Du är bannlyst."
 
+#: ../IkiWiki/CGI.pm:650
+msgid "login failed, perhaps you need to turn on cookies?"
+msgstr ""
+
 #: ../IkiWiki/Plugin/aggregate.pm:61
 #, perl-format
 msgid "aggregate plugin missing %s parameter"
@@ -135,7 +136,9 @@ msgstr "linkmap misslyckades att köra dot"
 #: ../IkiWiki/Plugin/mdwn.pm:37
 #, perl-format
 msgid "failed to load Markdown.pm perl module (%s) or /usr/bin/markdown (%s)"
-msgstr "misslyckades med att läsa in Perl-modulen Markdown.pm (%s) eller /usr/bin/markdown (%s)"
+msgstr ""
+"misslyckades med att läsa in Perl-modulen Markdown.pm (%s) eller /usr/bin/"
+"markdown (%s)"
 
 #: ../IkiWiki/Plugin/mirrorlist.pm:23
 msgid "Mirrors"
@@ -240,15 +243,18 @@ msgid "getctime not implemented"
 msgstr "getctime inte implementerad"
 
 #: ../IkiWiki/Rcs/svn.pm:206
-msgid "REV is not set, not running from svn post-commit hook, cannot send notifications"
-msgstr "REV är inte inställt, kör inte från svn post-commit-hook, kan inte skicka notifieringar"
+msgid ""
+"REV is not set, not running from svn post-commit hook, cannot send "
+"notifications"
+msgstr ""
+"REV är inte inställt, kör inte från svn post-commit-hook, kan inte skicka "
+"notifieringar"
 
 #: ../IkiWiki/Render.pm:98
 msgid "Discussion"
 msgstr "Diskussion"
 
-#: ../IkiWiki/Render.pm:228
-#: ../IkiWiki/Render.pm:248
+#: ../IkiWiki/Render.pm:228 ../IkiWiki/Render.pm:248
 #, perl-format
 msgid "skipping bad filename %s"
 msgstr "hoppar över felaktigt filnamn %s"
@@ -365,8 +371,7 @@ msgstr "användning: ikiwiki [flaggor] källa mål"
 msgid "Must specify url to wiki with --url when using --cgi"
 msgstr "Måste ange url till wiki med --url när --cgi används"
 
-#: ../IkiWiki.pm:144
-#: ../IkiWiki.pm:145
+#: ../IkiWiki.pm:144 ../IkiWiki.pm:145
 msgid "Error"
 msgstr "Fel"
 
@@ -378,4 +383,3 @@ msgstr "Fel"
 #, perl-format
 msgid "%s preprocessing loop detected on %s at depth %i"
 msgstr "%s förbehandlingsslinga detekterades på %s, djup %i"
-