h/fish-shell
1
Fork 0
mirror of https://github.com/fish-shell/fish-shell.git synced 2026-06-10 12:51:15 -03:00
Code Issues Packages Projects Releases Wiki Activity

Fixup wsetlocale to use wcstring

Browse Source
This commit is contained in:
ridiculousfish
2012-01-31 21:06:52 -08:00
parent eef1e3e77e
commit bb19fe703a
4 changed files with 10 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
env.cpp
View File

@@ -296,7 +296,7 @@ static void handle_locale()
{
const env_var_t lc_all = env_get_string( L"LC_ALL" );
int i;
wchar_t *old = wcsdup(wsetlocale( LC_MESSAGES, NULL ));
const wcstring old_locale = wsetlocale( LC_MESSAGES, NULL );
/*
Array of locale constants corresponding to the local variable names defined in locale_variable
@@ -337,7 +337,8 @@ static void handle_locale()
}
}
if( wcscmp( wsetlocale( LC_MESSAGES, NULL ), old ) != 0 )
const wcstring new_locale = wsetlocale(LC_MESSAGES, NULL);
if( old_locale != new_locale )
{
/*
@@ -357,9 +358,7 @@ static void handle_locale()
{
debug( 0, _(L"Changing language to English") );
}
}
free( old );
}
}