[dw-nonfree] change translation strings used by Tropo Red/Purple
[commit: http://hg.dwscoalition.org/dw-nonfree/rev/a58ae6803a4e]
http://bugs.dwscoalition.org/show_bug.cgi?id=2205
Make Tropo use the same translation strings as the other site schemes.
Backend cleanup; no user-facing changes.
Patch by
gchick.
Files modified:
http://bugs.dwscoalition.org/show_bug.cgi?id=2205
Make Tropo use the same translation strings as the other site schemes.
Backend cleanup; no user-facing changes.
Patch by
![[personal profile]](https://www.dreamwidth.org/img/silk/identity/user.png)
Files modified:
- bin/upgrading/en_DW.dat
- cgi-bin/bml/scheme/tropo-purple.look
- cgi-bin/bml/scheme/tropo-red.look
-------------------------------------------------------------------------------- diff -r 6828d63573b6 -r a58ae6803a4e bin/upgrading/en_DW.dat --- a/bin/upgrading/en_DW.dat Wed Dec 09 15:46:05 2009 -0600 +++ b/bin/upgrading/en_DW.dat Fri Dec 11 14:40:46 2009 +0000 @@ -16,48 +16,4 @@ invitecodes.userclass.premium_paid=Premi langname.en_DW=English -tropo.accountlinks.account=Account - -tropo.accountlinks.btn.login=Log in - -tropo.accountlinks.btn.logout=Log out - -tropo.accountlinks.help=Help - -tropo.accountlinks.inbox=Inbox - -tropo.accountlinks.invitefriend=Invite a Friend - -tropo.accountlinks.login.forgotpassword=Forgot password? - -tropo.accountlinks.login.openid=Log in with OpenID? - -tropo.accountlinks.login.password=Password: - -tropo.accountlinks.login.rememberme=Remember me - -tropo.accountlinks.login.username=Username: - -tropo.accountlinks.post=Post - -tropo.accountlinks.readinglist=Reading Page - -tropo.accountlinks.userpic.alt=Upload Userpics - -tropo.footer.info=Copyright © 2009 Dreamwidth Studios, LLC. All rights reserved. - -tropo.footer.legal.abusepolicy=Abuse Policy - -tropo.footer.legal.diversitystatement=Diversity Statement - -tropo.footer.legal.guidingprinciples=Guiding Principles - -tropo.footer.legal.privacypolicy=Privacy Policy - -tropo.footer.legal.tos=Terms of Service - tropo.footer.opensource=Open Source - -tropo.footer.sitemap=Site Map - -tropo.footer.suggestion=Make a Suggestion diff -r 6828d63573b6 -r a58ae6803a4e cgi-bin/bml/scheme/tropo-purple.look --- a/cgi-bin/bml/scheme/tropo-purple.look Wed Dec 09 15:46:05 2009 -0600 +++ b/cgi-bin/bml/scheme/tropo-purple.look Fri Dec 11 14:40:46 2009 +0000 @@ -79,9 +79,9 @@ accountlinks<= $ret .= "<div id='account-links-userpic'><a href='$LJ::SITEROOT/editpics'>"; if ( $userpic && !$LJ::IS_SSL ) { my $wh = $userpic->img_fixedsize( width => 80, height => 80 ); - $ret .= "<img src='" . $userpic->url . "' $wh alt=\"$ML{'tropo.accountlinks.userpic.alt'}\" />"; + $ret .= "<img src='" . $userpic->url . "' $wh alt=\"$ML{'sitescheme.accountlinks.userpic.alt'}\" />"; } else { - $ret .= "<img src='$imgprefix/nouserpic.png' width='80' height='80' alt=\"$ML{'tropo.accountlinks.userpic.alt'}\" />"; + $ret .= "<img src='$imgprefix/nouserpic.png' width='80' height='80' alt=\"$ML{'sitescheme.accountlinks.userpic.alt'}\" />"; } $ret .= "</a></div>"; $ret .= "<div id='account-links-text'>"; @@ -89,17 +89,17 @@ accountlinks<= $ret .= $remote->ljuser_display; $ret .= "<input type='hidden' name='user' value='" . $remote->user . "' />"; $ret .= "<input type='hidden' name='sessid' value='$remote->{_session}->{sessid}' />"; - $ret .= " <input type='submit' value=\"$ML{'tropo.accountlinks.btn.logout'}\" />"; + $ret .= " <input type='submit' value=\"$ML{'sitescheme.accountlinks.btn.logout'}\" />"; $ret .= "</form>"; $ret .= "<ul>"; - $ret .= "<li><a href='$LJ::SITEROOT/update'>$ML{'tropo.accountlinks.post'}</a> • </li>" unless $identity; - $ret .= "<li><a href='" . $remote->journal_base . "/read'>$ML{'tropo.accountlinks.readinglist'}</a> • </li>"; - $ret .= "<li><a href='$LJ::SITEROOT/inbox/'>$ML{'tropo.accountlinks.inbox'}"; + $ret .= "<li><a href='$LJ::SITEROOT/update'>$ML{'sitescheme.accountlinks.post'}</a> • </li>" unless $identity; + $ret .= "<li><a href='" . $remote->journal_base . "/read'>$ML{'sitescheme.accountlinks.readinglist'}</a> • </li>"; + $ret .= "<li><a href='$LJ::SITEROOT/inbox/'>$ML{'sitescheme.accountlinks.inbox'}"; $ret .= " <span id='Inbox_Unread_Count'>($unread)</span>" if $unread; $ret .= "</a> • </li>"; - $ret .= "<li><a href='$LJ::SITEROOT/manage/settings/'>$ML{'tropo.accountlinks.account'}</a></li> <br />"; - $ret .= "<li><a href='$LJ::SITEROOT/manage/circle/invite'>$ML{'tropo.accountlinks.invitefriend'}</a> • </li>" unless $identity; - $ret .= "<li><a href='$LJ::SITEROOT/support/'>$ML{'tropo.accountlinks.help'}</a></li>"; + $ret .= "<li><a href='$LJ::SITEROOT/manage/settings/'>$ML{'sitescheme.accountlinks.account'}</a></li> <br />"; + $ret .= "<li><a href='$LJ::SITEROOT/manage/circle/invite'>$ML{'sitescheme.accountlinks.invitefriend'}</a> • </li>" unless $identity; + $ret .= "<li><a href='$LJ::SITEROOT/support/'>$ML{'sitescheme.accountlinks.help'}</a></li>"; $ret .= "</ul>"; $ret .= "</div>"; } else { @@ -110,22 +110,22 @@ accountlinks<= $ret .= "<input type='hidden' name='chal' class='lj_login_chal' value='$chal' />\n"; $ret .= "<input type='hidden' name='response' class='lj_login_response' value='' />\n"; $ret .= "<table id='login-table'>"; - $ret .= "<tr><td><label for='login_user'>$ML{'tropo.accountlinks.login.username'}</label></td>"; + $ret .= "<tr><td><label for='login_user'>$ML{'sitescheme.accountlinks.login.username'}</label></td>"; $ret .= "<td class='input-cell' colspan='2'>" . LJ::html_text({ name => "user", id => "login_user", size => 20, maxlength => 27, tabindex => 1, - }) . " <a href='$LJ::SITEROOT/openid/'>$ML{'tropo.accountlinks.login.openid'}</a></td></tr>"; - $ret .= "<tr><td><label for='login_password'>$ML{'tropo.accountlinks.login.password'}</label></td>"; + }) . " <a href='$LJ::SITEROOT/openid/'>$ML{'sitescheme.accountlinks.login.openid'}</a></td></tr>"; + $ret .= "<tr><td><label for='login_password'>$ML{'sitescheme.accountlinks.login.password'}</label></td>"; $ret .= "<td class='input-cell' colspan='2'>" . LJ::html_text({ type => "password", name => "password", id => "login_password", size => 20, tabindex => 2, - }) . " <a href='$LJ::SITEROOT/lostinfo'>$ML{'tropo.accountlinks.login.forgotpassword'}</a></td></tr>"; + }) . " <a href='$LJ::SITEROOT/lostinfo'>$ML{'sitescheme.accountlinks.login.forgotpassword'}</a></td></tr>"; $ret .= "<tr><td> </td>"; $ret .= "<td class='remember-me-cell'>"; $ret .= LJ::html_check({ @@ -134,8 +134,8 @@ accountlinks<= value => 1, tabindex => 3, }); - $ret .= " <label for='login_remember_me'>$ML{'tropo.accountlinks.login.rememberme'}</label></td>"; - $ret .= "<td>" . LJ::html_submit( login => $ML{'tropo.accountlinks.btn.login'}, { tabindex => 4 }) . "</td>"; + $ret .= " <label for='login_remember_me'>$ML{'sitescheme.accountlinks.login.rememberme'}</label></td>"; + $ret .= "<td>" . LJ::html_submit( login => $ML{'sitescheme.accountlinks.btn.login'}, { tabindex => 4 }) . "</td>"; $ret .= "</tr>"; $ret .= "</table>"; $ret .= "</form>"; @@ -148,15 +148,15 @@ _code?> footer<= <ul> - <li><a href="<?siteroot?>/legal/privacy"><?_ml tropo.footer.legal.privacypolicy _ml?></a> • </li> - <li><a href="<?siteroot?>/legal/tos"><?_ml tropo.footer.legal.tos _ml?></a> • </li> - <li><a href="<?siteroot?>/legal/diversity"><?_ml tropo.footer.legal.diversitystatement _ml?></a> • </li> - <li><a href="<?siteroot?>/legal/principles"><?_ml tropo.footer.legal.guidingprinciples _ml?></a> • </li> - <li><a href="<?siteroot?>/site/"><?_ml tropo.footer.sitemap _ml?></a> • </li> - <li><a href="<?siteroot?>/site/suggest"><?_ml tropo.footer.suggestion _ml?></a> • </li> + <li><a href="<?siteroot?>/legal/privacy"><?_ml sitescheme.footer.legal.privacypolicy _ml?></a> • </li> + <li><a href="<?siteroot?>/legal/tos"><?_ml sitescheme.footer.legal.tos _ml?></a> • </li> + <li><a href="<?siteroot?>/legal/diversity"><?_ml sitescheme.footer.legal.diversitystatement _ml?></a> • </li> + <li><a href="<?siteroot?>/legal/principles"><?_ml sitescheme.footer.legal.guidingprinciples _ml?></a> • </li> + <li><a href="<?siteroot?>/site/"><?_ml sitescheme.footer.sitemap _ml?></a> • </li> + <li><a href="<?siteroot?>/site/suggest"><?_ml sitescheme.footer.suggestion _ml?></a> • </li> <li><a href="<?siteroot?>/site/opensource"><?_ml tropo.footer.opensource _ml?></a></li> </ul> -<p><?_ml tropo.footer.info _ml?></p> +<p><?_ml sitescheme.footer.info _ml?></p> <=footer page<= diff -r 6828d63573b6 -r a58ae6803a4e cgi-bin/bml/scheme/tropo-red.look --- a/cgi-bin/bml/scheme/tropo-red.look Wed Dec 09 15:46:05 2009 -0600 +++ b/cgi-bin/bml/scheme/tropo-red.look Fri Dec 11 14:40:46 2009 +0000 @@ -79,9 +79,9 @@ accountlinks<= $ret .= "<div id='account-links-userpic'><a href='$LJ::SITEROOT/editpics'>"; if ( $userpic && !$LJ::IS_SSL ) { my $wh = $userpic->img_fixedsize( width => 80, height => 80 ); - $ret .= "<img src='" . $userpic->url . "' $wh alt=\"$ML{'tropo.accountlinks.userpic.alt'}\" />"; + $ret .= "<img src='" . $userpic->url . "' $wh alt=\"$ML{'sitescheme.accountlinks.userpic.alt'}\" />"; } else { - $ret .= "<img src='$imgprefix/nouserpic.png' width='80' height='80' alt=\"$ML{'tropo.accountlinks.userpic.alt'}\" />"; + $ret .= "<img src='$imgprefix/nouserpic.png' width='80' height='80' alt=\"$ML{'sitescheme.accountlinks.userpic.alt'}\" />"; } $ret .= "</a></div>"; $ret .= "<div id='account-links-text'>"; @@ -89,17 +89,17 @@ accountlinks<= $ret .= $remote->ljuser_display; $ret .= "<input type='hidden' name='user' value='" . $remote->user . "' />"; $ret .= "<input type='hidden' name='sessid' value='$remote->{_session}->{sessid}' />"; - $ret .= " <input type='submit' value=\"$ML{'tropo.accountlinks.btn.logout'}\" />"; + $ret .= " <input type='submit' value=\"$ML{'sitescheme.accountlinks.btn.logout'}\" />"; $ret .= "</form>"; $ret .= "<ul>"; - $ret .= "<li><a href='$LJ::SITEROOT/update'>$ML{'tropo.accountlinks.post'}</a> • </li>" unless $identity; - $ret .= "<li><a href='" . $remote->journal_base . "/read'>$ML{'tropo.accountlinks.readinglist'}</a> • </li>"; - $ret .= "<li><a href='$LJ::SITEROOT/inbox/'>$ML{'tropo.accountlinks.inbox'}"; + $ret .= "<li><a href='$LJ::SITEROOT/update'>$ML{'sitescheme.accountlinks.post'}</a> • </li>" unless $identity; + $ret .= "<li><a href='" . $remote->journal_base . "/read'>$ML{'sitescheme.accountlinks.readinglist'}</a> • </li>"; + $ret .= "<li><a href='$LJ::SITEROOT/inbox/'>$ML{'sitescheme.accountlinks.inbox'}"; $ret .= " <span id='Inbox_Unread_Count'>($unread)</span>" if $unread; $ret .= "</a> • </li>"; - $ret .= "<li><a href='$LJ::SITEROOT/manage/settings/'>$ML{'tropo.accountlinks.account'}</a></li> <br />"; - $ret .= "<li><a href='$LJ::SITEROOT/manage/circle/invite'>$ML{'tropo.accountlinks.invitefriend'}</a> • </li>" unless $identity; - $ret .= "<li><a href='$LJ::SITEROOT/support/'>$ML{'tropo.accountlinks.help'}</a></li>"; + $ret .= "<li><a href='$LJ::SITEROOT/manage/settings/'>$ML{'sitescheme.accountlinks.account'}</a></li> <br />"; + $ret .= "<li><a href='$LJ::SITEROOT/manage/circle/invite'>$ML{'sitescheme.accountlinks.invitefriend'}</a> • </li>" unless $identity; + $ret .= "<li><a href='$LJ::SITEROOT/support/'>$ML{'sitescheme.accountlinks.help'}</a></li>"; $ret .= "</ul>"; $ret .= "</div>"; } else { @@ -110,22 +110,22 @@ accountlinks<= $ret .= "<input type='hidden' name='chal' class='lj_login_chal' value='$chal' />\n"; $ret .= "<input type='hidden' name='response' class='lj_login_response' value='' />\n"; $ret .= "<table id='login-table'>"; - $ret .= "<tr><td><label for='login_user'>$ML{'tropo.accountlinks.login.username'}</label></td>"; + $ret .= "<tr><td><label for='login_user'>$ML{'sitescheme.accountlinks.login.username'}</label></td>"; $ret .= "<td class='input-cell' colspan='2'>" . LJ::html_text({ name => "user", id => "login_user", size => 20, maxlength => 27, tabindex => 1, - }) . " <a href='$LJ::SITEROOT/openid/'>$ML{'tropo.accountlinks.login.openid'}</a></td></tr>"; - $ret .= "<tr><td><label for='login_password'>$ML{'tropo.accountlinks.login.password'}</label></td>"; + }) . " <a href='$LJ::SITEROOT/openid/'>$ML{'sitescheme.accountlinks.login.openid'}</a></td></tr>"; + $ret .= "<tr><td><label for='login_password'>$ML{'sitescheme.accountlinks.login.password'}</label></td>"; $ret .= "<td class='input-cell' colspan='2'>" . LJ::html_text({ type => "password", name => "password", id => "login_password", size => 20, tabindex => 2, - }) . " <a href='$LJ::SITEROOT/lostinfo'>$ML{'tropo.accountlinks.login.forgotpassword'}</a></td></tr>"; + }) . " <a href='$LJ::SITEROOT/lostinfo'>$ML{'sitescheme.accountlinks.login.forgotpassword'}</a></td></tr>"; $ret .= "<tr><td> </td>"; $ret .= "<td class='remember-me-cell'>"; $ret .= LJ::html_check({ @@ -134,8 +134,8 @@ accountlinks<= value => 1, tabindex => 3, }); - $ret .= " <label for='login_remember_me'>$ML{'tropo.accountlinks.login.rememberme'}</label></td>"; - $ret .= "<td>" . LJ::html_submit( login => $ML{'tropo.accountlinks.btn.login'}, { tabindex => 4 }) . "</td>"; + $ret .= " <label for='login_remember_me'>$ML{'sitescheme.accountlinks.login.rememberme'}</label></td>"; + $ret .= "<td>" . LJ::html_submit( login => $ML{'sitescheme.accountlinks.btn.login'}, { tabindex => 4 }) . "</td>"; $ret .= "</tr>"; $ret .= "</table>"; $ret .= "</form>"; @@ -148,15 +148,15 @@ _code?> footer<= <ul> - <li><a href="<?siteroot?>/legal/privacy"><?_ml tropo.footer.legal.privacypolicy _ml?></a> • </li> - <li><a href="<?siteroot?>/legal/tos"><?_ml tropo.footer.legal.tos _ml?></a> • </li> - <li><a href="<?siteroot?>/legal/diversity"><?_ml tropo.footer.legal.diversitystatement _ml?></a> • </li> - <li><a href="<?siteroot?>/legal/principles"><?_ml tropo.footer.legal.guidingprinciples _ml?></a> • </li> - <li><a href="<?siteroot?>/site/"><?_ml tropo.footer.sitemap _ml?></a> • </li> - <li><a href="<?siteroot?>/site/suggest"><?_ml tropo.footer.suggestion _ml?></a> • </li> + <li><a href="<?siteroot?>/legal/privacy"><?_ml sitescheme.footer.legal.privacypolicy _ml?></a> • </li> + <li><a href="<?siteroot?>/legal/tos"><?_ml sitescheme.footer.legal.tos _ml?></a> • </li> + <li><a href="<?siteroot?>/legal/diversity"><?_ml sitescheme.footer.legal.diversitystatement _ml?></a> • </li> + <li><a href="<?siteroot?>/legal/principles"><?_ml sitescheme.footer.legal.guidingprinciples _ml?></a> • </li> + <li><a href="<?siteroot?>/site/"><?_ml sitescheme.footer.sitemap _ml?></a> • </li> + <li><a href="<?siteroot?>/site/suggest"><?_ml sitescheme.footer.suggestion _ml?></a> • </li> <li><a href="<?siteroot?>/site/opensource"><?_ml tropo.footer.opensource _ml?></a></li> </ul> -<p><?_ml tropo.footer.info _ml?></p> +<p><?_ml sitescheme.footer.info _ml?></p> <=footer page<= --------------------------------------------------------------------------------