From 095bfd5c8eccb477e322519b4c86957ec2a9de02 Mon Sep 17 00:00:00 2001
From: andi <andi@splitbrain.org>
Date: Mon, 24 Jan 2005 20:26:53 +0100
Subject: [PATCH] locales removed
darcs-hash:20050124192653-9977f-9b17dd147f4bf9b89a83b1d475943a85ab35e0ca.gz
---
doku.php | 1 -
inc/common.php | 3 ++-
lang/cs/lang.php | 6 ------
lang/da/lang.php | 6 ------
lang/de/lang.php | 9 ---------
lang/en/lang.php | 6 ------
lang/es/lang.php | 7 -------
lang/eu/lang.php | 7 -------
lang/fi/lang.php | 6 ------
lang/fr/lang.php | 7 -------
lang/hu/lang.php | 4 ----
lang/nl/lang.php | 7 -------
lang/no/lang.php | 8 --------
lang/pl/lang.php | 6 ------
lang/pt/lang.php | 7 -------
lang/ru/lang.php | 7 -------
lang/sv/lang.php | 6 ------
lang/tw/lang.php | 6 ------
lang/zh/lang.php | 6 ------
19 files changed, 2 insertions(+), 113 deletions(-)
diff --git a/doku.php b/doku.php
index 074c932db..d37f88626 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 dddb231cf..dc50028b8 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 55b908127..dded59516 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 caec9ea10..11d6641bf 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 d7d1eceb5..442f23194 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 213a60f3f..34b305723 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 38684f112..6f7a73a0d 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 aa4f50f68..910d942d1 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 178d43d76..27f0c3503 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 df8bc1bee..f659060f6 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 6a2dfd070..d8c7c9471 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 3d98234c0..0ad90f3cb 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 e2535af8d..47c524632 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 6a963a9e1..5bf6cc2df 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 fd95aebb9..0642aef46 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 73c28c1fb..6ee8c344e 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 58202321d..3b9093a31 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 b048fb670..d4d2a9d27 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 182d18e8a..69d2f6d7e 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'] = 'ÏÔʾҳÃæÀ´Ô´';
--
GitLab