<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[BuddyPress] [2373] trunk:
Moving terms out of the JS so that they can be translated.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd>2373</dd>
<dt>Author</dt> <dd>apeatling</dd>
<dt>Date</dt> <dd>2010-01-19 21:43:11 +0000 (Tue, 19 Jan 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Moving terms out of the JS so that they can be translated.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbpcorebpcoreadminbarphp">trunk/bp-core/bp-core-adminbar.php</a></li>
<li><a href="#trunkbpthemesbpdefault_incglobaljs">trunk/bp-themes/bp-default/_inc/global.js</a></li>
<li><a href="#trunkbpthemesbpdefaultfunctionsphp">trunk/bp-themes/bp-default/functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbpcorebpcoreadminbarphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-core/bp-core-adminbar.php (2372 => 2373)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-core/bp-core-adminbar.php 2010-01-19 21:26:59 UTC (rev 2372)
+++ trunk/bp-core/bp-core-adminbar.php 2010-01-19 21:43:11 UTC (rev 2373)
</span><span class="lines">@@ -20,7 +20,7 @@
</span><span class="cx"> do_action( 'bp_adminbar_menus' );
</span><span class="cx">
</span><span class="cx"> echo '</ul>';
</span><del>- echo '</div></div>';
</del><ins>+ echo "</div></div><!-- #wp-admin-bar -->\n\n";
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> // **** Default BuddyPress admin bar logo ********
</span></span></pre></div>
<a id="trunkbpthemesbpdefault_incglobaljs"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/_inc/global.js (2372 => 2373)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/_inc/global.js 2010-01-19 21:26:59 UTC (rev 2372)
+++ trunk/bp-themes/bp-default/_inc/global.js 2010-01-19 21:43:11 UTC (rev 2373)
</span><span class="lines">@@ -157,7 +157,7 @@
</span><span class="cx">
</span><span class="cx"> if ( 'fav' == type ) {
</span><span class="cx"> if ( !j('div.item-list-tabs li#activity-favorites').length )
</span><del>- j('div.item-list-tabs ul li#activity-atme').before( '<li id="activity-favorites"><a href="#">My Favorites (<span>0</span>)</a></li>');
</del><ins>+ j('div.item-list-tabs ul li#activity-atme').before( '<li id="activity-favorites"><a href="#">' + bp_terms_my_favs + ' (<span>0</span>)</a></li>');
</ins><span class="cx">
</span><span class="cx"> target.removeClass('fav');
</span><span class="cx"> target.addClass('unfav');
</span><span class="lines">@@ -516,7 +516,7 @@
</span><span class="cx"> j(this).toggle();
</span><span class="cx">
</span><span class="cx"> if ( !i )
</span><del>- j(this).before( '<li class="show-all"><a href="#' + parent_li.attr('id') + '/show-all/" title="Show all comments for this thread">Show all ' + comment_count + ' comments</a></li>' );
</del><ins>+ j(this).before( '<li class="show-all"><a href="#' + parent_li.attr('id') + '/show-all/" title="' + bp_terms_show_all_comments + '">' + bp_terms_show_all + ' ' + comment_count + ' ' + bp_terms_comments + '</a></li>' );
</ins><span class="cx"> }
</span><span class="cx"> });
</span><span class="cx">
</span><span class="lines">@@ -805,9 +805,9 @@
</span><span class="cx"> } else {
</span><span class="cx"> button.fadeOut( 100, function() {
</span><span class="cx"> if ( j(this).hasClass('accept') )
</span><del>- j(this).html( 'Accepted' ).fadeIn(50);
</del><ins>+ j(this).html( bp_terms_accepted ).fadeIn(50);
</ins><span class="cx"> else
</span><del>- j(this).html( 'Rejected' ).fadeIn(50);
</del><ins>+ j(this).html( bp_terms_rejected ).fadeIn(50);
</ins><span class="cx"> });
</span><span class="cx"> }
</span><span class="cx"> });
</span></span></pre></div>
<a id="trunkbpthemesbpdefaultfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/bp-themes/bp-default/functions.php (2372 => 2373)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/bp-themes/bp-default/functions.php 2010-01-19 21:26:59 UTC (rev 2372)
+++ trunk/bp-themes/bp-default/functions.php 2010-01-19 21:43:11 UTC (rev 2373)
</span><span class="lines">@@ -200,6 +200,20 @@
</span><span class="cx"> <?php
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+/* Add words that we need to use in JS to the end of the page so they can be translated and still used. */
+function bp_dtheme_js_terms() { ?>
+<script type="text/javascript">
+ var bp_terms_my_favs = '<?php _e( "My Favorites", "buddypress" ) ?>';
+ var bp_terms_accepted = '<?php _e( "Accepted", "buddypress" ) ?>';
+ var bp_terms_rejected = '<?php _e( "Rejected", "buddypress" ) ?>';
+ var bp_terms_show_all_comments = '<?php _e( "Show all comments for this thread", "buddypress" ) ?>';
+ var bp_terms_show_all = '<?php _e( "Show all", "buddypress" ) ?>';
+ var bp_terms_comments = '<?php _e( "comments", "buddypress" ) ?>';
+ </script>
+<?php
+}
+add_action( 'wp_footer', 'bp_dtheme_js_terms' );
+
</ins><span class="cx"> /* Show a notice when the theme is activated - workaround by Ozh (http://old.nabble.com/Activation-hook-exist-for-themes--td25211004.html) */
</span><span class="cx"> if ( is_admin() && isset($_GET['activated'] ) && $pagenow == "themes.php" ) {
</span><span class="cx"> add_action( 'admin_notices', 'bp_dtheme_show_notice' );
</span></span></pre>
</div>
</div>
</body>
</html>