rpms/kdebase-workspace/F-10 kdebase-workspace-4.1.2-kdm-i18n.patch, NONE, 1.1 kdebase-workspace.spec, 1.137, 1.138

[Than Ngo]

Author: than

Update of /cvs/extras/rpms/kdebase-workspace/F-10
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv9680

Modified Files:
	kdebase-workspace.spec 
Added Files:
	kdebase-workspace-4.1.2-kdm-i18n.patch 
Log Message:
fix i18n issue in kdm



kdebase-workspace-4.1.2-kdm-i18n.patch:

--- NEW FILE kdebase-workspace-4.1.2-kdm-i18n.patch ---
diff -up kdebase-workspace-4.1.2/kdm/kfrontend/themer/kdmlabel.cpp.i18n kdebase-workspace-4.1.2/kdm/kfrontend/themer/kdmlabel.cpp
--- kdebase-workspace-4.1.2/kdm/kfrontend/themer/kdmlabel.cpp.i18n	2008-11-05 17:56:34.000000000 +0100
+++ kdebase-workspace-4.1.2/kdm/kfrontend/themer/kdmlabel.cpp	2008-11-05 17:54:19.000000000 +0100
@@ -234,24 +234,24 @@ KdmLabel::update()
 }
 
 static const struct {
-	const char *type, *text;
+	const char *type, *text, *context;
 } stocks[] = {
-	{ "language",          I18N_NOOP2("@action:button", "Lan_guage") },
-	{ "session",           I18N_NOOP2("@action:button", "Session _Type") },
-	{ "system",            I18N_NOOP2("@action:button", "_Menu") },	// i18n("Actions");
-	{ "disconnect",        I18N_NOOP2("@action:button ... from XDMCP server", "Disconn_ect") },
-	{ "quit",              I18N_NOOP2("@action:button", "_Quit") },
-	{ "halt",              I18N_NOOP2("@action:button", "Power o_ff") },
-//	{ "suspend",           I18N_NOOP2("@action:button", "_Suspend") },
-	{ "reboot",            I18N_NOOP2("@action:button", "Re_boot") },
-	{ "chooser",           I18N_NOOP2("@action:button", "_Remote login") },
-	{ "caps-lock-warning", I18N_NOOP("Caps Lock is enabled") },
-	{ "timed-label",       I18N_NOOP("User %u will log in in %t") },
-	{ "welcome-label",     I18N_NOOP("Welcome to %h") },	// _greetString
-	{ "domain-label",      I18N_NOOP("_Domain:") },
-	{ "username-label",    I18N_NOOP("_Username:") },
-	{ "password-label",    I18N_NOOP("_Password:") },
-	{ "login",             I18N_NOOP2("@action:button", "_Login") }
+	{ "language",          I18N_NOOP2("@action:button", "Lan_guage"), "@action:button" },
+	{ "session",           I18N_NOOP2("@action:button", "Session _Type"), "@action:button" },
+	{ "system",            I18N_NOOP2("@action:button", "_Menu"), "@action:button" },	// i18n("Actions");
+	{ "disconnect",        I18N_NOOP2("@action:button ... from XDMCP server", "Disconn_ect"), "@action:button" },
+	{ "quit",              I18N_NOOP2("@action:button", "_Quit"), "@action:button" },
+	{ "halt",              I18N_NOOP2("@action:button", "Power o_ff"), "@action:button" },
+//	{ "suspend",           I18N_NOOP2("@action:button", "_Suspend") , "@action:button"},
+	{ "reboot",            I18N_NOOP2("@action:button", "Re_boot"), "@action:button" },
+	{ "chooser",           I18N_NOOP2("@action:button", "_Remote login"), "@action:button" },
+	{ "caps-lock-warning", I18N_NOOP("Caps Lock is enabled"), NULL },
+	{ "timed-label",       I18N_NOOP("User %u will log in in %t"), NULL },
+	{ "welcome-label",     I18N_NOOP("Welcome to %h"), NULL },	// _greetString
+	{ "domain-label",      I18N_NOOP("_Domain:"), NULL },
+	{ "username-label",    I18N_NOOP("_Username:"), NULL },
+	{ "password-label",    I18N_NOOP("_Password:"), NULL },
+	{ "login",             I18N_NOOP2("@action:button", "_Login"), "@action:button" }
 };
 
 // public static
@@ -260,10 +260,15 @@ KdmLabel::lookupStock( const QString &st
 {
 	QString type( stock.toLower() );
 
-	for (uint i = 0; i < sizeof(stocks)/sizeof(stocks[0]); i++)
-		if (type == stocks[i].type)
-			return i18n(stocks[i].text);
-
+	for (uint i = 0; i < sizeof(stocks)/sizeof(stocks[0]); i++) {
+		if (type == stocks[i].type) {
+			if (stocks[i].context) {
+				return i18nc(stocks[i].context, stocks[i].text);
+			}
+			else
+				return i18n(stocks[i].text);
+		}
+	}
 	kWarning() << "Invalid <stock> element '" << stock << "'. Check your theme!";
 	return stock;
 }


Index: kdebase-workspace.spec
===================================================================
RCS file: /cvs/extras/rpms/kdebase-workspace/F-10/kdebase-workspace.spec,v
retrieving revision 1.137
retrieving revision 1.138
diff -u -r1.137 -r1.138
--- kdebase-workspace.spec	4 Nov 2008 18:23:31 -0000	1.137
+++ kdebase-workspace.spec	5 Nov 2008 17:47:20 -0000	1.138
@@ -3,7 +3,7 @@
 Summary: K Desktop Environment - Workspace
 Name: kdebase-workspace
 Version: 4.1.2
-Release: 11%{?dist}
+Release: 12%{?dist}
 Source0: ftp://ftp.kde.org/pub/kde/unstable/%{version}/src/kdebase-workspace-%{version}.tar.bz2
 License: GPLv2
 Group: User Interface/Desktops
@@ -28,6 +28,7 @@
 Patch12: kdebase-workspace-4.1.2-multihead.patch
 Patch13: kdebase-workspace-4.1.2-session-button.patch
 Patch14: kdebase-workspace-4.1.2-ldap.patch
+Patch15: kdebase-workspace-4.1.2-kdm-i18n.patch
 
 # upstream patches:
 # backport Plasma tooltip manager from KDE 4.2 (fixes regression from 4.0)
@@ -207,6 +208,7 @@
 %patch12 -p1 -b .multihead
 %patch13 -p1 -b .session-button
 %patch14 -p1 -b .ldap
+%patch15 -p1 -b .kdm-i18n
 
 # upstream patches
 %patch100 -p1 -b .plasma-tooltips
@@ -356,6 +358,9 @@
 
 
 %changelog
+* Wed Nov 05 2008 Than Ngo <than at redhat.com> 4.1.2-12
+- fix i18n issue in kdm
+
 * Tue Nov 04 2008 Than Ngo <than at redhat.com> 4.1.2-11
 - add workaround for ldap issue