Context Navigation

Reverse Diff

l10n.php [12257:12179]

File:

: 1 edited

trunk/wp-includes/l10n.php (modified) (11 diffs)

Legend:

: Unmodified
: Added
: Removed

trunk/wp-includes/l10n.php

-              r12257
+              r12179
         global $locale;
         if ( isset( $locale ) )
+        if (isset($locale))
                 return apply_filters( 'locale', $locale );
         // WPLANG is defined in wp-config.
         if ( defined( 'WPLANG' ) )
+        if (defined('WPLANG'))
                 $locale = WPLANG;
         if ( empty( $locale ) )
+        if (empty($locale))
                 $locale = 'en_US';
         return apply_filters( 'locale', $locale );
+        return apply_filters('locale', $locale);
+}
 …
 function translate( $text, $domain = 'default' ) {
         $translations = &get_translations_for_domain( $domain );
         return apply_filters( 'gettext', $translations->translate( $text ), $text, $domain );
+        return apply_filters('gettext', $translations->translate($text), $text, $domain);
+}
 …
 function translate_with_context( $text, $domain = 'default' ) {
         return before_last_bar( translate( $text, $domain ) );
+}
 function translate_with_gettext_context( $text, $context, $domain = 'default' ) {
         $translations = &get_translations_for_domain( $domain );
         return apply_filters( 'gettext_with_context', $translations->translate( $text, $context ), $text, $context, $domain );
+        return apply_filters( 'gettext_with_context', $translations->translate( $text, $context ), $text, $context, $domain);
+}
 …
 /**
  * Retrieve translated string with gettext context
+ * Retrieve translated string with vertical bar context
+ *
  * Quite a few times, there will be collisions with similar translatable text
  * found in more than two places but with different translated context.
+ *
+ * By including the context in the pot file translators can translate the two
+ * string differently
+ *
+ * @since 2.8
+ *
+ * @param string $text Text to translate
+ * @param string $context Context information for the translators
+ * In order to use the separate contexts, the _c() function is used and the
+ * translatable string uses a pipe ('|') which has the context the string is in.
+ *
+ * When the translated string is returned, it is everything before the pipe, not
+ * including the pipe character. If there is no pipe in the translated text then
+ * everything is returned.
+ *
+ * @since 2.2.0
+ *
+ * @param string $text Text to translate
  * @param string $domain Optional. Domain to retrieve the translated text
  * @return string Translated context string without pipe
  */
+function _c($text, $domain = 'default') {
+        return translate_with_context($text, $domain);
+}
 function _x( $single, $context, $domain = 'default' ) {
 …
 function esc_attr_x( $single, $context, $domain = 'default' ) {
         return esc_attr( translate_with_gettext_context( $single, $context, $domain ) );
+}
-function esc_html_x( $single, $context, $domain = 'default' ) {
-        return esc_html( translate_with_gettext_context( $single, $context, $domain ) );
+}
 …
  * @return string Either $single or $plural translated text
  */
 function _n( $single, $plural, $number, $domain = 'default' ) {
+function _n($single, $plural, $number, $domain = 'default') {
         $translations = &get_translations_for_domain( $domain );
         $translation = $translations->translate_plural( $single, $plural, $number );
 …
  * @return bool true on success, false on failure
  */
 function load_textdomain( $domain, $mofile ) {
+function load_textdomain($domain, $mofile) {
         global $l10n;
-        $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 );
         if ( !is_readable( $mofile ) ) return false;
 …
         $l10n[$domain] = &$mo;
         return true;
+}
 …
         $mofile = WP_LANG_DIR . "/$locale.mo";
         return load_textdomain( 'default', $mofile );
+        return load_textdomain('default', $mofile);
+}
 …
  * @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
  */
 function load_plugin_textdomain( $domain, $abs_rel_path = false, $plugin_rel_path = false ) {
+function load_plugin_textdomain($domain, $abs_rel_path = false, $plugin_rel_path = false) {
         $locale = get_locale();
         if ( false !== $plugin_rel_path )
                 $path = WP_PLUGIN_DIR . '/' . trim( $plugin_rel_path, '/' );
         else if ( false !== $abs_rel_path )
                 $path = ABSPATH . trim( $abs_rel_path, '/' );
+                $path = WP_PLUGIN_DIR . '/' . trim( $plugin_rel_path, '/');
+        else if ( false !== $abs_rel_path)
+                $path = ABSPATH . trim( $abs_rel_path, '/');
         else
                 $path = WP_PLUGIN_DIR;
         $mofile = $path . '/'. $domain . '-' . $locale . '.mo';
         return load_textdomain( $domain, $mofile );
+        return load_textdomain($domain, $mofile);
+}
 …
 function &get_translations_for_domain( $domain ) {
         global $l10n;
         if ( !isset( $l10n[$domain] ) ) {
+        if ( !isset($l10n[$domain]) ) {
                 $l10n[$domain] = &new NOOP_Translations;
+        }

Note: See TracChangeset for help on using the changeset viewer.

Make WordPress Core

Context Navigation

Changes in trunk/wp-includes/l10n.php [12257:12179]

Legend:

trunk/wp-includes/l10n.php

Download in other formats: