Transmission/transmission
1
0
Fork 0
mirror of https://github.com/transmission/transmission.git synced 2025-12-24 20:35:36 +00:00
Code Issues Packages Projects Releases Wiki Activity

(trunk gtk) portability: use g_dngettext() instead of ngettext()

Browse Source
This commit is contained in:
Charles Kerr
2010-08-06 14:38:54 +00:00
parent 0e03b5e287
commit e934290980
10 changed files with 73 additions and 64 deletions
Download Patch File Download Diff File Expand all files Collapse all files

24
gtk/util.c
View File

@@ -179,14 +179,10 @@ tr_strltime( char * buf, int seconds, size_t buflen )
minutes = ( seconds % 3600 ) / 60;
seconds = ( seconds % 3600 ) % 60;
g_snprintf( d, sizeof( d ), ngettext( "%'d day", "%'d days",
days ), days );
g_snprintf( h, sizeof( h ), ngettext( "%'d hour", "%'d hours",
hours ), hours );
g_snprintf( m, sizeof( m ),
ngettext( "%'d minute", "%'d minutes", minutes ), minutes );
g_snprintf( s, sizeof( s ),
ngettext( "%'d second", "%'d seconds", seconds ), seconds );
g_snprintf( d, sizeof( d ), gtr_ngettext( "%'d day", "%'d days", days ), days );
g_snprintf( h, sizeof( h ), gtr_ngettext( "%'d hour", "%'d hours", hours ), hours );
g_snprintf( m, sizeof( m ), gtr_ngettext( "%'d minute", "%'d minutes", minutes ), minutes );
g_snprintf( s, sizeof( s ), gtr_ngettext( "%'d second", "%'d seconds", seconds ), seconds );
if( days )
{
@@ -430,6 +426,18 @@ gtr_strcmp0( const char * str1, const char * str2 )
#endif
}
const gchar *
gtr_ngettext( const gchar * msgid,
const gchar * msgid_plural,
gulong n )
{
#if GLIB_CHECK_VERSION( 2, 18, 0 )
return g_dngettext( NULL, msgid, msgid_plural, n );
#else
return ngettext( msgid, msgid_plural, n );
#endif
}
int
gtr_file_trash_or_remove( const char * filename )
{