Translate most shellscript output, translate internal completion descriptions, and several translation bugfixes

darcs-hash:20060105134159-ac50b-0a7805971e079dd1a511c6bca227db4504902ef0.gz

1 files changed, 26 insertions, 1 deletions

diff --git a/translate.c b/translate.c
index 4bf60a35..b2b778ca 100644
--- a/translate.c
+++ b/translate.c
@@ -20,13 +20,36 @@ Translation library, internally uses catgets
 static string_buffer_t buff[BUFF_COUNT];
 static int curr_buff=0;
 
+static char *wcs2str_buff=0;
+static size_t wcs2str_buff_count=0;
+
+char *translate_wcs2str( const wchar_t *in )
+{
+	size_t len = MAX_UTF8_BYTES*wcslen(in)+1;
+	if( len > wcs2str_buff_count )
+	{
+		wcs2str_buff = realloc( wcs2str_buff, len );
+		if( wcs2str_buff == 0 )
+		{
+			die_mem();
+		}
+	}
+	
+	wcstombs( wcs2str_buff, 
+			  in,
+			  MAX_UTF8_BYTES*wcslen(in)+1 );
+	
+	return wcs2str_buff;
+}
+
 const wchar_t *wgettext( const wchar_t *in )
 {
-	char *mbs_in = wcs2str( in );	
+	char *mbs_in = translate_wcs2str( in );	
 	char *out = gettext( mbs_in );
 	wchar_t *wres=0;
 
 	sb_clear( &buff[curr_buff] );
+	
 	sb_printf( &buff[curr_buff], L"%s", out );
 	wres = (wchar_t *)buff[curr_buff].buff;
 	curr_buff = (curr_buff+1)%BUFF_COUNT;
@@ -58,6 +81,8 @@ void translate_destroy()
 	
 	for(i=0; i<BUFF_COUNT; i++ )
 		sb_destroy( &buff[i] );
+
+	free( wcs2str_buff );
 }
 
 #else