Browse code

some i18n fixes

Hanno Böck authored on31/03/2008 19:45:56
Showing2 changed files
... ...
@@ -9,5 +9,5 @@ install:
9 9
 	mkdir -p ${DESTDIR}${PREFIX}/bin
10 10
 	install -t ${DESTDIR}${PREFIX}/share/freewvs freewvsdb/*.freewvs
11 11
 	install -t ${DESTDIR}${PREFIX}/bin freewvs
12
-	mkdir -p ${DESTDIR}/usr/share/locale/de_DE/LC_MESSAGES
13
-	install i18n/de.mo ${DESTDIR}/usr/share/locale/de_DE/LC_MESSAGES/freewvs.mo
12
+	mkdir -p ${DESTDIR}/usr/share/locale/de/LC_MESSAGES
13
+	install i18n/de.mo ${DESTDIR}/usr/share/locale/de/LC_MESSAGES/freewvs.mo
... ...
@@ -41,13 +41,16 @@ def vulnprint(appname, version, safeversion, vuln, vfilename, subdir, fancy):
41 41
     appdir = '/'.join(os.path.abspath(vfilename).split('/')[:-1-subdir])
42 42
     if fancy:
43 43
         print _("Directory: %(appdir)s") % vars()
44
-        print _("Vulnerable %(appname)s %(version)s found, please update to " \
45
-                "%(safeversion)s or above.") % vars()
46
-        if vuln[:3] == "CVE":
47
-            print _("http://cve.mitre.org/cgi-bin/cvename.cgi?name=%(vuln)s") \
48
-                    % vars()
44
+	if safeversion!="ok":
45
+            print _("Vulnerable %(appname)s %(version)s found, please update to " \
46
+                    "%(safeversion)s or above.") % vars()
47
+            if vuln[:3] == "CVE":
48
+                print _("http://cve.mitre.org/cgi-bin/cvename.cgi?name=%(vuln)s") \
49
+                        % vars()
50
+            else:
51
+                print (vuln)
49 52
         else:
50
-            print (vuln)
53
+            print _("%(appname)s %(version)s found." ) % vars()
51 54
         print
52 55
     else:
53 56
         print "%(appname)s %(version)s (%(safeversion)s) %(vuln)s %(appdir)s" \