From ad28599e57e98eef3a07fe6d797bf738c848eed5 Mon Sep 17 00:00:00 2001 From: calvin Date: Tue, 16 May 2006 22:15:34 +0000 Subject: [PATCH] Note if URL is missing (instead of saying it is empty) git-svn-id: https://linkchecker.svn.sourceforge.net/svnroot/linkchecker/trunk/linkchecker@3220 e7d03fd6-7b0d-0410-9947-9c21f3af8025 --- linkcheck/checker/urlbase.py | 6 ++++-- po/de.po | 34 +++++++++++++++++++--------------- po/linkchecker.pot | 32 ++++++++++++++++++-------------- 3 files changed, 41 insertions(+), 31 deletions(-) diff --git a/linkcheck/checker/urlbase.py b/linkcheck/checker/urlbase.py index c4d94c9d..cb82b243 100644 --- a/linkcheck/checker/urlbase.py +++ b/linkcheck/checker/urlbase.py @@ -269,8 +269,10 @@ class UrlBase (object): """ assert None == linkcheck.log.debug(linkcheck.LOG_CHECK, "checking syntax") - if (self.base_url is None) or \ - (not self.base_url and not self.parent_url): + if self.base_url is None: + self.set_result(_("URL is missing"), valid=False) + return + if not (self.base_url or self.parent_url): self.set_result(_("URL is empty"), valid=False) return try: diff --git a/po/de.po b/po/de.po index 86774a70..555a82a0 100644 --- a/po/de.po +++ b/po/de.po @@ -5,8 +5,8 @@ msgid "" msgstr "" "Project-Id-Version: $Id$\n" "Report-Msgid-Bugs-To: calvin@users.sourceforge.net\n" -"POT-Creation-Date: 2006-05-16 23:34+0200\n" -"PO-Revision-Date: 2006-05-16 23:35+0100\n" +"POT-Creation-Date: 2006-05-17 00:14+0200\n" +"PO-Revision-Date: 2006-05-17 00:15+0100\n" "Last-Translator: Bastian Kleineidam \n" "Language-Team: de \n" "MIME-Version: 1.0\n" @@ -199,16 +199,20 @@ msgid_plural "%d errors found." msgstr[0] "%d Fehler gefunden." msgstr[1] "%d Fehler gefunden." -#: ../linkcheck/checker/urlbase.py:274 +#: ../linkcheck/checker/urlbase.py:273 +msgid "URL is missing" +msgstr "URL fehlt" + +#: ../linkcheck/checker/urlbase.py:276 msgid "URL is empty" msgstr "URL ist leer" -#: ../linkcheck/checker/urlbase.py:281 +#: ../linkcheck/checker/urlbase.py:283 #, python-format msgid "Effective URL %r." msgstr "Effektive URL %r." -#: ../linkcheck/checker/urlbase.py:298 +#: ../linkcheck/checker/urlbase.py:300 #, python-format msgid "" "URL %r has a unicode domain name which\n" @@ -216,51 +220,51 @@ msgid "" " the URL %r instead." msgstr "URL %r besitzt eine Unicode Domäne, welche noch nicht von allen verarbeitet werden kann. Sie sollten stattdessen die URL %r benutzen." -#: ../linkcheck/checker/urlbase.py:304 +#: ../linkcheck/checker/urlbase.py:306 #, python-format msgid "Base URL is not properly normed. Normed URL is %(url)s." msgstr "Basis URL ist nicht genormt. Genormte URL ist %(url)s." -#: ../linkcheck/checker/urlbase.py:344 +#: ../linkcheck/checker/urlbase.py:346 #, python-format msgid "URL has invalid port %r" msgstr "URL hat eine ungültige Portnummer %r" -#: ../linkcheck/checker/urlbase.py:374 +#: ../linkcheck/checker/urlbase.py:376 #, python-format msgid "URL is located in %s." msgstr "URL befindet sich in %s." -#: ../linkcheck/checker/urlbase.py:390 +#: ../linkcheck/checker/urlbase.py:392 #: ../linkcheck/checker/ignoredurl.py:34 msgid "Outside of domain filter, checked only syntax." msgstr "Außerhalb des Domain Filters; prüfe lediglich Syntax." -#: ../linkcheck/checker/urlbase.py:405 +#: ../linkcheck/checker/urlbase.py:407 msgid "Hostname not found" msgstr "Rechnername nicht gefunden" -#: ../linkcheck/checker/urlbase.py:408 +#: ../linkcheck/checker/urlbase.py:410 #, python-format msgid "Bad HTTP response %r" msgstr "Ungültige HTTP Antwort %r" -#: ../linkcheck/checker/urlbase.py:433 +#: ../linkcheck/checker/urlbase.py:435 #, python-format msgid "could not get content: %r" msgstr "konnte Inhalt nicht parsen: %r" -#: ../linkcheck/checker/urlbase.py:550 +#: ../linkcheck/checker/urlbase.py:552 #, python-format msgid "Anchor #%s not found." msgstr "Anker #%s nicht gefunden." -#: ../linkcheck/checker/urlbase.py:609 +#: ../linkcheck/checker/urlbase.py:611 #, python-format msgid "Found %r in link contents." msgstr "Habe %r in Link Inhalt gefunden." -#: ../linkcheck/checker/urlbase.py:619 +#: ../linkcheck/checker/urlbase.py:621 #, python-format msgid "Content size %s is larger than %s." msgstr "Inhalt %s is größer als %s." diff --git a/po/linkchecker.pot b/po/linkchecker.pot index 1a72809b..842aec3c 100644 --- a/po/linkchecker.pot +++ b/po/linkchecker.pot @@ -8,7 +8,7 @@ msgid "" msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: calvin@users.sourceforge.net\n" -"POT-Creation-Date: 2006-05-16 23:34+0200\n" +"POT-Creation-Date: 2006-05-17 00:14+0200\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -179,16 +179,20 @@ msgid_plural "%d errors found." msgstr[0] "" msgstr[1] "" -#: ../linkcheck/checker/urlbase.py:274 +#: ../linkcheck/checker/urlbase.py:273 +msgid "URL is missing" +msgstr "" + +#: ../linkcheck/checker/urlbase.py:276 msgid "URL is empty" msgstr "" -#: ../linkcheck/checker/urlbase.py:281 +#: ../linkcheck/checker/urlbase.py:283 #, python-format msgid "Effective URL %r." msgstr "" -#: ../linkcheck/checker/urlbase.py:298 +#: ../linkcheck/checker/urlbase.py:300 #, python-format msgid "" "URL %r has a unicode domain name which\n" @@ -196,50 +200,50 @@ msgid "" " the URL %r instead." msgstr "" -#: ../linkcheck/checker/urlbase.py:304 +#: ../linkcheck/checker/urlbase.py:306 #, python-format msgid "Base URL is not properly normed. Normed URL is %(url)s." msgstr "" -#: ../linkcheck/checker/urlbase.py:344 +#: ../linkcheck/checker/urlbase.py:346 #, python-format msgid "URL has invalid port %r" msgstr "" -#: ../linkcheck/checker/urlbase.py:374 +#: ../linkcheck/checker/urlbase.py:376 #, python-format msgid "URL is located in %s." msgstr "" -#: ../linkcheck/checker/urlbase.py:390 ../linkcheck/checker/ignoredurl.py:34 +#: ../linkcheck/checker/urlbase.py:392 ../linkcheck/checker/ignoredurl.py:34 msgid "Outside of domain filter, checked only syntax." msgstr "" -#: ../linkcheck/checker/urlbase.py:405 +#: ../linkcheck/checker/urlbase.py:407 msgid "Hostname not found" msgstr "" -#: ../linkcheck/checker/urlbase.py:408 +#: ../linkcheck/checker/urlbase.py:410 #, python-format msgid "Bad HTTP response %r" msgstr "" -#: ../linkcheck/checker/urlbase.py:433 +#: ../linkcheck/checker/urlbase.py:435 #, python-format msgid "could not get content: %r" msgstr "" -#: ../linkcheck/checker/urlbase.py:550 +#: ../linkcheck/checker/urlbase.py:552 #, python-format msgid "Anchor #%s not found." msgstr "" -#: ../linkcheck/checker/urlbase.py:609 +#: ../linkcheck/checker/urlbase.py:611 #, python-format msgid "Found %r in link contents." msgstr "" -#: ../linkcheck/checker/urlbase.py:619 +#: ../linkcheck/checker/urlbase.py:621 #, python-format msgid "Content size %s is larger than %s." msgstr ""