<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[12251] trunk/wp-includes/l10n.php:
Allow plugins to override the behaviour of load_textdomain()
in a variety of flexible ways.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/12251">12251</a></dd>
<dt>Author</dt> <dd>westi</dd>
<dt>Date</dt> <dd>2009-11-21 09:28:32 +0000 (Sat, 21 Nov 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>Allow plugins to override the behaviour of load_textdomain() in a variety of flexible ways. Fixes <a href="http://trac.wordpress.org/ticket/11012">#11012</a> props johanee and nbachiyski.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesl10nphp">trunk/wp-includes/l10n.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesl10nphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/l10n.php (12250 => 12251)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/l10n.php 2009-11-21 09:14:17 UTC (rev 12250)
+++ trunk/wp-includes/l10n.php 2009-11-21 09:28:32 UTC (rev 12251)
</span><span class="lines">@@ -28,17 +28,17 @@
</span><span class="cx"> function get_locale() {
</span><span class="cx"> global $locale;
</span><span class="cx">
</span><del>- if (isset($locale))
</del><ins>+ if ( isset( $locale ) )
</ins><span class="cx"> return apply_filters( 'locale', $locale );
</span><span class="cx">
</span><span class="cx"> // WPLANG is defined in wp-config.
</span><del>- if (defined('WPLANG'))
</del><ins>+ if ( defined( 'WPLANG' ) )
</ins><span class="cx"> $locale = WPLANG;
</span><span class="cx">
</span><del>- if (empty($locale))
</del><ins>+ if ( empty( $locale ) )
</ins><span class="cx"> $locale = 'en_US';
</span><span class="cx">
</span><del>- return apply_filters('locale', $locale);
</del><ins>+ return apply_filters( 'locale', $locale );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -56,7 +56,7 @@
</span><span class="cx"> */
</span><span class="cx"> function translate( $text, $domain = 'default' ) {
</span><span class="cx"> $translations = &get_translations_for_domain( $domain );
</span><del>- return apply_filters('gettext', $translations->translate($text), $text, $domain);
</del><ins>+ return apply_filters( 'gettext', $translations->translate( $text ), $text, $domain );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function before_last_bar( $string ) {
</span><span class="lines">@@ -80,12 +80,11 @@
</span><span class="cx"> */
</span><span class="cx"> function translate_with_context( $text, $domain = 'default' ) {
</span><span class="cx"> return before_last_bar( translate( $text, $domain ) );
</span><del>-
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function translate_with_gettext_context( $text, $context, $domain = 'default' ) {
</span><span class="cx"> $translations = &get_translations_for_domain( $domain );
</span><del>- return apply_filters( 'gettext_with_context', $translations->translate( $text, $context ), $text, $context, $domain);
</del><ins>+ return apply_filters( 'gettext_with_context', $translations->translate( $text, $context ), $text, $context, $domain );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -195,8 +194,8 @@
</span><span class="cx"> * @param string $domain Optional. Domain to retrieve the translated text
</span><span class="cx"> * @return string Translated context string without pipe
</span><span class="cx"> */
</span><del>-function _c($text, $domain = 'default') {
- return translate_with_context($text, $domain);
</del><ins>+function _c( $text, $domain = 'default' ) {
+ return translate_with_context( $text, $domain );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function _x( $single, $context, $domain = 'default' ) {
</span><span class="lines">@@ -239,7 +238,7 @@
</span><span class="cx"> * @param string $domain Optional. The domain identifier the text should be retrieved in
</span><span class="cx"> * @return string Either $single or $plural translated text
</span><span class="cx"> */
</span><del>-function _n($single, $plural, $number, $domain = 'default') {
</del><ins>+function _n( $single, $plural, $number, $domain = 'default' ) {
</ins><span class="cx"> $translations = &get_translations_for_domain( $domain );
</span><span class="cx"> $translation = $translations->translate_plural( $single, $plural, $number );
</span><span class="cx"> return apply_filters( 'ngettext', $translation, $single, $plural, $number, $domain );
</span><span class="lines">@@ -320,8 +319,18 @@
</span><span class="cx"> * @param string $mofile Path to the .mo file
</span><span class="cx"> * @return bool true on success, false on failure
</span><span class="cx"> */
</span><del>-function load_textdomain($domain, $mofile) {
</del><ins>+function load_textdomain( $domain, $mofile ) {
</ins><span class="cx"> global $l10n;
</span><ins>+
+ $plugin_override = apply_filters( 'override_load_textdomain', false, $domain, $mofile );
+
+ if ( true == $plugin_override ) {
+ return true;
+ }
+
+ do_action( 'load_textdomain', $domain, $mofile );
+
+ $mofile = apply_filters( 'load_textdomain_mofile', $mofile, $domain );
</ins><span class="cx">
</span><span class="cx"> if ( !is_readable( $mofile ) ) return false;
</span><span class="cx">
</span><span class="lines">@@ -332,6 +341,7 @@
</span><span class="cx"> $mo->merge_with( $l10n[$domain] );
</span><span class="cx">
</span><span class="cx"> $l10n[$domain] = &$mo;
</span><ins>+
</ins><span class="cx"> return true;
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -348,7 +358,7 @@
</span><span class="cx">
</span><span class="cx"> $mofile = WP_LANG_DIR . "/$locale.mo";
</span><span class="cx">
</span><del>- return load_textdomain('default', $mofile);
</del><ins>+ return load_textdomain( 'default', $mofile );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -364,18 +374,18 @@
</span><span class="cx"> * where the .mo file resides. Deprecated, but still functional until 2.7
</span><span class="cx"> * @param string $plugin_rel_path Optional. Relative path to WP_PLUGIN_DIR. This is the preferred argument to use. It takes precendence over $abs_rel_path
</span><span class="cx"> */
</span><del>-function load_plugin_textdomain($domain, $abs_rel_path = false, $plugin_rel_path = false) {
</del><ins>+function load_plugin_textdomain( $domain, $abs_rel_path = false, $plugin_rel_path = false ) {
</ins><span class="cx"> $locale = get_locale();
</span><span class="cx">
</span><span class="cx"> if ( false !== $plugin_rel_path )
</span><del>- $path = WP_PLUGIN_DIR . '/' . trim( $plugin_rel_path, '/');
- else if ( false !== $abs_rel_path)
- $path = ABSPATH . trim( $abs_rel_path, '/');
</del><ins>+ $path = WP_PLUGIN_DIR . '/' . trim( $plugin_rel_path, '/' );
+ else if ( false !== $abs_rel_path )
+ $path = ABSPATH . trim( $abs_rel_path, '/' );
</ins><span class="cx"> else
</span><span class="cx"> $path = WP_PLUGIN_DIR;
</span><span class="cx">
</span><span class="cx"> $mofile = $path . '/'. $domain . '-' . $locale . '.mo';
</span><del>- return load_textdomain($domain, $mofile);
</del><ins>+ return load_textdomain( $domain, $mofile );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -429,7 +439,7 @@
</span><span class="cx"> */
</span><span class="cx"> function &get_translations_for_domain( $domain ) {
</span><span class="cx"> global $l10n;
</span><del>- if ( !isset($l10n[$domain]) ) {
</del><ins>+ if ( !isset( $l10n[$domain] ) ) {
</ins><span class="cx"> $l10n[$domain] = &new NOOP_Translations;
</span><span class="cx"> }
</span><span class="cx"> return $l10n[$domain];
</span></span></pre>
</div>
</div>
</body>
</html>