Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

I18N: In `remove_accents()`, add support for `de_CH` and `de_CH_informal`. 

Props grapplerulrich.
Fixes #37076.
Built from https://develop.svn.wordpress.org/trunk@37698


git-svn-id: http://core.svn.wordpress.org/trunk@37664 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2016-06-14 17:44:30 +00:00
parent 7ddbbfec08
commit 54aafeedbe
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wp-includes/formatting.php
View File

@ -1460,7 +1460,8 @@ function utf8_uri_encode( $utf8_string, $length = 0 ) {
* | U+1EF8 | Ỹ | Y | Latin capital letter Y with tilde |
* | U+1EF9 | ỹ | y | Latin small letter y with tilde |
*
* German (`de_DE`) and German formal (`de_DE_formal`) locales:
* German (`de_DE`), German formal (`de_DE_formal`), German (Switzerland) formal (`de_CH`),
* and German (Switzerland) informal (`de_CH_informal`) locales:
*
* | Code | Glyph | Replacement | Description |
* | -------- | ----- | ----------- | --------------------------------------- |
@ -1484,6 +1485,7 @@ function utf8_uri_encode( $utf8_string, $length = 0 ) {
* | U+00E5 | å | aa | Latin small letter a with ring above |
*
* @since 1.2.1
* @since 4.6.0 Locale support was added for `de_CH` and `de_CH_informal`.
*
* @param string $string Text that might have accent characters
* @return string Filtered string with replaced "nice" characters.
@ -1672,7 +1674,7 @@ function remove_accents( $string ) {
// Used for locale-specific rules
$locale = get_locale();
if ( 'de_DE' == $locale || 'de_DE_formal' == $locale ) {
if ( 'de_DE' == $locale || 'de_DE_formal' == $locale || 'de_CH' == $locale || 'de_CH_informal' == $locale ) {
$chars[ chr(195).chr(132) ] = 'Ae';
$chars[ chr(195).chr(164) ] = 'ae';
$chars[ chr(195).chr(150) ] = 'Oe';

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.6-alpha-37697';
$wp_version = '4.6-alpha-37698';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.