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.

diff --git a/lib/lib.php b/lib/lib.php
index 62ffa29368cd067973c67517efd148201449a143..998e0429740107343ad939e625bdf44fe3701bfe 100644 (file)
--- a/lib/lib.php
+++ b/lib/lib.php
@@ -138,7 +138,7 @@
                                arsort($aLanguages);
                        }
                }
                                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;
                foreach($aLanguages as $sLangauge => $fLangauagePref)
                {
                        $aLangPrefOrder['short_name:'.$sLangauge] = 'short_name:'.$sLangauge;

diff --git a/settings/settings.php b/settings/settings.php
index 771cf80fa6e5f723f340a29f0c3ce2b1df335845..f2cdf9187d7a373ce6262d07229e73a17941915a 100644 (file)
--- 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_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);
        @define('CONST_Default_Lat', 20.0);
        @define('CONST_Default_Lon', 0.0);
        @define('CONST_Default_Zoom', 2);