Language lookup improvements

git-svn-id: svn+ssh://svn.gna.org/svn/gnustep/libs/base/trunk@35275 72102866-910b-0410-8b05-ffd578937521
This commit is contained in:
rfm 2012-07-09 10:47:48 +00:00
parent 6741940916
commit 0e756b2efd
6 changed files with 728 additions and 487 deletions

View file

@ -116,6 +116,7 @@ AUTOGSDOC=./$(GNUSTEP_OBJ_DIR_NAME)/autogsdoc
include Makefile.preamble
include $(GNUSTEP_MAKEFILES)/tool.make
#include $(GNUSTEP_MAKEFILES)/test-tool.make
include $(GNUSTEP_MAKEFILES)/ctool.make
include $(GNUSTEP_MAKEFILES)/aggregate.make

View file

@ -59,9 +59,8 @@ loc_read_file(const char *dir, const char *file)
language[0] = '\0';
country[0] = '\0';
while (1)
while (NULL != fgets(buf, MAXSTRING, fp))
{
fgets(buf, MAXSTRING, fp);
if (strstr(buf, "anguage") != NULL)
{
sscanf(&buf[2], "%s", language);
@ -131,7 +130,7 @@ main(int argc, char *argv[])
/* Write out a skeleton file from the current locale */
dict = GSDomainFromDefaultLocale();
lang = GSLanguageFromLocale(GSSetLocale(NULL));
lang = GSLanguageFromLocale(GSSetLocale(0,NULL));
if (lang == nil)
lang = @"Locale";
if (dict)