Changeset 12257

Timestamp:

11/22/2009 12:07:41 PM (15 years ago)

Author:

westi

Message:

Mark _c() as Deprecated people should use the new _x() instead. Fixes #11225.

Location:

trunk/wp-includes

Files:

• deprecated.php (modified) (1 diff)
• l10n.php (modified) (1 diff)

trunk/wp-includes/deprecated.php

@@ -1787 +1787 @@
 }
 
+/**
+ * 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.
+ *
+ * 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
+ * @deprecated 2.9.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' ) {
+    _deprecated_function(__FUNCTION__, '2.9', '_x' );
+    return translate_with_context( $text, $domain );
+}
 ?>

trunk/wp-includes/l10n.php

@@ -177 +177 @@
 
 /**
- * Retrieve translated string with vertical bar context
+ * Retrieve translated string with gettext context
  *
  * Quite a few times, there will be collisions with similar translatable text
  * found in more than two places but with different translated context.
  *
- * 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
+ * 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
  * @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' ) {