Re: Break string freeze again for GDM 2.20

[Vincent Untz <vuntz gnome org>]

Le dimanche 09 mars 2008, à 17:23 -0500, Brian Cameron a écrit :
> 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?

Has the patch been tested? If you use N_(), you still have to call _()
later on. So I'd expect the changes in gdmcommon.c to be wrong.

Note that you don't need approval from the i18n team for the change,
since the strings were already there before, but not marked for
translations. (but you still need approval from release team to break
the hard code freeze)

Vincent

> 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

> _______________________________________________
> release-team mailing list
> release-team gnome org
> http://mail.gnome.org/mailman/listinfo/release-team


-- 
Les gens heureux ne sont pas pressés.