Removed obsolete code

diff --git a/wcfsetup/install/files/lib/data/language/Language.class.php b/wcfsetup/install/files/lib/data/language/Language.class.php
index 4387c3126a24ed6edfaa74a90dffd5ee8b86e20e..928c1ff8f1fa4c9340628f7999443d18c8302d36 100644 (file)
--- a/wcfsetup/install/files/lib/data/language/Language.class.php
+++ b/wcfsetup/install/files/lib/data/language/Language.class.php
@@ -173,18 +173,6 @@ class Language extends DatabaseObject {
                return false;
        }
        
-       /**
-        * Sets the local language.
-        * Recall this function after language changed.
-        * 
-        * @param       integer         $languageID
-        */
-       public function setLocale() {
-               // set locale for string comparison, character classification and conversion
-               setlocale(LC_COLLATE, $this->get('wcf.global.locale.unix').'.UTF-8', $this->get('wcf.global.locale.unix'), $this->get('wcf.global.locale.win'));
-               setlocale(LC_CTYPE, $this->get('wcf.global.locale.unix').'.UTF-8', $this->get('wcf.global.locale.unix'), $this->get('wcf.global.locale.win'));
-       }
-       
        /**
         * Returns language icon path.
         * 

diff --git a/wcfsetup/install/files/lib/data/language/SetupLanguage.class.php b/wcfsetup/install/files/lib/data/language/SetupLanguage.class.php
index 09789ee9cad13b25c8ed3f1b03e30c0d1f1b1913..46afac176deb40caba70fae0c004af4774876f2d 100644 (file)
--- a/wcfsetup/install/files/lib/data/language/SetupLanguage.class.php
+++ b/wcfsetup/install/files/lib/data/language/SetupLanguage.class.php
@@ -75,6 +75,5 @@ class SetupLanguage extends Language {
                }
                
                include_once($filename);
-               $this->setLocale();
        }
 }

diff --git a/wcfsetup/install/files/lib/system/WCF.class.php b/wcfsetup/install/files/lib/system/WCF.class.php
index 49c814e933c25d91d5c4ae1f74253757e9d67c88..46d353b152e0f836e9b7e1835b6995b824e8a2a7 100644 (file)
--- a/wcfsetup/install/files/lib/system/WCF.class.php
+++ b/wcfsetup/install/files/lib/system/WCF.class.php
@@ -363,7 +363,6 @@ class WCF {
                
                // get language
                self::$languageObj = LanguageFactory::getInstance()->getUserLanguage(self::getSession()->getLanguageID());
-               self::$languageObj->setLocale();
        }
        
        /**

diff --git a/wcfsetup/install/lang/de.xml b/wcfsetup/install/lang/de.xml
index 3fac6c5ca6981f143940f107b04c70805172e544..64b5999ff80d0da188051cd87ccaa13d816fc0c8 100644 (file)
--- a/wcfsetup/install/lang/de.xml
+++ b/wcfsetup/install/lang/de.xml
@@ -756,8 +756,6 @@
                <item name="wcf.global.form.error.multilingual"><![CDATA[Bitte füllen Sie dieses Eingabefeld für jede Sprache aus.]]></item>
                <item name="wcf.global.language.noSelection"><![CDATA[Keine Auswahl]]></item>
                <item name="wcf.global.loading"><![CDATA[Lädt …]]></item>
-               <item name="wcf.global.locale.unix"><![CDATA[de_DE]]></item> <!-- system variable; do not translate -->
-               <item name="wcf.global.locale.win"><![CDATA[deu_deu]]></item> <!-- system variable; do not translate -->
                <item name="wcf.global.name"><![CDATA[Name]]></item>
                <item name="wcf.global.objectID"><![CDATA[ID]]></item>
                <item name="wcf.global.page.next"><![CDATA[Nächste Seite]]></item>

diff --git a/wcfsetup/install/lang/en.xml b/wcfsetup/install/lang/en.xml
index bf9d649d950b191b018187d00a5404c3acd83875..0b66f850ae7cd7d294db0b6602acd4813aced358 100644 (file)
--- a/wcfsetup/install/lang/en.xml
+++ b/wcfsetup/install/lang/en.xml
@@ -651,8 +651,6 @@
                <item name="wcf.global.form.error"><![CDATA[The data you have entered are not valid. Please check the information you have given in the marked fields.]]></item>
                <item name="wcf.global.form.error.empty"><![CDATA[Please enter the required information for this field.]]></item>
                <item name="wcf.global.loading"><![CDATA[Loading …]]></item>
-               <item name="wcf.global.locale.unix"><![CDATA[en_US]]></item> <!-- system variable; do not translate -->
-               <item name="wcf.global.locale.win"><![CDATA[english]]></item> <!-- system variable; do not translate -->
                <item name="wcf.global.name"><![CDATA[Name]]></item>
                <item name="wcf.global.objectID"><![CDATA[ID]]></item>
                <item name="wcf.global.page.next"><![CDATA[Next page]]></item>

diff --git a/wcfsetup/setup/lang/setup_de.xml b/wcfsetup/setup/lang/setup_de.xml
index bbf2f35f17a3c7a4b71417a99be35d513849f6cd..6aa16e90c22af5270578087a752fec5403d20dc9 100644 (file)
--- a/wcfsetup/setup/lang/setup_de.xml
+++ b/wcfsetup/setup/lang/setup_de.xml
@@ -5,8 +5,6 @@
                <item name="wcf.global.title"><![CDATA[{$setupPackageName}]]></item>
                <item name="wcf.global.title.subtitle"><![CDATA[Vorbereiten der Installation]]></item>
                <item name="wcf.global.pageDirection"><![CDATA[ltr]]></item>
-               <item name="wcf.global.locale.unix"><![CDATA[de_DE]]></item>
-               <item name="wcf.global.locale.win"><![CDATA[deu_deu]]></item>
                <item name="wcf.global.decimalPoint"><![CDATA[,]]></item>
                <item name="wcf.global.thousandsSeparator"><![CDATA[.]]></item>
                <item name="wcf.global.button.next"><![CDATA[Weiter »]]></item>

diff --git a/wcfsetup/setup/lang/setup_en.xml b/wcfsetup/setup/lang/setup_en.xml
index 3be597a1c0053491327efc3593d713ed60bd9179..2b8edca4042db0d41a12e76b1461ed856f2b87d3 100644 (file)
--- a/wcfsetup/setup/lang/setup_en.xml
+++ b/wcfsetup/setup/lang/setup_en.xml
@@ -5,8 +5,6 @@
                <item name="wcf.global.title"><![CDATA[{$setupPackageName}]]></item>
                <item name="wcf.global.title.subtitle"><![CDATA[Prepairing installation]]></item>
                <item name="wcf.global.pageDirection"><![CDATA[ltr]]></item> <!-- system variable; do not translate -->
-               <item name="wcf.global.locale.unix"><![CDATA[en_US]]></item> <!-- system variable; do not translate -->
-               <item name="wcf.global.locale.win"><![CDATA[english]]></item> <!-- system variable; do not translate -->
                <item name="wcf.global.decimalPoint"><![CDATA[.]]></item>
                <item name="wcf.global.thousandsSeparator"><![CDATA[,]]></item>
                <item name="wcf.global.button.next"><![CDATA[Next »]]></item>