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

Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x

Browse Source 
Conflicts:
	actions/confirmaddress.php
	actions/othersettings.php
This commit is contained in:
Brion Vibber
2010-11-02 15:02:10 -07:00
parent b26eccf33c 81e0653080
commit 04ca706601
90 changed files with 13796 additions and 6122 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
plugins/OStatus/classes/Ostatus_profile.php
View File

@@ -588,7 +588,8 @@ class Ostatus_profile extends Memcached_DataObject
// We mark up the attachment link specially for the HTML output
// so we can fold-out the full version inline.
// TRANS: Shown when a notice is longer than supported and/or when attachments are present.
// @fixme I18N this tooltip will be saved with the site's default language
// TRANS: Shown when a notice is longer than supported and/or when attachments are present. At runtime this will usually be replaced with localized text from StatusNet core messages.
$showMoreText = _m('Show more');
$attachUrl = common_local_url('attachment',
array('attachment' => $attachment->id));