diff --git a/doku.php b/doku.php
index 074c932db6aecb1601aa7cb1fc8c9b63a9bf5ed4..d37f88626479ff909690aab5a7b688295ad7a9f9 100644
--- a/doku.php
+++ b/doku.php
@@ -15,7 +15,6 @@
require_once("inc/parser.php");
require_once("lang/en/lang.php");
require_once("lang/".$conf['lang']."/lang.php");
- setCorrectLocale();
require_once("inc/auth.php");
//import variables
diff --git a/inc/common.php b/inc/common.php
index dddb231cf8e77edd48c16b8e1c23b0493ee06650..dc50028b81303b135c72f3ec75c723d0d83c26b4 100644
--- a/inc/common.php
+++ b/inc/common.php
@@ -862,7 +862,8 @@ function getGoogleQuery(){
/**
* Try to set correct locale
*
- * @author Andreas Gohr <andi@splitbrain.org>
+ * @deprecated No longer used
+ * @author Andreas Gohr <andi@splitbrain.org>
*/
function setCorrectLocale(){
global $conf;
diff --git a/lang/cs/lang.php b/lang/cs/lang.php
index 55b908127a966c657f51dc50c8176dbd1cbdc89f..dded59516647a429c4be3828129bd21d3bed88fb 100644
--- a/lang/cs/lang.php
+++ b/lang/cs/lang.php
@@ -6,12 +6,6 @@
* @author Bohumir Zamecnik <bohous@luhy.net>
*/
$lang['encoding'] = 'utf-8';
-$lang['locales'] = array(
- 'cze',
- 'cs_CZ',
- 'cs',
- 'czech',
- );
$lang['btn_edit'] = 'Upravit stránku';
$lang['btn_source'] = 'Zobrazit zdroj stránky';
diff --git a/lang/da/lang.php b/lang/da/lang.php
index caec9ea10c76e3b6fcfb9796e06d4f3ad329b862..11d6641bfc44197ec8645c63705304d0821a49b6 100644
--- a/lang/da/lang.php
+++ b/lang/da/lang.php
@@ -6,12 +6,6 @@
* @author Jon Bendtsen <bendtsen@diku.dk>
*/
$lang['encoding'] = 'utf-8';
-$lang['locales'] = array(
- 'dan',
- 'da_DK',
- 'da',
- 'danish',
- );
$lang['btn_edit'] = 'Editer denne side';
$lang['btn_search'] = 'Søg';
diff --git a/lang/de/lang.php b/lang/de/lang.php
index d7d1eceb5f75e3cdc3b76c70da365dba2b6b47b3..442f23194f029065d896db0a975c6c0fa14445ee 100644
--- a/lang/de/lang.php
+++ b/lang/de/lang.php
@@ -8,15 +8,6 @@
* @author Anika Henke <henke@cosmocode.de>
*/
$lang['encoding'] = 'utf-8';
-$lang['locales'] = array(
- 'deu',
- 'de@euro',
- 'de_DE@euro',
- 'de',
- 'de_DE',
- 'ge',
- 'german',
- );
$lang['btn_edit'] = 'Diese Seite bearbeiten';
$lang['btn_source'] = 'Zeige Quelltext';
diff --git a/lang/en/lang.php b/lang/en/lang.php
index 213a60f3f5993e7afadefc5e7496094049b99fa6..34b3057232bd23b78ebe30b0fd01de09f0e3579f 100644
--- a/lang/en/lang.php
+++ b/lang/en/lang.php
@@ -7,12 +7,6 @@
* @author Anika Henke <henke@cosmocode.de>
*/
$lang['encoding'] = 'utf-8';
-$lang['locales'] = array(
- 'eng',
- 'en_US',
- 'en',
- 'english',
- );
$lang['btn_edit'] = 'Edit this page';
$lang['btn_source'] = 'Show pagesource';
diff --git a/lang/es/lang.php b/lang/es/lang.php
index 38684f112e42f8b750cd440e6fc449859d136b3c..6f7a73a0d7153e091422698cfb20aa012525e31b 100644
--- a/lang/es/lang.php
+++ b/lang/es/lang.php
@@ -6,13 +6,6 @@
* @author Zigor Astarbe <zigor@astarbe.com>
*/
$lang['encoding'] = 'utf-8';
-$lang['locales'] = array(
- 'esp',
- 'es',
- 'es_ES@euro',
- 'es_ES',
- 'spanish',
- );
$lang['btn_edit'] = 'Edita esta página';
$lang['btn_search'] = 'Buscar';
diff --git a/lang/eu/lang.php b/lang/eu/lang.php
index aa4f50f68f281746a5db79d8a7f71479133b2157..910d942d1d8c887d65db071cf169be58fc150f94 100644
--- a/lang/eu/lang.php
+++ b/lang/eu/lang.php
@@ -6,13 +6,6 @@
* @author Xabi Ezpeleta <xezpeleta@mendikute.com>
*/
$lang['encoding'] = 'utf-8';
-$lang['locales'] = array(
- 'eusk',
- 'eu',
- 'eu_ES@euro',
- 'eu_ES',
- 'euskara',
- );
$lang['btn_edit'] = 'Aldatu orri hau';
$lang['btn_source'] = 'Kodea ikusi';
diff --git a/lang/fi/lang.php b/lang/fi/lang.php
index 178d43d761990d2e9e26148af7f7c6d92897601f..27f0c3503584a8007bcec0a35d155f1f810499d7 100644
--- a/lang/fi/lang.php
+++ b/lang/fi/lang.php
@@ -6,12 +6,6 @@
* @author Petteri <petteri@gmail.com>
*/
$lang['encoding'] = 'utf-8';
-$lang['locales'] = array(
- 'fin',
- 'fi_FI@euro',
- 'fi',
- 'finnish',
- );
$lang['btn_edit'] = 'Muokkaa tätä sivua';
$lang['btn_source'] = 'Näytä sivun lähdekoodi';
diff --git a/lang/fr/lang.php b/lang/fr/lang.php
index df8bc1beea2d4bcb17217dc9cbc65c7f79ee8c97..f659060f60930f7b52c98322923afbdf2893c7dc 100644
--- a/lang/fr/lang.php
+++ b/lang/fr/lang.php
@@ -9,13 +9,6 @@
* @author Gwenn Gueguen <contact@demisel.net>
*/
$lang['encoding'] = 'utf-8';
-$lang['locales'] = array(
- 'fr_FR@euro',
- 'fr_FR',
- 'fr',
- 'fra',
- 'french',
- );
$lang['btn_edit'] = 'Editer cette page';
$lang['btn_source'] = 'Montrer le source de la page';
diff --git a/lang/hu/lang.php b/lang/hu/lang.php
index 6a2dfd0706e3ae65c031bbb9121066f41c2abb33..d8c7c947128bfb53b78b8511d1d66e5b56e09419 100644
--- a/lang/hu/lang.php
+++ b/lang/hu/lang.php
@@ -6,10 +6,6 @@
* @author Ziegler Gábor <gziegler@freemail.hu>
*/
$lang['encoding'] = 'utf-8';
-$lang['locales'] = array(
- 'hu',
- 'hu_HU'
- );
$lang['btn_edit'] = 'Oldal szerkesztése';
$lang['btn_source'] = 'Oldalforrás megtekintése';
diff --git a/lang/nl/lang.php b/lang/nl/lang.php
index 3d98234c0c21750a762ad659e2ea4c223fcf9fe0..0ad90f3cbdc723966858be3ca033561bcc9c948f 100644
--- a/lang/nl/lang.php
+++ b/lang/nl/lang.php
@@ -6,13 +6,6 @@
* @author François Kooman <fkooman.tuxed.net>
*/
$lang['encoding'] = 'utf-8';
-$lang['locales'] = array(
- 'nld',
- 'nl_NL@euro',
- 'nl_NL',
- 'nl',
- 'dutch',
- );
$lang['btn_edit'] = 'Pagina aanpassen';
$lang['btn_source'] = 'Toon pagina broncode';
diff --git a/lang/no/lang.php b/lang/no/lang.php
index e2535af8d0a9f99c66f4a472630f25ae4ed9bd58..47c524632d83d03b825f5e378097692c824faaf8 100644
--- a/lang/no/lang.php
+++ b/lang/no/lang.php
@@ -6,14 +6,6 @@
* @author Reidar Mosvold <Reidar.Mosvold@hit.no>
*/
$lang['encoding'] = 'utf-8';
-$lang['locales'] = array(
- 'norwegian',
- 'nor',
- 'no',
- 'no_NO',
- 'no',
- 'norsk',
- );
$lang['btn_edit'] = 'Rediger denne siden';
$lang['btn_source'] = 'Vis kildetekst';
diff --git a/lang/pl/lang.php b/lang/pl/lang.php
index 6a963a9e1c2be37f18218ade1aca057c81a03429..5bf6cc2df712ce2b6972abc0f049034054c01a88 100644
--- a/lang/pl/lang.php
+++ b/lang/pl/lang.php
@@ -6,12 +6,6 @@
* @author Grzegorz _ur <grzesiekzur@tlen.pl>
*/
$lang['encoding'] = 'utf-8';
-$lang['locales'] = array(
- 'pl',
- 'pl_pl',
- 'pl',
- 'polish',
- );
$lang['btn_edit'] = 'Edytuj stronÄ™';
$lang['btn_source'] = 'Pokaż źródło strony';
diff --git a/lang/pt/lang.php b/lang/pt/lang.php
index fd95aebb99fe629563331341cabc8d7b9714550f..0642aef4622ca55fc4480f67b8b889d80b2ed6f2 100644
--- a/lang/pt/lang.php
+++ b/lang/pt/lang.php
@@ -6,13 +6,6 @@
* @author José Carlos Monteiro <jose.c.monteiro@netcabo.pt>
*/
$lang['encoding'] = 'utf-8';
-$lang['locales'] = array(
- 'prt',
- 'pt_PT@euro',
- 'pt_PT',
- 'pt',
- 'portuguese',
- );
$lang['btn_edit'] = 'Editar Página';
$lang['btn_source'] = 'Ver em bruto';
diff --git a/lang/ru/lang.php b/lang/ru/lang.php
index 73c28c1fb14e129c5c82e5bfac9f77600adbccdb..6ee8c344e73377b021bf76fc2b8a2b1b958bf1d3 100644
--- a/lang/ru/lang.php
+++ b/lang/ru/lang.php
@@ -5,13 +5,6 @@
* @license GPL 2 (http://www.gnu.org/licenses/gpl.html)
* @author Jurijs Pimenovs <Jurijs_Pimenovs@exigengroup.lv>
*/
-$lang['encoding'] = 'utf-8';
-$lang['locales'] = array(
- 'rus',
- 'ru_RU',
- 'ru',
- 'russian',
- );
$lang['btn_edit'] = 'Редактировать Ñтраницу';
$lang['btn_source'] = 'Показать иÑходный текÑÑ‚';
diff --git a/lang/sv/lang.php b/lang/sv/lang.php
index 58202321dbea8c01fbc61fb70dddb8372fedf821..3b9093a318419f3b74abe44e565300aed0ad4379 100644
--- a/lang/sv/lang.php
+++ b/lang/sv/lang.php
@@ -6,12 +6,6 @@
* @author Joaquim Homrighausen <joho@webbplatsen.se>
*/
$lang['encoding'] = 'utf-8';
-$lang['locales'] = array(
- 'swe',
- 'sv_SE',
- 'sv',
- 'swedish',
- );
$lang['btn_edit'] = 'Redigera den här sidan';
$lang['btn_source'] = 'Visa sidkälla';
diff --git a/lang/tw/lang.php b/lang/tw/lang.php
index b048fb670e64f28a0a998a536ec15ba65ae209ef..d4d2a9d271da72a962212381699a63fdc15cbaba 100644
--- a/lang/tw/lang.php
+++ b/lang/tw/lang.php
@@ -6,12 +6,6 @@
* @author chinsan <chinsan@mail2000.com.tw>
*/
$lang['encoding'] = 'utf-8';
-$lang['locales'] = array(
- 'UTF-8',
- 'zh_TW.UTF-8',
- 'tw',
- 'chinese(traditional)',
- );
$lang['btn_edit'] = '編修本é ';
$lang['btn_source'] = '顯示é é¢ä¾†æº';
diff --git a/lang/zh/lang.php b/lang/zh/lang.php
index 182d18e8a626fd6f6b7187438d7404bf732ad9d9..69d2f6d7e5545ea9ffa0adb0fc932a904417d662 100644
--- a/lang/zh/lang.php
+++ b/lang/zh/lang.php
@@ -7,12 +7,6 @@
* @author based on tw tranlastion by chinsan <chinsan@mail2000.com.tw>
*/
$lang['encoding'] = 'utf-8';
-$lang['locales'] = array(
- 'GBK',
- 'zh_CN.GBK',
- 'zh',
- 'chinese(simplified)',
- );
$lang['btn_edit'] = '±àÐÞ±¾Ò³';
$lang['btn_source'] = 'ÏÔʾҳÃæÀ´Ô´';