From a39b57437d15062a4b0452ac5df1ae772670a0bc Mon Sep 17 00:00:00 2001 From: vanhofen Date: Fri, 7 Mar 2014 22:49:36 +0100 Subject: [PATCH] locale: move first-search locale-dir from /var/tuxbox/config/locale ... ... to /var/tuxbox/locale Origin commit data ------------------ Branch: ni/coolstream Commit: https://github.com/neutrino-images/ni-neutrino/commit/e8c0543ac1128922ff5ee45223c1d0b9297d38b6 Author: vanhofen Date: 2014-03-07 (Fri, 07 Mar 2014) Origin message was: ------------------ - locale: move first-search locale-dir from /var/tuxbox/config/locale ... ... to /var/tuxbox/locale ------------------ This commit was generated by Migit --- src/system/localize.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/system/localize.cpp b/src/system/localize.cpp index 6a3f2cb1d..4a196ca88 100644 --- a/src/system/localize.cpp +++ b/src/system/localize.cpp @@ -108,7 +108,8 @@ CLocaleManager::~CLocaleManager() ::free(defaultDataMem); } -const char * path[2] = { CONFIGDIR "/locale/", DATADIR "/neutrino/locale/"}; +#define LOCALEDIR_VAR "/var/tuxbox/locale" +const char * path[2] = { LOCALEDIR_VAR, DATADIR "/neutrino/locale/"}; CLocaleManager::loadLocale_ret_t CLocaleManager::loadLocale(const char * const locale, bool asdefault) {