Re: Break string freeze again for GDM 2.20

[Brian Cameron <Brian Cameron Sun COM>]

Wouter:

Great idea.  I wrote the attached patch to fix the problem more
cleanly based on your suggestion.  Does this look right to you?

Can I get approval to add translations for these two strings?

Thanks,

Brian


> 2008-03-07 klockan 23:06 skrev Brian Cameron:
> > I think you are looking at the wrong patch.  I was meaning this patch:
> >
> >    http://bugzilla.gnome.org/attachment.cgi?id=106612&action=view
> >
> > These patches were improperly marked as translation in the existing
> > code like this.  From daemon/gdm.h:
> >
> > #define GDM_DEFAULT_WELCOME_MSG "Welcome"
> > #define GDM_DEFAULT_REMOTE_WELCOME_MSG "Welcome to %n"
> >
> >  From gui/gdmcommon.c:
> >
> >          welcomemsg = g_strdup (_(GDM_DEFAULT_REMOTE_WELCOME_MSG));
> >          welcomemsg = g_strdup (_(GDM_DEFAULT_WELCOME_MSG));
>
> Why not use N_() in the #define statements? I believe intltool will pick
> them up then.
>
>   mvrgr, Wouter

Index: gui/gdmcommon.c
===================================================================
--- gui/gdmcommon.c	(revision 5937)
+++ gui/gdmcommon.c	(working copy)
@@ -625,29 +625,29 @@
 	 */
         if (ve_string_empty (g_getenv ("GDM_IS_LOCAL"))) {
                 if (gdm_config_get_bool (GDM_KEY_DEFAULT_REMOTE_WELCOME))
-                        welcomemsg = g_strdup (_(GDM_DEFAULT_REMOTE_WELCOME_MSG));
+                        welcomemsg = g_strdup (GDM_DEFAULT_REMOTE_WELCOME_TRANSLATED_MSG);
                 else {
 			tempstr = gdm_config_get_translated_string (GDM_KEY_REMOTE_WELCOME);
 
 			if (tempstr == NULL ||
 			    strcmp (ve_sure_string (tempstr), GDM_DEFAULT_REMOTE_WELCOME_MSG) == 0)
-				welcomemsg = g_strdup (_(GDM_DEFAULT_REMOTE_WELCOME_MSG));
+				welcomemsg = g_strdup (GDM_DEFAULT_REMOTE_WELCOME_TRANSLATED_MSG);
 			else if (strcmp (ve_sure_string (tempstr), GDM_DEFAULT_WELCOME_MSG) == 0)
-		        	welcomemsg = g_strdup (_(GDM_DEFAULT_WELCOME_MSG));
+		        	welcomemsg = g_strdup (GDM_DEFAULT_WELCOME_TRANSLATED_MSG);
 			else
 				welcomemsg = g_strdup (tempstr);
 		}
         } else {
                 if (gdm_config_get_bool (GDM_KEY_DEFAULT_WELCOME))
-                        welcomemsg = g_strdup (_(GDM_DEFAULT_WELCOME_MSG));
+                        welcomemsg = g_strdup (GDM_DEFAULT_WELCOME_TRANSLATED_MSG);
                 else {
                         tempstr = gdm_config_get_translated_string (GDM_KEY_WELCOME);
 
 			if (tempstr == NULL ||
 			    strcmp (ve_sure_string (tempstr), GDM_DEFAULT_WELCOME_MSG) == 0)
-				welcomemsg = g_strdup (_(GDM_DEFAULT_WELCOME_MSG));
+				welcomemsg = g_strdup (GDM_DEFAULT_WELCOME_TRANSLATED_MSG);
 			else if (strcmp (ve_sure_string (tempstr), GDM_DEFAULT_REMOTE_WELCOME_MSG) == 0)
-	        		welcomemsg = g_strdup (_(GDM_DEFAULT_REMOTE_WELCOME_MSG));
+	        		welcomemsg = g_strdup (GDM_DEFAULT_REMOTE_WELCOME_TRANSLATED_MSG);
 			else
        				welcomemsg = g_strdup (tempstr);
 		}
Index: daemon/gdm.h
===================================================================
--- daemon/gdm.h	(revision 5914)
+++ daemon/gdm.h	(working copy)
@@ -67,6 +67,8 @@
  */
 #define GDM_DEFAULT_WELCOME_MSG "Welcome"
 #define GDM_DEFAULT_REMOTE_WELCOME_MSG "Welcome to %n"
+#define GDM_DEFAULT_WELCOME_TRANSLATED_MSG N_("Welcome")
+#define GDM_DEFAULT_REMOTE_WELCOME_TRANSLATED_MSG N_("Welcome to %n")
 
 #define GDM_SESSION_FAILSAFE_GNOME "GDM_Failsafe.GNOME"
 #define GDM_SESSION_FAILSAFE_XTERM "GDM_Failsafe.XTERM"
Index: po/POTFILES.in
===================================================================
--- po/POTFILES.in	(revision 5914)
+++ po/POTFILES.in	(working copy)
@@ -14,6 +14,7 @@
 daemon/gdm-net.c
 daemon/gdm-xdmcp-manager.c
 daemon/gdm.c
+daemon/gdm.h
 daemon/misc.c
 daemon/server.c
 daemon/slave.c