GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Merge remote branch 'origin/master'

Browse Source
This commit is contained in:
Evan Prodromou 2011-02-14 12:41:52 -05:00
commit 2b869fa23f
2 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
actions/othersettings.php
View File

@ -106,8 +106,10 @@ class OthersettingsAction extends AccountSettingsAction
$services[$name]=$name;
if($value['freeService']){
// TRANS: Used as a suffix for free URL shorteners in a dropdown list in the tab "Other" of a
// TRANS: user's profile settings. This message has one space at the beginning. Use your
// TRANS: language's word separator here if it has one (most likely a single space).
// TRANS: user's profile settings. Use of "free" is as in "open", indicating that the
// TRANS: information on the shortener site is freely distributable.
// TRANS: This message has one space at the beginning. Use your language's word separator
// TRANS: here if it has one (most likely a single space).
$services[$name].=_(' (free service)');
}
}

5
lib/activityobject.php
View File

@ -546,7 +546,10 @@ class ActivityObject
if (!empty($this->title)) {
$name = common_xml_safe_str($this->title);
if ($tag == 'author') {
$xo->element(self::NAME, null, $name);
// XXX: Backward compatibility hack -- atom:name should contain
// full name here, instead of nickname, i.e.: $name. Change
// this in the next version.
$xo->element(self::NAME, null, $this->poco->preferredUsername);
} else {
$xo->element(self::TITLE, null, $name);
}