Changeset 6916

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

Location:

trunk

Files:

• wp-admin/includes/schema.php (modified) (1 diff)
• wp-admin/includes/template.php (modified) (3 diffs)
• wp-admin/users.php (modified) (1 diff)
• wp-includes/l10n.php (modified) (3 diffs)

trunk/wp-admin/includes/schema.php

@@ -268 +268 @@
 function populate_roles_160() {
     // Add roles
-    add_role('administrator', _c('Administrator|User role'));
-    add_role('editor', _c('Editor|User role'));
-    add_role('author', _c('Author|User role'));
-    add_role('contributor', _c('Contributor|User role'));
-    add_role('subscriber', _c('Subscriber|User role'));
+
+    // Dummy gettext calls to get strings in the catalog.
+    _c('Administrator|User role');
+    _c('Editor|User role');
+    _c('Author|User role');
+    _c('Contributor|User role');
+    _c('Subscriber|User role');
+
+    add_role('administrator', 'Administrator|User role');
+    add_role('editor', 'Editor|User role');
+    add_role('author', 'Author|User role');
+    add_role('contributor', 'Contributor|User role');
+    add_role('subscriber', 'Subscriber|User role');
 
     // Add caps for Administrator role

trunk/wp-admin/includes/template.php

@@ -546 +546 @@
         $edit = $user_object->user_login;
     }
+    $role_name = translate_with_context($wp_roles->role_names[$role]);
     $r = "<tr id='user-$user_object->ID'$style>
         <td><input type='checkbox' name='users[]' id='user_{$user_object->ID}' class='$role' value='{$user_object->ID}' /></td>
@@ -551 +552 @@
         <td>$user_object->first_name $user_object->last_name</td>
         <td><a href='mailto:$email' title='" . sprintf( __('e-mail: %s' ), $email ) . "'>$email</a></td>
-        <td>{$wp_roles->role_names[$role]}</td>";
+        <td>$role_name</td>";
     $r .= "\n\t\t<td>";
     if ( $numposts > 0 ) {
@@ -892 +893 @@
     global $wp_roles;
     $r = '';
-    foreach( $wp_roles->role_names as $role => $name )
+    foreach( $wp_roles->role_names as $role => $name ) {
+        $name = translate_with_context($name);
         if ( $default == $role ) // Make default first in list
             $p = "\n\t<option selected='selected' value='$role'>$name</option>";
         else
             $r .= "\n\t<option value='$role'>$name</option>";
+    }
     echo $p . $r;
 }

trunk/wp-admin/users.php

@@ -264 +264 @@
         $class = ' class="current"';
 
+    $name = translate_with_context($name);
     $name = sprintf(_c('%1$s (%2$s)|user role with count'), $name, $avail_roles[$role]);
     $role_links[] = "<li><a href=\"users.php?role=$role\"$class>" . $name . '</a>';

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);
 }