Re: [evolution-patches] Exchange connector: Patch for #270363

[Sarfraaz Ahmed <asarfraaz novell com>]

I see that the string

"You are nearing your quota of %d %s for storing mails on this server.
Your current usage is : %.0f %s."

is getting duplicated in all the 3 warnings. It would be easy for the
translators if we can make this string static and refer it later in
these 3 cases separately.

-- Sarfraaz

On Fri, 2005-05-06 at 10:48 +0530, Sushma Rai wrote:
> Corrected the message and marked for translation.
> Please review,
> Sushma.
> plain text document attachment (quota-msg.diff)
> Index: storage/exchange-account.c
> ===================================================================
> RCS file: /cvs/gnome/evolution-exchange/storage/exchange-account.c,v
> retrieving revision 1.39
> diff -u -r1.39 exchange-account.c
> --- storage/exchange-account.c	11 Mar 2005 07:50:21 -0000	1.39
> +++ storage/exchange-account.c	11 Mar 2005 13:11:27 -0000
> @@ -1523,11 +1523,11 @@
>  	if (gcstatus == E2K_GLOBAL_CATALOG_OK) {
>  
>  		if (entry->quota_norecv && account->mbox_size >= entry->quota_norecv) {
> -			quota_msg = g_strdup_printf ("You have exceeded your quota for storing mails on this server. Your current usage is : %d . You will not be able to either send or recieve mails now\n", entry->quota_norecv);
> +			quota_msg = g_strdup_printf (_("You have exceeded your quota of %d %s for storing mails on this server. Your current usage is : %.0f %s. You will not be able to either send or recieve mails now\n"), entry->quota_norecv, "KB", account->mbox_size, "KB" );
>  		} else if (entry->quota_nosend && account->mbox_size >= entry->quota_nosend) {
> -			quota_msg = g_strdup_printf ("You are nearing your quota available for storing mails on this server. Your current usage is : %d . You will not be able to send mails till you clear up some space by deleting some mails.\n", entry->quota_nosend);
> +			quota_msg = g_strdup_printf (_("You are nearing your quota of %d %s for storing mails on this server. Your current usage is : %.0f %s. You will not be able to send mails till you clear up some space by deleting some mails.\n"), entry->quota_nosend, "KB", account->mbox_size, "KB");
>  		} else if (entry->quota_warn && account->mbox_size >= entry->quota_warn) {
> -			quota_msg = g_strdup_printf ("You are nearing your quota available for storing mails on this server. Your current usage is : %d . Try to clear up some space by deleting some mails.\n", entry->quota_warn);
> +			quota_msg = g_strdup_printf (_("You are nearing your quota of %d %s for storing mails on this server. Your current usage is : %.0f %s. Try to clear up some space by deleting some mails.\n"), entry->quota_warn, "KB", account->mbox_size, "KB");
>  		}
>  		
>  		if (quota_msg)
> Index: ChangeLog
> ===================================================================
> RCS file: /cvs/gnome/evolution-exchange/ChangeLog,v
> retrieving revision 1.295
> diff -u -r1.295 ChangeLog
> --- ChangeLog	11 Mar 2005 07:50:21 -0000	1.295
> +++ ChangeLog	11 Mar 2005 13:11:37 -0000
> @@ -1,4 +1,9 @@
>  2005-03-11  Sushma Rai  <rsushma novell com>
> +
> +	* storage/exchange-account.c (exchange_account_connect): Corrected the
> +	quota warning message and marked it for translation. Fixes #70363.
> +
> +2005-03-11  Sushma Rai  <rsushma novell com>
>  	
>  	* storage/exchange-account.c (is_password_expired)
>  	(exchange_account_set_password): If kerberos calls with windows domain