diff options
author | Wouter van Heyst <larstiq-bforge@larstiq.dyndns.org> | 2004-07-10 17:48:12 +0400 |
---|---|---|
committer | Wouter van Heyst <larstiq-bforge@larstiq.dyndns.org> | 2004-07-10 17:48:12 +0400 |
commit | 5b0e27de5c5232b59b8fe837fd6909eea6f10dd4 (patch) | |
tree | 7220d314f9f230e0b7eac89cddc0b409738a6f8c /source/blender/src/language.c | |
parent | 448d89ef7690b3bceb59c0a6c5fd9ddf02279f46 (diff) |
More closely implement the Installation Policy
<http://www.blender3d.org/cms/Installation_Policy.352.0.html>
- Within those confines 'ERROR: File ".Blanguages" not found' won't show up
again (all such bugs in tracker have already been closed, #745 for reference)
And intrr, if it does, 'cp -a .blender ~' already :P
Of course, this issue should not be fixed on a per file basis (.Blanguages,
.bfont.ttf), but instead return the .blender dir location. Duplicating .blender
finding logic everywhere, sigh.
< jesterKinky> that's what I meant. for now this is ok to continue with, and then in a later stage correct it all in one bigger effort
< jesterKinky> and since you point code at policy url we all can get reminded of how it was supposed to go when cleaning it.
< LarstiQ> jesterKinky: yes, I meant to do a "grrrr, this is the last time I'm not fixing the underlying issue"
< LarstiQ> all your lazy coders are belong to me
< jesterKinky> set us up the superficial bugfix
Diffstat (limited to 'source/blender/src/language.c')
-rw-r--r-- | source/blender/src/language.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/source/blender/src/language.c b/source/blender/src/language.c index c47c992818a..3d3853beb28 100644 --- a/source/blender/src/language.c +++ b/source/blender/src/language.c @@ -339,8 +339,12 @@ int read_languagefile(void) int result; #endif - /* .Blanguages */ + /* .Blanguages, http://www.blender3d.org/cms/Installation_Policy.352.0.html*/ +#if defined (__APPLE__) || (WIN32) BLI_make_file_string("/", name, BLI_gethome(), ".Blanguages"); +#else + BLI_make_file_string("/", name, BLI_gethome(), ".blender/.Blanguages"); +#endif lines= BLI_read_file_as_lines(name); @@ -351,11 +355,9 @@ int read_languagefile(void) char *bundlePath = BLI_getbundle(); strcpy(name, bundlePath); strcat(name, "/Contents/Resources/.Blanguages"); -#elif defined (WIN32) - /* Check the installation dir in Windows */ - strcpy(name, BLI_gethome()); - strcat(name,"/.Blanguages"); #else + /* Check the CWD. Takes care of the case where users + * unpack blender tarball; cd blender-dir; ./blender */ strcpy(name, ".blender/.Blanguages"); #endif lines= BLI_read_file_as_lines(name); |