Changeset 6916 for trunk/wp-includes/l10n.php

Timestamp:

02/19/2008 08:28:54 PM (18 years ago)

Author:

ryan

Message:

Don't save translated role names to the DB. Instead, translate them on the fly. fixes #3442 #5537

File:

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

trunk/wp-includes/l10n.php

@@ -65 +65 @@
  * @return string Translated text
  */
-function translate($text, $domain) {
+function translate($text, $domain = 'default') {
     global $l10n;
 
@@ -75 +75 @@
 
 /**
- * __() - Retrieve a translated string
- *
- * __() is a convenience function which retrieves the translated
- * string from the translate().
- *
- * @see translate() An alias of translate()
- * @since 2.1.0
- *
- * @param string $text Text to translate
- * @param string $domain Optional. Domain to retrieve the translated text
+ * translate_with_context() - Retrieve the translated text and strip context
+ *
+ * If the domain is set in the $l10n global, then the text is run
+ * through the domain's translate method. After it is passed to
+ * the 'gettext' filter hook, along with the untranslated text as
+ * the second parameter.
+ *
+ * If the domain is not set, the $text is just returned.
+ *
+ * @since 2.5
+ * @uses translate()
+ *
+ * @param string $text Text to translate
+ * @param string $domain Domain to retrieve the translated text
  * @return string Translated text
  */
-function __($text, $domain = 'default') {
-    return translate($text, $domain);
-}
-
-// .
-/**
- * _e() - Display a translated string
- *
- * _e() is a convenience function which displays the returned
- * translated text from translate().
- *
- * @see translate() Echos returned translate() string
- * @since 1.2.0
- *
- * @param string $text Text to translate
- * @param string $domain Optional. Domain to retrieve the translated text
- */
-function _e($text, $domain = 'default') {
-    echo translate($text, $domain);
-}
-
-/**
- * _c() - Retrieve context translated string
- *
- * 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
- * @param string $domain Optional. Domain to retrieve the translated text
- * @return string Translated context string without pipe
- */
-function _c($text, $domain = 'default') {
+function translate_with_context($text, $domain = 'default') {
     $whole = translate($text, $domain);
     $last_bar = strrpos($whole, '|');
@@ -138 +99 @@
         return substr($whole, 0, $last_bar);
     }
+}
+
+/**
+ * __() - Retrieve a translated string
+ *
+ * __() is a convenience function which retrieves the translated
+ * string from the translate().
+ *
+ * @see translate() An alias of translate()
+ * @since 2.1.0
+ *
+ * @param string $text Text to translate
+ * @param string $domain Optional. Domain to retrieve the translated text
+ * @return string Translated text
+ */
+function __($text, $domain = 'default') {
+    return translate($text, $domain);
+}
+
+// .
+/**
+ * _e() - Display a translated string
+ *
+ * _e() is a convenience function which displays the returned
+ * translated text from translate().
+ *
+ * @see translate() Echos returned translate() string
+ * @since 1.2.0
+ *
+ * @param string $text Text to translate
+ * @param string $domain Optional. Domain to retrieve the translated text
+ */
+function _e($text, $domain = 'default') {
+    echo translate($text, $domain);
+}
+
+/**
+ * _c() - Retrieve context translated string
+ *
+ * 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
+ * @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);
 }