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

l10n: Update `wp_get_installed_translations()` to support variants of a language. 

* A variant of a language has its own locale, for example the locale of the formal variant of German is `de_DE_formal`.
* Update `remove_accents()` and some CSS rules to support `de_DE_formal`.
* Add tests for `get_bloginfo( 'language' )`.
* API changes will be deployed over the next few days.

see #28303.
Built from https://develop.svn.wordpress.org/trunk@33027


git-svn-id: http://core.svn.wordpress.org/trunk@32998 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Dominik Schilling 2015-07-01 15:43:24 +00:00
parent d9c5529d30
commit 699dbedb03
9 changed files with 23 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
wp-admin/css/l10n-rtl.css
View File

@ -58,16 +58,20 @@ body.locale-he-il .press-this a.wp-switch-editor {
.locale-zh-cn #sort-buttons { font-size: 1em !important; }
/* de_DE: Text needs more space for translation */
.locale-de-de .inline-edit-row fieldset label span.title {
.locale-de-de .inline-edit-row fieldset label span.title,
.locale-de-de-formal .inline-edit-row fieldset label span.title {
width: 7em; /* default 5em */
}
.locale-de-de .inline-edit-row fieldset label span.input-text-wrap {
.locale-de-de .inline-edit-row fieldset label span.input-text-wrap,
.locale-de-de-formal .inline-edit-row fieldset label span.input-text-wrap {
margin-right: 7em; /* default 5em */
}
.locale-de-de #customize-header-actions .button {
.locale-de-de #customize-header-actions .button,
.locale-de-de-formal #customize-header-actions .button {
padding: 0 5px 1px; /* default 0 10px 1px */
}
.locale-de-de #customize-header-actions .spinner {
.locale-de-de #customize-header-actions .spinner,
.locale-de-de-formal #customize-header-actions .spinner {
margin: 16px 3px 0; /* default 16px 4px 0 5px */
}

12
wp-admin/css/l10n.css
View File

@ -58,16 +58,20 @@ body.locale-he-il .press-this a.wp-switch-editor {
.locale-zh-cn #sort-buttons { font-size: 1em !important; }
/* de_DE: Text needs more space for translation */
.locale-de-de .inline-edit-row fieldset label span.title {
.locale-de-de .inline-edit-row fieldset label span.title,
.locale-de-de-formal .inline-edit-row fieldset label span.title {
width: 7em; /* default 5em */
}
.locale-de-de .inline-edit-row fieldset label span.input-text-wrap {
.locale-de-de .inline-edit-row fieldset label span.input-text-wrap,
.locale-de-de-formal .inline-edit-row fieldset label span.input-text-wrap {
margin-left: 7em; /* default 5em */
}
.locale-de-de #customize-header-actions .button {
.locale-de-de #customize-header-actions .button,
.locale-de-de-formal #customize-header-actions .button {
padding: 0 5px 1px; /* default 0 10px 1px */
}
.locale-de-de #customize-header-actions .spinner {
.locale-de-de #customize-header-actions .spinner,
.locale-de-de-formal #customize-header-actions .spinner {
margin: 16px 3px 0; /* default 16px 4px 0 5px */
}

2
wp-admin/css/login-rtl.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
wp-admin/css/login.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
wp-admin/css/wp-admin-rtl.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
wp-admin/css/wp-admin.min.css vendored
View File

File diff suppressed because one or more lines are too long

2
wp-includes/formatting.php
View File

@ -1138,7 +1138,7 @@ function remove_accents( $string ) {
// Used for locale-specific rules
$locale = get_locale();
if ( 'de_DE' == $locale ) {
if ( 'de_DE' == $locale || 'de_DE_formal' == $locale ) {
$chars[ chr(195).chr(132) ] = 'Ae';
$chars[ chr(195).chr(164) ] = 'ae';
$chars[ chr(195).chr(150) ] = 'Oe';

2
wp-includes/l10n.php
View File

@ -820,7 +820,7 @@ function wp_get_installed_translations( $type ) {
if ( substr( $file, -3 ) !== '.po' ) {
continue;
}
if ( ! preg_match( '/(?:(.+)-)?([A-Za-z_]{2,6}).po/', $file, $match ) ) {
if ( ! preg_match( '/(?:(.+)-)?([a-z]{2,3}(?:_[A-Z]{2})?(?:_[a-z0-9]+)?).po/', $file, $match ) ) {
continue;
}
if ( ! in_array( substr( $file, 0, -3 ) . '.mo', $files ) ) {

2
wp-includes/version.php
View File

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