diff options
author | Brion Vibber <brion@pobox.com> | 2010-11-02 15:02:10 -0700 |
---|---|---|
committer | Brion Vibber <brion@pobox.com> | 2010-11-02 15:02:10 -0700 |
commit | 04ca706601a2a3b556cc52fa21b61fcd842c4e87 (patch) | |
tree | df79bc06e080623c4d2107ae8ce212160c7669b1 /plugins/OStatus | |
parent | b26eccf33cf69c04a96d5d6d3eddc0ef68ffd4b1 (diff) | |
parent | 81e06530800bce5eb60eca362d4c21453632183a (diff) |
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
Conflicts:
actions/confirmaddress.php
actions/othersettings.php
Diffstat (limited to 'plugins/OStatus')
-rw-r--r-- | plugins/OStatus/classes/Ostatus_profile.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/plugins/OStatus/classes/Ostatus_profile.php b/plugins/OStatus/classes/Ostatus_profile.php index 03fcb71df..90bf671eb 100644 --- a/plugins/OStatus/classes/Ostatus_profile.php +++ b/plugins/OStatus/classes/Ostatus_profile.php @@ -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)); |