Reverting r51209 -- change to German number formatting per bug 18957.

Apparently there is wild disagreement on what the proper formatting is; since no one complained in the previous 8 years I'm returning it to the status quo.

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 4200dbd..06b9ab2 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -253,7 +253,6 @@ changes to languages because of MediaZilla reports.
 * (bug 18806) Use correct unicode characters in spelling of native Chuvash
   (Чӑвашла)
 * (bug 18864) Updated autonym for Zhuang language
-* (bug 18957) Updated number formatting for German (de)
 * (bug 18308) Updated date formatting in Occitan (oc)
 * (bug 19080) Added ăâîşţșțĂÂÎŞŢȘȚ to Romanion (ro) linktrail
 * (bug 19286) Correct commafying function in Polish (pl)

diff --git a/languages/classes/LanguageDe.php b/languages/classes/LanguageDe.php
deleted file mode 100644 (file)
index b6fe048..0000000
--- a/languages/classes/LanguageDe.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-/** German
- *
- * @ingroup Language
- */
-class LanguageDe extends Language {
-
-       /*
-        * FIXME: Comment is wrong, decimals prevent space suppression
-        * German numeric format is "12 345,67" but "1234,56"
-        * Copied from LanguageUk.php
-        */
-
-       function commafy($_) {
-               if (!preg_match('/^\d{1,4}$/',$_)) {
-                       return strrev((string)preg_replace('/(\d{3})(?=\d)(?!\d*\.)/','$1,',strrev($_)));
-               } else {
-                       return $_;
-               }
-       }
-}

diff --git a/languages/messages/MessagesDe.php b/languages/messages/MessagesDe.php
index 058fae3..ec9d146 100644 (file)
--- a/languages/messages/MessagesDe.php
+++ b/languages/messages/MessagesDe.php
@@ -60,6 +60,7 @@ $namespaceAliases = array(
        'Bild_Diskussion' => NS_FILE_TALK,
 );
 
+
 $bookstoreList = array(
        'abebooks.de' => 'http://www.abebooks.de/servlet/BookSearchPL?ph=2&isbn=$1',
        'amazon.de' => 'http://www.amazon.de/exec/obidos/ISBN=$1',
@@ -68,11 +69,7 @@ $bookstoreList = array(
        'Lehmanns Fachbuchhandlung' => 'http://www.lob.de/cgi-bin/work/suche?flag=new&stich1=$1'
 );
 
-$separatorTransformTable = array(
-       ',' => "\xc2\xa0", # nbsp
-       '.' => ','
-);
-
+$separatorTransformTable = array(',' => '.', '.' => ',' );
 $linkTrail = '/^([äöüßa-z]+)(.*)$/sDu';
 
 $specialPageAliases = array(