eliseuamaro
/
gnu-social
forked from GNUsocial/gnu-social
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge branch '0.7.x' into 0.8.x

This commit is contained in:
Sarven Capadisli 2009-05-01 17:03:51 +00:00
parent 10d42ce392 deb07487bd
commit c8fd3c5765
7 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -13,3 +13,6 @@ dataobject.ini
*.rej *.rej
.#* .#*
*.swp *.swp
.buildpath
.project
.settings

2
actions/favoritesrss.php
View File

@ -107,7 +107,7 @@ class FavoritesrssAction extends Rss10Action
$c = array('url' => common_local_url('favoritesrss', $c = array('url' => common_local_url('favoritesrss',
array('nickname' => array('nickname' =>
$user->nickname)), $user->nickname)),
'title' => sprintf(_("%s favorite notices"), $user->nickname), 'title' => sprintf(_("%s's favorite notices"), $user->nickname),
'link' => common_local_url('showfavorites', 'link' => common_local_url('showfavorites',
array('nickname' => array('nickname' =>
$user->nickname)), $user->nickname)),

4
actions/openidsettings.php
View File

@ -67,8 +67,8 @@ class OpenidsettingsAction extends AccountSettingsAction
function getInstructions() function getInstructions()
{ {
return _('[OpenID](%%doc.openid%%) lets you log into many sites ' . return _('[OpenID](%%doc.openid%%) lets you log into many sites' .
' with the same user account. '. ' with the same user account.'.
' Manage your associated OpenIDs from here.'); ' Manage your associated OpenIDs from here.');
} }

4
actions/recoverpassword.php
View File

@ -151,11 +151,11 @@ class RecoverpasswordAction extends Action
$this->element('p', null, $this->element('p', null,
_('If you\'ve forgotten or lost your' . _('If you\'ve forgotten or lost your' .
' password, you can get a new one sent to' . ' password, you can get a new one sent to' .
' the email address you have stored ' . ' the email address you have stored' .
' in your account.')); ' in your account.'));
} else if ($this->mode == 'reset') { } else if ($this->mode == 'reset') {
$this->element('p', null, $this->element('p', null,
_('You\'ve been identified. Enter a ' . _('You\'ve been identified. Enter a' .
' new password below. ')); ' new password below. '));
} }
$this->elementEnd('div'); $this->elementEnd('div');

4
actions/showfavorites.php
View File

@ -74,9 +74,9 @@ class ShowfavoritesAction extends Action
function title() function title()
{ {
if ($this->page == 1) { if ($this->page == 1) {
return sprintf(_("%s favorite notices"), $this->user->nickname); return sprintf(_("%s's favorite notices"), $this->user->nickname);
} else { } else {
return sprintf(_("%s favorite notices, page %d"), return sprintf(_("%s's favorite notices, page %d"),
$this->user->nickname, $this->user->nickname,
$this->page); $this->page);
} }

2
js/identica-badge.js
View File

@ -128,7 +128,7 @@
var a = document.createElement('A'); var a = document.createElement('A');
a.innerHTML = 'get this'; a.innerHTML = 'get this';
a.target = '_blank'; a.target = '_blank';
a.href = 'http://identica/doc/badge'; a.href = 'http://identi.ca/doc/badge';
$.s.f.appendChild(a); $.s.f.appendChild(a);
$.s.appendChild($.s.f); $.s.appendChild($.s.f);
$.f.getUser(); $.f.getUser();

13
js/util.js
View File

@ -166,14 +166,20 @@ $(document).ready(function(){
$("#notice_action-submit").addClass("disabled"); $("#notice_action-submit").addClass("disabled");
return true; return true;
}, },
timeout: '60000',
error: function (xhr, textStatus, errorThrown) { $("#form_notice").removeClass("processing"); error: function (xhr, textStatus, errorThrown) { $("#form_notice").removeClass("processing");
$("#notice_action-submit").removeAttr("disabled"); $("#notice_action-submit").removeAttr("disabled");
$("#notice_action-submit").removeClass("disabled"); $("#notice_action-submit").removeClass("disabled");
if ($(".error", xhr.responseXML).length > 0) { if (textStatus == "timeout") {
$('#form_notice').append(document._importNode($(".error", xhr.responseXML).get(0), true)); alert ("Sorry! We had trouble sending your notice. The servers are overloaded. Please try again, and contact the site administrator if this problem persists");
} }
else { else {
alert("Sorry! We had trouble sending your notice ("+xhr.status+" "+xhr.statusText+"). Please report the problem to the site administrator if this happens again."); if ($(".error", xhr.responseXML).length > 0) {
$('#form_notice').append(document._importNode($(".error", xhr.responseXML).get(0), true));
}
else {
alert("Sorry! We had trouble sending your notice ("+xhr.status+" "+xhr.statusText+"). Please report the problem to the site administrator if this happens again.");
}
} }
}, },
success: function(xml) { if ($("#error", xml).length > 0) { success: function(xml) { if ($("#error", xml).length > 0) {
@ -189,7 +195,6 @@ $(document).ready(function(){
} }
else { else {
li = $("li", xml).get(0); li = $("li", xml).get(0);
id = li.id;
if ($("#"+li.id).length == 0) { if ($("#"+li.id).length == 0) {
$("#notices_primary .notices").prepend(document._importNode(li, true)); $("#notices_primary .notices").prepend(document._importNode(li, true));
$("#notices_primary .notice:first").css({display:"none"}); $("#notices_primary .notice:first").css({display:"none"});