Skip to:
Content

BuddyPress.org

Changeset 1014


Ignore:
Timestamp:
02/02/2009 10:26:13 PM (18 years ago)
Author:
apeatling
Message:

Fixes #420

Location:
trunk/buddypress-theme/buddypress-home
Files:
13 edited

Legend:

Unmodified
Added
Removed
  • trunk/buddypress-theme/buddypress-home/404.php

    r698 r1014  
    66                <?php if ( !function_exists('dynamic_sidebar')
    77                        || !dynamic_sidebar('right-column') ) : ?>
    8 
     8               
    99                <div class="widget-error">
    10                         Please log in and <a href="<?php echo get_option('siteurl') ?>/wp-admin/widgets.php?s=&amp;show=&amp;sidebar=sidebar-3">add widgets to this column</a>.
    11                 </div>         
     10                        <?php _e( 'Please log in and add widgets to this column.', 'buddypress' ) ?> <a href="<?php echo get_option('siteurl') ?>/wp-admin/widgets.php?s=&amp;show=&amp;sidebar=sidebar-3"><?php _e( 'Add Widgets', 'buddypress' ) ?></a>
     11                </div>
    1212               
    1313                <?php endif; ?>
    … …  
    1919               
    2020                <div class="widget-error">
    21                         Please log in and <a href="<?php echo get_option('siteurl') ?>/wp-admin/widgets.php?s=&amp;show=&amp;sidebar=sidebar-2">add widgets to this column</a>.
     21                        <?php _e( 'Please log in and add widgets to this column.', 'buddypress' ) ?> <a href="<?php echo get_option('siteurl') ?>/wp-admin/widgets.php?s=&amp;show=&amp;sidebar=sidebar-2"><?php _e( 'Add Widgets', 'buddypress' ) ?></a>
    2222                </div>
    2323               
  • trunk/buddypress-theme/buddypress-home/activate.php

    r668 r1014  
    66                <?php if ( !function_exists('dynamic_sidebar')
    77                        || !dynamic_sidebar('right-column') ) : ?>
    8 
     8               
    99                <div class="widget-error">
    10                         Please log in and <a href="<?php echo get_option('siteurl') ?>/wp-admin/widgets.php?s=&amp;show=&amp;sidebar=sidebar-3">add widgets to this column</a>.
    11                 </div>         
     10                        <?php _e( 'Please log in and add widgets to this column.', 'buddypress' ) ?> <a href="<?php echo get_option('siteurl') ?>/wp-admin/widgets.php?s=&amp;show=&amp;sidebar=sidebar-3"><?php _e( 'Add Widgets', 'buddypress' ) ?></a>
     11                </div>
    1212               
    1313                <?php endif; ?>
  • trunk/buddypress-theme/buddypress-home/archive.php

    r395 r1014  
    33        <div id="content" class="narrowcolumn">
    44                <div class="widget" id="latest-news">
    5                         <h2 class="widgettitle">News</h2>
     5                        <h2 class="widgettitle"><?php _e( 'Blog', 'buddypress' ) ?></h2>
    66                       
    77                        <?php if (have_posts()) : ?>
    … …  
    99                         <?php $post = $posts[0]; // Hack. Set $post so that the_date() works. ?>
    1010                         <?php /* If this is a category archive */ if (is_category()) { ?>
    11                         <h3 class="pageTitle">Archive for the &#8216;<?php single_cat_title(); ?>&#8217; Category</h2>
     11                        <h3 class="pageTitle"><?php _e( 'Archive for the', 'buddypress' ) ?> &#8216;<?php single_cat_title(); ?>&#8217; <?php _e( 'Category', 'buddypress' ) ?></h2>
    1212
    1313                         <?php /* If this is a daily archive */ } elseif (is_day()) { ?>
    14                         <h3 class="pageTitle">Archive for <?php the_time('F jS, Y'); ?></h2>
     14                        <h3 class="pageTitle"><?php _e( 'Archive for', 'buddypress' ) ?> <?php the_time('F jS, Y'); ?></h2>
    1515
    1616                         <?php /* If this is a monthly archive */ } elseif (is_month()) { ?>
    17                         <h3 class="pageTitle">Archive for <?php the_time('F, Y'); ?></h2>
     17                        <h3 class="pageTitle"><?php _e( 'Archive for', 'buddypress' ) ?> <?php the_time('F, Y'); ?></h2>
    1818
    1919                        <?php /* If this is a yearly archive */ } elseif (is_year()) { ?>
    20                         <h3 class="pageTitle">Archive for <?php the_time('Y'); ?></h2>
     20                        <h3 class="pageTitle"><?php _e( 'Archive for', 'buddypress' ) ?> <?php the_time('Y'); ?></h2>
    2121
    2222                        <?php /* If this is an author archive */ } elseif (is_author()) { ?>
    23                         <h3 class="pageTitle">Author Archive</h2>
     23                        <h3 class="pageTitle"><?php _e( 'Author Archive', 'buddypress' ) ?></h2>
    2424
    2525                        <?php /* If this is a paged archive */ } elseif (isset($_GET['paged']) && !empty($_GET['paged'])) { ?>
    26                         <h3 class="pageTitle">Blog Archives</h2>
     26                        <h3 class="pageTitle"><?php _e( 'Blog Archives', 'buddypress' ) ?></h2>
    2727
    2828                        <?php } ?>
    … …  
    4343                                        </div>
    4444
    45                                         <p class="postmetadata">Posted in <?php the_category(', ') ?> | <?php edit_post_link('Edit', '', ' | '); ?>  <?php comments_popup_link('No Comments &#187;', '1 Comment &#187;', '% Comments &#187;'); ?></p>
     45                                        <p class="postmetadata"><?php _e( 'Posted in', 'buddypress' ) ?> <?php the_category(', ') ?> | <?php edit_post_link('Edit', '', ' | '); ?>  <?php comments_popup_link('No Comments &#187;', '1 Comment &#187;', '% Comments &#187;'); ?></p>
    4646
    4747                                </div>
    … …  
    5656                <?php else : ?>
    5757
    58                         <h2 class="center">Not Found</h2>
     58                        <h2 class="center"><?php _e( 'Not Found', 'buddypress' ) ?></h2>
    5959                        <?php include (TEMPLATEPATH . '/searchform.php'); ?>
    6060
  • trunk/buddypress-theme/buddypress-home/archives.php

    r395 r1014  
    1111<?php include (TEMPLATEPATH . '/searchform.php'); ?>
    1212
    13 <h2>Archives by Month:</h2>
     13<h2><?php _e( 'Archives by Month:', 'buddypress' ) ?></h2>
    1414        <ul>
    1515                <?php wp_get_archives('type=monthly'); ?>
    1616        </ul>
    1717
    18 <h2>Archives by Subject:</h2>
     18<h2><?php _e( 'Archives by Subject:', 'buddypress' ) ?></h2>
    1919        <ul>
    2020                 <?php wp_list_categories(); ?>
  • trunk/buddypress-theme/buddypress-home/attachment.php

    r395 r1014  
    44               
    55        <div class="widget" id="latest-news">
    6                 <h2 class="widgettitle">News</h2>
     6                <h2 class="widgettitle"><?php _e( 'Blog', 'buddypress' ) ?></h2>
    77                <?php if (have_posts()) : while (have_posts()) : the_post(); ?>
    88
    … …  
    2525                        <?php endwhile; else: ?>
    2626
    27                                 <p>Sorry, no attachments matched your criteria.</p>
     27                                <p><?php _e( 'Sorry, no attachments matched your criteria.', 'buddypress' ) ?></p>
    2828
    2929                        <?php endif; ?>
  • trunk/buddypress-theme/buddypress-home/comments-popup.php

    r395 r1014  
    77<html xmlns="http://www.w3.org/1999/xhtml">
    88<head>
    9      <title><?php echo get_option('blogname'); ?> - Comments on <?php the_title(); ?></title>
     9     <title><?php echo get_option('blogname'); ?> - <?php _e( 'Comments on', 'buddypress' ) ?> <?php the_title(); ?></title>
    1010
    1111        <meta http-equiv="Content-Type" content="<?php bloginfo('html_type'); ?>; charset=<?php echo get_option('blog_charset'); ?>" />
    … …  
    2020<h1 id="header"><a href="" title="<?php echo get_option('blogname'); ?>"><?php echo get_option('blogname'); ?></a></h1>
    2121
    22 <h2 id="comments">Comments</h2>
     22<h2 id="comments"><?php _e( 'Comments', 'buddypress' ) ?></h2>
    2323
    24 <p><a href="<?php echo get_post_comments_feed_link($post->ID); ?>"><abbr title="Really Simple Syndication">RSS</abbr> feed for comments on this post.</a></p>
     24<p><a href="<?php echo get_post_comments_feed_link($post->ID); ?>"><?php _e( '<abbr title="Really Simple Syndication">RSS</abbr> feed for comments on this post.', 'buddypress' ) ?></a></p>
    2525
    2626<?php if ('open' == $post->ping_status) { ?>
    27 <p>The <abbr title="Universal Resource Locator">URL</abbr> to TrackBack this entry is: <em><?php trackback_url() ?></em></p>
     27<p><?php _e( 'The <abbr title="Universal Resource Locator">URL</abbr> to TrackBack this entry is:', 'buddypress' ) ?> <em><?php trackback_url() ?></em></p>
    2828<?php } ?>
    2929
    … …  
    4343        <li id="comment-<?php comment_ID() ?>">
    4444        <?php comment_text() ?>
    45         <p><cite><?php comment_type('Comment', 'Trackback', 'Pingback'); ?> by <?php comment_author_link() ?> &#8212; <?php comment_date() ?> @ <a href="#comment-<?php comment_ID() ?>"><?php comment_time() ?></a></cite></p>
     45        <p><cite><?php comment_type('Comment', 'Trackback', 'Pingback'); ?> <?php _e( 'by', 'buddypress' ) ?> <?php comment_author_link() ?> &#8212; <?php comment_date() ?> @ <a href="#comment-<?php comment_ID() ?>"><?php comment_time() ?></a></cite></p>
    4646        </li>
    4747
    … …  
    4949</ol>
    5050<?php } else { // this is displayed if there are no comments so far ?>
    51         <p>No comments yet.</p>
     51        <p><?php _e( 'No comments yet.', 'buddypress' ) ?></p>
    5252<?php } ?>
    5353
    5454<?php if ('open' == $post->comment_status) { ?>
    55 <h2>Leave a comment</h2>
    56 <p>Line and paragraph breaks automatic, e-mail address never displayed, <acronym title="Hypertext Markup Language">HTML</acronym> allowed: <code><?php echo allowed_tags(); ?></code></p>
     55<h2><?php _e( 'Leave a comment', 'buddypress' ) ?></h2>
     56<p><?php _e( 'Line and paragraph breaks automatic, e-mail address never displayed, <acronym title="Hypertext Markup Language">HTML</acronym> allowed:', 'buddypress' ) ?> <code><?php echo allowed_tags(); ?></code></p>
    5757
    5858<form action="<?php echo site_url(); ?>/wp-comments-post.php" method="post" id="commentform">
    5959<?php if ( $user_ID ) : ?>
    60         <p>Logged in as <a href="<?php echo site_url(); ?>/wp-admin/profile.php"><?php echo $user_identity; ?></a>. <a href="<?php echo site_url(); ?>/wp-login.php?action=logout" title="Log out of this account">Logout &raquo;</a></p>
     60        <p><?php _e( 'Logged in as', 'buddypress' ) ?> <a href="<?php echo site_url(); ?>/wp-admin/profile.php"><?php echo $user_identity; ?></a>. <a href="<?php echo site_url(); ?>/wp-login.php?action=logout" title="Log out of this account"><?php _e( 'Logout', 'buddypress' ) ?> &raquo;</a></p>
    6161<?php else : ?>
    6262        <p>
    6363          <input type="text" name="author" id="author" class="textarea" value="<?php echo $comment_author; ?>" size="28" tabindex="1" />
    64            <label for="author">Name</label>
     64           <label for="author"><?php _e( 'Name', 'buddypress' ) ?></label>
    6565        <input type="hidden" name="comment_post_ID" value="<?php echo $id; ?>" />
    6666        <input type="hidden" name="redirect_to" value="<?php echo attribute_escape($_SERVER["REQUEST_URI"]); ?>" />
    … …  
    6969        <p>
    7070          <input type="text" name="email" id="email" value="<?php echo $comment_author_email; ?>" size="28" tabindex="2" />
    71            <label for="email">E-mail</label>
     71           <label for="email"><?php _e( 'E-mail', 'buddypress' ) ?></label>
    7272        </p>
    7373
    7474        <p>
    7575          <input type="text" name="url" id="url" value="<?php echo $comment_author_url; ?>" size="28" tabindex="3" />
    76            <label for="url"><abbr title="Universal Resource Locator">URL</abbr></label>
     76           <label for="url"><abbr title="Universal Resource Locator"><?php _e( 'URL', 'buddypress' ) ?></abbr></label>
    7777        </p>
    7878<?php endif; ?>
    7979
    8080        <p>
    81           <label for="comment">Your Comment</label>
     81          <label for="comment"><?php _e( 'Your Comment', 'buddypress' ) ?></label>
    8282        <br />
    8383          <textarea name="comment" id="comment" cols="70" rows="4" tabindex="4"></textarea>
    … …  
    9090</form>
    9191<?php } else { // comments are closed ?>
    92 <p>Sorry, the comment form is closed at this time.</p>
     92<p><?php _e( 'Sorry, the comment form is closed at this time.', 'buddypress' ) ?></p>
    9393<?php }
    9494} // end password check
    9595?>
    9696
    97 <div><strong><a href="javascript:window.close()">Close this window.</a></strong></div>
     97<div><strong><a href="javascript:window.close()"><?php _e( 'Close this window.', 'buddypress' ) ?></a></strong></div>
    9898
    9999<?php // if you delete this the sky will fall on your head
    … …  
    103103<!-- // this is just the end of the motor - don't touch that line either :) -->
    104104<?php //} ?>
    105 <p class="credit"><?php timer_stop(1); ?> <cite>Powered by <a href="http://wordpress.org/" title="Powered by WordPress, state-of-the-art semantic personal publishing platform"><strong>Wordpress</strong></a></cite></p>
     105<p class="credit"><?php timer_stop(1); ?> <cite><?php _e( 'Powered by <a href="http://wordpress.org/" title="Powered by WordPress, state-of-the-art semantic personal publishing platform"><strong>Wordpress</strong>' ) ?></a></cite></p>
    106106<?php // Seen at http://www.mijnkopthee.nl/log2/archive/2003/05/28/esc(18) ?>
    107107<script type="text/javascript">
  • trunk/buddypress-theme/buddypress-home/comments.php

    r851 r1014  
    77                        ?>
    88
    9                         <p class="nocomments">This post is password protected. Enter the password to view comments.</p>
     9                        <p class="nocomments"><?php _e( 'This post is password protected. Enter the password to view comments.' ) ?></p>
    1010
    1111                        <?php
    … …  
    3131                        <div class="comment-details">
    3232                                <?php bp_comment_author_avatar() ?>
    33                                 <p><?php comment_author_link() ?> said:</p>
     33                                <p><?php comment_author_link() ?> <?php _e( 'said:', 'buddypress' ) ?></p>
    3434                        </div>
    3535
    3636                        <div class="comment-content">
    3737                                <?php if ($comment->comment_approved == '0') : ?>
    38                                         <p><strong>Your comment is awaiting moderation.</strong></p>
     38                                        <p><strong><?php _e( 'Your comment is awaiting moderation.', 'buddypress' ) ?></strong></p>
    3939                                <?php endif; ?>
    4040                                <?php comment_text() ?>
    4141
    42                                 <p class="commentmetadata"><a href="#comment-<?php comment_ID() ?>" title=""><?php comment_date('F jS, Y') ?> at <?php comment_time() ?></a> <?php edit_comment_link('Edit','&nbsp; [ ',' ]'); ?></p>
     42                                <p class="commentmetadata"><a href="#comment-<?php comment_ID() ?>" title=""><?php comment_date('F jS, Y') ?> <?php _e( 'at', 'buddypress' ) ?> <?php comment_time() ?></a> <?php edit_comment_link('Edit','&nbsp; [ ',' ]'); ?></p>
    4343                        </div>
    4444                        <div class="clear"></div>
    … …  
    6060         <?php else : // comments are closed ?>
    6161                <!-- If comments are closed. -->
    62                 <p class="nocomments">Comments are closed.</p>
     62                <p class="nocomments"><?php _e( 'Comments are closed.', 'buddypress' ) ?></p>
    6363        <?php endif; ?>
    6464       
    … …  
    6969        <?php if ('open' == $post->comment_status) : ?>
    7070
    71 <h3 id="respond">Leave a Reply</h3>
     71<h3 id="respond"><?php _e( 'Leave a Reply', 'buddypress' ) ?></h3>
    7272
    7373<?php if ( get_option('comment_registration') && !$user_ID ) : ?>
    74 <p>You must be <a href="<?php echo get_option('siteurl'); ?>/wp-login.php?redirect_to=<?php echo urlencode(get_permalink()); ?>">logged in</a> to post a comment.</p>
     74<p><?php printf( __( 'You must be <a href="%s">logged in</a> to post a comment.', 'buddypress' ), get_option('siteurl') . '/wp-login.php?redirect_to=' . urlencode(get_permalink()) ) ?></p>
    7575<?php else : ?>
    7676
    … …  
    7979<?php if ( $user_ID ) : ?>
    8080
    81 <p>Logged in as <a href="<?php echo site_url(); ?>/wp-admin/profile.php"><?php echo $user_identity; ?></a>. <a href="<?php echo site_url(); ?>/wp-login.php?action=logout" title="Log out of this account">Logout &raquo;</a></p>
     81<p>Logged in as <a href="<?php echo site_url(); ?>/wp-admin/profile.php"><?php echo $user_identity; ?></a>. <a href="<?php echo site_url(); ?>/wp-login.php?action=logout" title="Log out of this account"><?php _e( 'Logout', 'buddypress' ) ?> &raquo;</a></p>
    8282
    8383<?php else : ?>
    8484
    8585<p><input type="text" name="author" id="author" value="<?php echo $comment_author; ?>" size="22" tabindex="1" />
    86 <label for="author">Name <?php if ($req) echo "(required)"; ?></label></p>
     86<label for="author"><?php _e( 'Name', 'buddypress' ) ?> <?php if ($req) echo "(required)"; ?></label></p>
    8787
    8888<p><input type="text" name="email" id="email" value="<?php echo $comment_author_email; ?>" size="22" tabindex="2" />
    89 <label for="email">Mail (will not be published) <?php if ($req) echo "(required)"; ?></label></p>
     89<label for="email"><?php _e( 'Mail (will not be published)', 'buddypress' ) ?> <?php if ($req) _e( '(required)', 'buddypress' ); ?></label></p>
    9090
    9191<p><input type="text" name="url" id="url" value="<?php echo $comment_author_url; ?>" size="22" tabindex="3" />
    92 <label for="url">Website</label></p>
     92<label for="url"><?php _e( 'Website', 'buddypress' ) ?></label></p>
    9393
    9494<?php endif; ?>
    … …  
    9898<p><textarea name="comment" id="comment" cols="38" rows="10" tabindex="4"></textarea></p>
    9999
    100 <p><input name="submit" type="submit" id="submit" tabindex="5" value="Submit Comment" />
     100<p><input name="submit" type="submit" id="submit" tabindex="5" value="<?php _e ( 'Submit Comment', 'buddypress' ) ?>" />
    101101<input type="hidden" name="comment_post_ID" value="<?php echo $id; ?>" />
    102102</p>
  • trunk/buddypress-theme/buddypress-home/index.php

    r954 r1014  
    3030                <?php else : ?>
    3131
    32                         <h2 class="center">Not Found</h2>
    33                         <p class="center">Sorry, but you are looking for something that isn't here.</p>
     32                        <h2 class="center"><?php _e( 'Not Found', 'buddypress' ) ?></h2>
     33                        <p class="center"><?php _e( 'Sorry, but you are looking for something that isn\'t here.', 'buddypress' ) ?></p>
    3434                        <?php include (TEMPLATEPATH . "/searchform.php"); ?>
    3535
  • trunk/buddypress-theme/buddypress-home/links.php

    r395 r1014  
    99<div id="content" class="widecolumn">
    1010
    11 <h2>Links:</h2>
     11<h2><?php _e( 'Links:', 'buddypress' ) ?></h2>
    1212<ul>
    1313<?php get_links_list(); ?>
  • trunk/buddypress-theme/buddypress-home/register.php

    r649 r1014  
    66                <?php if ( !function_exists('dynamic_sidebar')
    77                        || !dynamic_sidebar('right-column') ) : ?>
    8 
     8               
    99                <div class="widget-error">
    10                         Please log in and <a href="<?php echo get_option('siteurl') ?>/wp-admin/widgets.php?s=&amp;show=&amp;sidebar=sidebar-3">add widgets to this column</a>.
    11                 </div>         
     10                        <?php _e( 'Please log in and add widgets to this column.', 'buddypress' ) ?> <a href="<?php echo get_option('siteurl') ?>/wp-admin/widgets.php?s=&amp;show=&amp;sidebar=sidebar-3"><?php _e( 'Add Widgets', 'buddypress' ) ?></a>
     11                </div>
    1212               
    1313                <?php endif; ?>
    … …  
    1919               
    2020                <div class="widget-error">
    21                         Please log in and <a href="<?php echo get_option('siteurl') ?>/wp-admin/widgets.php?s=&amp;show=&amp;sidebar=sidebar-2">add widgets to this column</a>.
     21                        <?php _e( 'Please log in and add widgets to this column.', 'buddypress' ) ?> <a href="<?php echo get_option('siteurl') ?>/wp-admin/widgets.php?s=&amp;show=&amp;sidebar=sidebar-2"><?php _e( 'Add Widgets', 'buddypress' ) ?></a>
    2222                </div>
    2323               
  • trunk/buddypress-theme/buddypress-home/search.php

    r697 r1014  
    44
    55                <div class="widget" id="latest-news">
    6                         <h2 class="widgettitle">News</h2>
     6                        <h2 class="widgettitle"><?php _e( 'Blog', 'buddypress' ) ?></h2>
    77
    88                        <?php if (have_posts()) : ?>
    99               
    10                                 <h3 class="pagetitle">Search Results</h3>
     10                                <h3 class="pagetitle"><?php _e( 'Search Results', 'buddypress' ) ?></h3>
    1111
    1212                                <div class="navigation">
    … …  
    2121                                                <small><?php the_time('l, F jS, Y') ?></small>
    2222
    23                                                 <p class="postmetadata">Posted in <?php the_category(', ') ?> | <?php edit_post_link('Edit', '', ' | '); ?>  <?php comments_popup_link('No Comments &#187;', '1 Comment &#187;', '% Comments &#187;'); ?></p>
     23                                                <p class="postmetadata"><?php _e( 'Posted in', 'buddypress' ) ?> <?php the_category(', ') ?> | <?php edit_post_link('Edit', '', ' | '); ?>  <?php comments_popup_link('No Comments &#187;', '1 Comment &#187;', '% Comments &#187;'); ?></p>
    2424                                        </div>
    2525
    … …  
    3333                        <?php else : ?>
    3434
    35                                 <h2 class="center">No posts found. Try a different search?</h2>
     35                                <h2 class="center"><?php _e( 'No posts found. Try a different search?' ) ?></h2>
    3636                                <?php include (TEMPLATEPATH . '/searchform.php'); ?>
    3737
  • trunk/buddypress-theme/buddypress-home/sidebar.php

    r520 r1014  
    44       
    55                        <div class="widget-error">
    6                                 Please log in and <a href="<?php echo get_option('siteurl') ?>/wp-admin/widgets.php?s=&amp;show=&amp;sidebar=sidebar-4">add widgets to the blog sidebar</a>.
     6                                <?php _e( 'Please log in and add widgets to this column.', 'buddypress' ) ?> <a href="<?php echo get_option('siteurl') ?>/wp-admin/widgets.php?s=&amp;show=&amp;sidebar=sidebar-4"><?php _e( 'Add Widgets', 'buddypress' ) ?></a>
    77                        </div
    88
  • trunk/buddypress-theme/buddypress-home/single.php

    r938 r1014  
    44
    55        <div class="widget" id="latest-news">
    6                 <h2 class="widgettitle"><?php _e( 'News', 'buddypress' ) ?></h2>
     6                <h2 class="widgettitle"><?php _e( 'Blog', 'buddypress' ) ?></h2>
    77
    88                <?php if (have_posts()) : while (have_posts()) : the_post(); ?>
    … …  
    2929                <?php endwhile; else: ?>
    3030
    31                         <p>Sorry, no posts matched your criteria.</p>
     31                        <p><?php _e( 'Sorry, no posts matched your criteria.', 'buddypress' ) ?></p>
    3232
    3333                <?php endif; ?>
Note: See TracChangeset for help on using the changeset viewer.