From 9e0a92a508743d3bc30b332e94742eeeb5cb8ce2 Mon Sep 17 00:00:00 2001 From: Sarah Hoffmann Date: Fri, 12 Apr 2013 23:12:03 +0200 Subject: [PATCH] allow to disable default language If CONST_Default_Language is set to false, the fallback will be to name tags without a language suffix. Make this the default. --- lib/lib.php | 2 +- settings/settings.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/lib/lib.php b/lib/lib.php index 62ffa293..998e0429 100644 --- a/lib/lib.php +++ b/lib/lib.php @@ -138,7 +138,7 @@ arsort($aLanguages); } } - if (!sizeof($aLanguages)) $aLanguages = array(CONST_Default_Language=>1); + if (!sizeof($aLanguages) && CONST_Default_Language) $aLanguages = array(CONST_Default_Language=>1); foreach($aLanguages as $sLangauge => $fLangauagePref) { $aLangPrefOrder['short_name:'.$sLangauge] = 'short_name:'.$sLangauge; diff --git a/settings/settings.php b/settings/settings.php index 771cf80f..f2cdf918 100644 --- a/settings/settings.php +++ b/settings/settings.php @@ -56,7 +56,7 @@ @define('CONST_Website_BaseURL', 'http://'.php_uname('n').'/'); @define('CONST_Tile_Default', 'Mapnik'); - @define('CONST_Default_Language', 'xx'); + @define('CONST_Default_Language', false); @define('CONST_Default_Lat', 20.0); @define('CONST_Default_Lon', 0.0); @define('CONST_Default_Zoom', 2);