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

Tue Dec 21 08:23:33 PST 1999 

(Raster)

patch for file finding internationalisation...


SVN revision: 1715
This commit is contained in:
Carsten Haitzler 1999-12-21 08:30:26 +00:00
parent efefd944ba
commit d5effb2c63
2 changed files with 39 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/ChangeLog
View File

@ -4087,3 +4087,10 @@ fix some consitancies for text but peter um.. :) not all that patch was
typos.. the original spelling was correct. I was using "English" not "American"
:) (note Enlish spelligns for colour is coloUr not color, and initialise is
with an S not a Z in English) :)
-------------------------------------------------------------------------------
Tue Dec 21 08:23:33 PST 1999
(Raster)
patch for file finding internationalisation...

32
src/config.c
View File

@ -3541,8 +3541,14 @@ char *
FindFile(char *file)
{
char s[FILEPATH_LEN_MAX];
char *locale = NULL;
EDBUG(6, "FindFile");
#ifndef __EMX__
locale = getenv("LANG");
#endif
/* if absolute path - and file exists - return it */
#ifndef __EMX__
if (file[0] == '/')
@ -3550,6 +3556,13 @@ FindFile(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));
}
@ -3561,15 +3574,34 @@ FindFile(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 theme dir */
if (locale)
{
Esnprintf(s, sizeof(s), "%s/%s.%s", themepath, file, locale);
if (isfile(s))
EDBUG_RETURN(duplicate(s));
}
Esnprintf(s, sizeof(s), "%s/%s", themepath, 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),