Ticket #23907: 23907.5.diff

src/wp-includes/formatting.php

@@ -798 +798 @@
                         $chars[ chr(195).chr(156) ] = 'Ue';
                         $chars[ chr(195).chr(188) ] = 'ue';
                         $chars[ chr(195).chr(159) ] = 'ss';
+                 }
+
+                if ( 'da_DK' === $locale || 'sv_SE' === $locale || 'nb_NO' === $locale || 'nn_NO' === $locale ) {
+                        $chars[ chr(195).chr(134) ] = 'Ae';
+                        $chars[ chr(195).chr(166) ] = 'ae';
+                        $chars[ chr(195).chr(152) ] = 'Oe';
+                        $chars[ chr(195).chr(184) ] = 'oe';
+                        $chars[ chr(195).chr(133) ] = 'Aa';
+                        $chars[ chr(195).chr(165) ] = 'aa';
                 }
 
                 $string = strtr($string, $chars);

tests/phpunit/tests/formatting/RemoveAccents.php

@@ -94 +94 @@
 
                 remove_filter( 'locale', array( $this, '_remove_accents_germanic_umlauts_cb' ) );
         }
+        
+        public function _set_locale_to_danish() {
+                return 'da_DK';
+        }
+        
+        /**
+         * @ticket 23907
+         */
+        public function test_remove_danish_accents() {
+                add_filter( 'locale', array( $this, '_set_locale_to_danish' ) );
+                
+                $this->assertEquals( 'AeOeAaaeoeaa', remove_accents( 'ÆØÅæøå' ) );
+                
+                remove_filter( 'locale', array( $this, '_set_locale_to_danish' ) );
+        }
+        
+        public function _set_locale_to_swedish() {
+                return 'sv_SE';
+        }
+        
+        /**
+         * @ticket 23907
+         */
+        public function test_remove_swedish_accents() {
+                add_filter( 'locale', array( $this, '_set_locale_to_swedish' ) );
+                
+                $this->assertEquals( 'AeOeAaaeoeaa', remove_accents( 'ÆØÅæøå' ) );
+                
+                remove_filter( 'locale', array( $this, '_set_locale_to_swedish' ) );
+        }
+        
+        public function _set_locale_to_norwegian_bokmaal() {
+                return 'nb_NO';
+        }
+        
+        /**
+         * @ticket 23907
+         */
+        public function test_remove_norwegian_bokmaal_accents() {
+                add_filter( 'locale', array( $this, '_set_locale_to_norwegian_bokmaal' ) );
+                
+                $this->assertEquals( 'AeOeAaaeoeaa', remove_accents( 'ÆØÅæøå' ) );
+                
+                remove_filter( 'locale', array( $this, '_set_locale_to_norwegian_bokmaal' ) );
+        }
+        
+        public function _set_locale_to_norwegian_nynorsk() {
+                return 'nn_NO';
+        }
+        
+        /**
+         * @ticket 23907
+         */
+        public function test_remove_norwegian_nynorsk_accents() {
+                add_filter( 'locale', array( $this, '_set_locale_to_norwegian_nynorsk' ) );
+                
+                $this->assertEquals( 'AeOeAaaeoeaa', remove_accents( 'ÆØÅæøå' ) );
+                
+                remove_filter( 'locale', array( $this, '_set_locale_to_norwegian_nynorsk' ) );
+        }
 }