e16
/
e16
3
0
Fork 1
Code Issues Pull Requests Projects Releases Wiki Activity

Thu Dec 23 10:59:57 PST 1999 

(Raster)

use setlocale....


SVN revision: 1746
This commit is contained in:
Carsten Haitzler 1999-12-23 10:32:45 +00:00
parent 2b7610b394
commit 68e748250e
4 changed files with 36 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/ChangeLog
View File

@ -4119,3 +4119,10 @@ Thu Dec 23 10:46:56 PST 1999
(Raster)
dont animate if animate is turend off for iconbox when dnd to iconbox..
-------------------------------------------------------------------------------
Thu Dec 23 10:59:57 PST 1999
(Raster)
use setlocale....

5
src/E.h
View File

@ -73,11 +73,10 @@
#include <sys/resource.h>
#include <sys/ipc.h>
#include <sys/shm.h>
#ifdef HAVE_FREETYPE_H
#include <freetype.h>
#endif
#ifdef HAVE_FREETYPE_FREETYPE_H
#include <freetype/freetype.h>
#else
#include <freetype.h>
#endif
#include "econfig.h"

27
src/config.c
View File

@ -3546,7 +3546,7 @@ FindFile(char *file)
EDBUG(6, "FindFile");
#ifndef __EMX__
locale = getenv("LANG");
locale = setlocale(LC_MESSAGES, NULL);
#endif
/* if absolute path - and file exists - return it */
@ -3617,8 +3617,14 @@ char *
FindNoThemeFile(char *file)
{
char s[FILEPATH_LEN_MAX];
char *locale = NULL;
EDBUG(6, "FindFile");
#ifndef __EMX__
locale = setlocale(LC_MESSAGES, NULL);
#endif
/* if absolute path - and file exists - return it */
#ifndef __EMX__
if (file[0] == '/')
@ -3626,6 +3632,13 @@ FindNoThemeFile(char *file)
if (_fnisabs(file))
#endif
{
if (locale)
{
Esnprintf(s, sizeof(s), "%s.%s", file, locale);
if (isfile(s))
EDBUG_RETURN(duplicate(s));
}
if (isfile(file))
EDBUG_RETURN(duplicate(file));
}
@ -3637,11 +3650,23 @@ FindNoThemeFile(char *file)
}
#endif
/* look in ~/.enlightenment first */
if (locale)
{
Esnprintf(s, sizeof(s), "%s/%s.%s", UserEDir(), file, locale);
if (isfile(s))
EDBUG_RETURN(duplicate(s));
}
Esnprintf(s, sizeof(s), "%s/%s", UserEDir(), file);
if (isfile(s))
EDBUG_RETURN(duplicate(s));
/* look in system config dir */
#ifndef __EMX__
if (locale)
{
Esnprintf(s, sizeof(s), "%s/config/%s.%s", ENLIGHTENMENT_ROOT, file, locale);
if (isfile(s))
EDBUG_RETURN(duplicate(s));
}
Esnprintf(s, sizeof(s), "%s/config/%s", ENLIGHTENMENT_ROOT, file);
#else
Esnprintf(s, sizeof(s), "%s/config/%s", __XOS2RedirRoot(ENLIGHTENMENT_ROOT),

2
src/menus.c
View File

@ -1634,7 +1634,7 @@ CreateMenuFromGnome(char *name, MenuStyle * ms, char *dir)
EDBUG(5, "CreateMenuFromGnome");
if ((lang = getenv("LANG")) != NULL)
if ((lang = setlocale(LC_MESSAGES, NULL)) != NULL)
Esnprintf(name_buf, sizeof(name_buf), "Name[%s]=", lang);
else
name_buf[0] = '\0';