Changeset 10767

Timestamp:

03/10/2009 11:02:29 PM (16 years ago)

Author:

ryan

Message:

gettext contexts. Props nbachiyski. see #9112

Location:

trunk

Files:

• wp-admin/includes/post.php (modified) (1 diff)
• wp-admin/includes/schema.php (modified) (1 diff)
• wp-admin/includes/template.php (modified) (3 diffs)
• wp-admin/includes/upgrade.php (modified) (4 diffs)
• wp-admin/theme-editor.php (modified) (1 diff)
• wp-admin/users.php (modified) (1 diff)
• wp-content/themes/classic/comments-popup.php (modified) (1 diff)
• wp-content/themes/classic/comments.php (modified) (1 diff)
• wp-includes/comment.php (modified) (1 diff)
• wp-includes/formatting.php (modified) (1 diff)
• wp-includes/js/tinymce/langs/wp-langs.php (modified) (1 diff)
• wp-includes/l10n.php (modified) (3 diffs)

trunk/wp-admin/includes/post.php

@@ -791 +791 @@
                 'future' => array(__('Scheduled'), __('Scheduled posts'), _n_noop('Scheduled <span class="count">(%s)</span>', 'Scheduled <span class="count">(%s)</span>')),
                 'pending' => array(__('Pending Review'), __('Pending posts'), _n_noop('Pending Review <span class="count">(%s)</span>', 'Pending Review <span class="count">(%s)</span>')),
-                'draft' => array(__('Draft'), _c('Drafts|manage posts header'), _n_noop('Draft <span class="count">(%s)</span>', 'Drafts <span class="count">(%s)</span>')),
+                'draft' => array(__('Draft'), _x('Drafts', 'manage posts header'), _n_noop('Draft <span class="count">(%s)</span>', 'Drafts <span class="count">(%s)</span>')),
                 'private' => array(__('Private'), __('Private posts'), _n_noop('Private <span class="count">(%s)</span>', 'Private <span class="count">(%s)</span>')),
             );

trunk/wp-admin/includes/schema.php

@@ -364 +364 @@
 
     // 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');
+    /* translators: user role */
+    _x('Administrator', 'User role');
+    /* translators: user role */
+    _x('Editor', 'User role');
+    /* translators: user role */
+    _x('Author', 'User role');
+    /* translators: user role */
+    _x('Contributor', 'User role');
+    /* translators: user role */
+    _x('Subscriber', 'User role');
+
+    add_role('administrator', 'Administrator');
+    add_role('editor', 'Editor');
+    add_role('author', 'Author');
+    add_role('contributor', 'Contributor');
+    add_role('subscriber', 'Subscriber');
 
     // Add caps for Administrator role

trunk/wp-admin/includes/template.php

@@ -764 +764 @@
     $posts_columns['media'] = _x('File', 'column name');
     $posts_columns['author'] = __('Author');
-    //$posts_columns['tags'] = _c('Tags|media column header');
+    //$posts_columns['tags'] = _x('Tags', 'column name');
     /* translators: column name */
     $posts_columns['parent'] = _x('Attached to', 'column name');
@@ -1893 +1893 @@
         $edit = '<strong>' . $user_object->user_login . '</strong>';
     }
-    $role_name = isset($wp_roles->role_names[$role]) ? translate_with_context($wp_roles->role_names[$role]) : __('None');
+    $role_name = isset($wp_roles->role_names[$role]) ? translate_user_role($wp_roles->role_names[$role] ) : __('None');
     $r = "<tr id='user-$user_object->ID'$style>";
     $columns = get_column_headers('users');
@@ -2680 +2680 @@
 
     foreach( $editable_roles as $role => $details ) {
-        $name = translate_with_context($details['name']);
+        $name = translate_user_role($details['name'] );
         if ( $selected == $role ) // Make default first in list
             $p = "\n\t<option selected='selected' value='$role'>$name</option>";

trunk/wp-admin/includes/upgrade.php

@@ -95 +95 @@
     // Default category
     $cat_name = __('Uncategorized');
-    $cat_slug = sanitize_title(_c('Uncategorized|Default category slug'));
+    /* translators: Default category slug */
+    $cat_slug = sanitize_title(_x('Uncategorized', 'Default category slug'));
     
     $wpdb->insert( $wpdb->terms, array('name' => $cat_name, 'slug' => $cat_slug, 'term_group' => 0) );
@@ -102 +103 @@
     // Default link category
     $cat_name = __('Blogroll');
-    $cat_slug = sanitize_title(_c('Blogroll|Default link category slug'));
+    /* translators: Default link category slug */
+    $cat_slug = sanitize_title(_x('Blogroll', 'Default link category slug'));
     
     $wpdb->insert( $wpdb->terms, array('name' => $cat_name, 'slug' => $cat_slug, 'term_group' => 0) );
@@ -169 +171 @@
                                 'post_title' => __('Hello world!'),
                                 'post_category' => 0,
-                                'post_name' => _c('hello-world|Default post slug'),
+                                /* translators: Default post slug */
+                                'post_name' => _x('hello-world', 'Default post slug'),
                                 'post_modified' => $now,
                                 'post_modified_gmt' => $now_gmt,
@@ -200 +203 @@
                                 'post_title' => __('About'),
                                 'post_category' => '',
-                                'post_name' => _c('about|Default page slug'),
+                                /* translators: Default page slug */
+                                'post_name' => _x('about', 'Default page slug'),
                                 'post_modified' => $now,
                                 'post_modified_gmt' => $now_gmt,

trunk/wp-admin/theme-editor.php

@@ -174 +174 @@
 <?php endwhile; ?>
     </ul>
-    <h4><?php echo _c('Styles|Theme stylesheets in theme editor'); ?></h4>
+    <h4><?php /* translators: Theme stylesheets in theme editor */ echo _x('Styles', 'Theme stylesheets in theme editor'); ?></h4>
     <ul>
 <?php

trunk/wp-admin/users.php

@@ -277 +277 @@
     }
 
-    $name = translate_with_context($name);
-    $name = sprintf( _c('%1$s <span class="count">(%2$s)</span>|user role with count'), $name, $avail_roles[$this_role] );
+    $name = translate_user_role( $name );
+    /* translators: User role name with count */
+    $name = sprintf( __('%1$s <span class="count">(%2$s)</span>'), $name, $avail_roles[$this_role] );
     $role_links[] = "<li><a href='users.php?role=$this_role'$class>$name</a>";
 }

trunk/wp-content/themes/classic/comments-popup.php

@@ -50 +50 @@
     <li id="comment-<?php comment_ID() ?>">
     <?php comment_text() ?>
-    <p><cite><?php comment_type(_c('Comment|noun'), __('Trackback'), __('Pingback')); ?> <?php _e("by"); ?> <?php comment_author_link() ?> &#8212; <?php comment_date() ?> @ <a href="#comment-<?php comment_ID() ?>"><?php comment_time() ?></a></cite></p>
+    <p><cite><?php comment_type(_x('Comment', 'noun'), __('Trackback'), __('Pingback')); ?> <?php _e("by"); ?> <?php comment_author_link() ?> &#8212; <?php comment_date() ?> @ <a href="#comment-<?php comment_ID() ?>"><?php comment_time() ?></a></cite></p>
     </li>
 

trunk/wp-content/themes/classic/comments.php

@@ -22 +22 @@
     <?php echo get_avatar( $comment, 32 ); ?>
     <?php comment_text() ?>
-    <p><cite><?php comment_type(_c('Comment|noun'), __('Trackback'), __('Pingback')); ?> <?php _e('by'); ?> <?php comment_author_link() ?> &#8212; <?php comment_date() ?> @ <a href="#comment-<?php comment_ID() ?>"><?php comment_time() ?></a></cite> <?php edit_comment_link(__("Edit This"), ' |'); ?></p>
+    <p><cite><?php comment_type(_x('Comment', 'noun'), __('Trackback'), __('Pingback')); ?> <?php _e('by'); ?> <?php comment_author_link() ?> &#8212; <?php comment_date() ?> @ <a href="#comment-<?php comment_ID() ?>"><?php comment_time() ?></a></cite> <?php edit_comment_link(__("Edit This"), ' |'); ?></p>
     </li>
 

trunk/wp-includes/comment.php

@@ -253 +253 @@
     $status = array(
         'hold'      => __('Unapproved'),
-        'approve'   => _c('Approved|adjective'),
-        'spam'      => _c('Spam|adjective'),
+        /* translators: comment status  */
+        'approve'   => _x('Approved', 'adjective'),
+        /* translators: comment status */
+        'spam'      => _x('Spam', 'adjective'),
     );
 

trunk/wp-includes/formatting.php

@@ -2215 +2215 @@
     // Translate and filter the delimiter set (avoid ampersands and entities here)
     $l = apply_filters('wp_sprintf_l', array(
-        'between'          => _c(', |between list items'),
-        'between_last_two' => _c(', and |between last two list items'),
-        'between_only_two' => _c(' and |between only two list items'),
+        /* translators: used between list items, there is a space after the coma */
+        'between'          => __(', '),
+        /* translators: used between list items, there is a space after the and */
+        'between_last_two' => __(', and '),
+        /* translators: used between only two list items, there is a space after the and */
+        'between_only_two' => __(' and '),
         ));
 

trunk/wp-includes/js/tinymce/langs/wp-langs.php

@@ -180 +180 @@
 
 tinyMCE.addI18n("' . $language . '.advanced",{
-style_select:"' . mce_escape( __('Styles') ) . '",
+style_select:"' . mce_escape( /* translators: TinyMCE font styles */ _x('Styles', 'TinyMCE font styles') ) . '",
 font_size:"' . mce_escape( __('Font size') ) . '",
 fontdefault:"' . mce_escape( __('Font family') ) . '",

trunk/wp-includes/l10n.php

@@ -177 +177 @@
     $translations = &get_translations_for_domain( $domain );
     $translation = $translations->translate_plural( $single, $plural, $number );
-    return apply_filters( 'ngettext', $translation, $single, $plural, $number );
+    return apply_filters( 'ngettext', $translation, $single, $plural, $number, $domain );
 }
 
@@ -192 +192 @@
     $translations = &get_translations_for_domain( $domain );
     $translation = $translations->translate_plural( $single, $plural, $number, $context );
-    return apply_filters( 'ngettext_with_context ', $translation, $single, $plural, $number, $context );
+    return apply_filters( 'ngettext_with_context ', $translation, $single, $plural, $number, $context, $domain );
 }
 
@@ -341 +341 @@
 }
 
+/**
+ * Translates role name. Since the role names are in the database and
+ * not in the source there are dummy gettext calls to get them into the POT
+ * file and this function properly translates them back.
+ * 
+ * The before_last_bar() call is needed, because older installs keep the roles
+ * using the old context format: 'Role name|User role' and just skipping the
+ * content after the last bar is easier than fixing them in the DB. New installs
+ * won't suffer from that problem.
+ */
+function translate_user_role( $name ) {
+    return before_last_bar( translate_with_gettext_context( $name, 'User role' ) );
+}
 ?>