mirrors/recycled-ni-neutrino
1
0
Fork 0
mirror of https://github.com/tuxbox-fork-migrations/recycled-ni-neutrino.git synced 2025-08-31 01:11:06 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/tuxbox-neutrino/gui-neutrino into ni/mp/tuxbox

Browse Source 
Conflicts:
	src/gui/osd_setup.cpp


Origin commit data
------------------
Branch: ni/coolstream
Commit: c35e647878
Author: vanhofen <vanhofen@gmx.de>
Date: 2017-12-07 (Thu, 07 Dec 2017)



------------------
This commit was generated by Migit
This commit is contained in:
vanhofen
2017-12-07 12:17:23 +01:00
parent 55faf0c143 7bc6dceca8
commit 4bd6a1dcb3
4 changed files with 12 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/system/localize.cpp
View File

@@ -48,8 +48,10 @@
#include <sys/stat.h>
#include <unistd.h>
#define ISO_639_TAB DATADIR "/iso-codes/iso-639.tab"
//static const char * iso639filename = "/usr/share/iso-codes/iso-639.tab";
static const char * iso639filename = "/share/iso-codes/iso-639.tab";
//static const char * iso639filename = "/share/iso-codes/iso-639.tab";
static const char * iso639filename = ISO_639_TAB;
#define DEFAULT_LOCALE "english"