[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]

[PATCH] translate cracklib warnings



Hm I wonder why cracklib warnings aren't translated.  Could it be
because we're not including the .mo files?  Nah, that couldn't be it.

- Chris


diff --git a/iw/account_gui.py b/iw/account_gui.py
index 0bbf794..45f396b 100644
--- a/iw/account_gui.py
+++ b/iw/account_gui.py
@@ -125,9 +125,8 @@ class AccountWindow (InstallWindow):
                                     custom_icon="error")
             self.passwordError()
 
-        msg = cracklib.FascistCheck(pw)
+        msg = gettext.ldgettext("cracklib", cracklib.FascistCheck(pw))
         if msg is not None:
-            msg = gettext.ldgettext("cracklib", msg)
             ret = self.intf.messageWindow(_("Weak Password"),
                                           _("Weak password provided: %s"
                                             "\n\n"
diff --git a/scripts/upd-instroot b/scripts/upd-instroot
index 250ed08..23efc51 100755
--- a/scripts/upd-instroot
+++ b/scripts/upd-instroot
@@ -151,7 +151,7 @@ die () {
 PACKAGES="GConf2 NetworkManager ORBit2 PolicyKit VLGothic-fonts acl anaconda
 	anaconda-yum-plugins at-spi atk attr audit-libs bash bitmap-fonts-cjk
 	booty busybox-anaconda bzip2 bzip2-libs cairo cjkunifonts-uming
-	comps-extras coreutils cpio cracklib-dicts cracklib-python
+	comps-extras coreutils cpio cracklib cracklib-dicts cracklib-python
 	cryptsetup-luks db4 dbus dbus-python dejavu-fonts device-mapper
 	device-mapper-libs dhclient dhcpv6-client dmapi dmraid dmraid-libs
 	dogtail dosfstools e2fsprogs e2fsprogs-libs echo-icon-theme
@@ -575,6 +575,7 @@ usr/share/hwdata/usb.ids
 usr/share/hwdata/videoaliases
 usr/share/hwdata/videodrivers
 usr/share/locale/*/LC_MESSAGES/anaconda.mo
+usr/share/locale/*/LC_MESSAGES/cracklib.mo
 usr/share/locale/*/LC_MESSAGES/gtk20.mo
 usr/share/locale/*/LC_MESSAGES/libc.mo
 usr/share/locale/*/LC_MESSAGES/parted.mo
diff --git a/textw/userauth_text.py b/textw/userauth_text.py
index c0ed6dd..152a1c6 100644
--- a/textw/userauth_text.py
+++ b/textw/userauth_text.py
@@ -76,7 +76,7 @@ class RootPasswordWindow:
                       "which are not allowed."),
                     buttons = [ TEXT_OK_BUTTON ], width = 50)
             else:
-                msg = cracklib.FascistCheck(entry1.value())
+                msg = gettext.ldgettext("cracklib", cracklib.FascistCheck(entry1.value()))
                 if msg is not None:
                     ret = anaconda.intf.messageWindow(_("Weak Password"),
                              _("Weak password provided: %s\n\n"


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]