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

Merge branch 'master' of gitorious.org:+socialites/statusnet/gnu-social

Browse Source
This commit is contained in:
Ian Denhardt 2010-08-11 10:56:11 -04:00
commit b88ce62052
4 changed files with 15 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
actions/public.php
View File

@ -239,13 +239,11 @@ class PublicAction extends Action
function showAnonymousMessage() function showAnonymousMessage()
{ {
if (! (common_config('site','closed') || common_config('site','inviteonly'))) { if (! (common_config('site','closed') || common_config('site','inviteonly'))) {
$m = _('This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) service ' . $m = _('This is %%site.name%%, a social networking site. ' .
'based on the Free Software [StatusNet](http://status.net/) tool. ' .
'[Join now](%%action.register%%) to share notices about yourself with friends, family, and colleagues! ' . '[Join now](%%action.register%%) to share notices about yourself with friends, family, and colleagues! ' .
'([Read more](%%doc.help%%))'); '([Read more](%%doc.help%%))');
} else { } else {
$m = _('This is %%site.name%%, a [micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) service ' . $m = _('This is %%site.name%%, a social networking site.');
'based on the Free Software [StatusNet](http://status.net/) tool.');
} }
$this->elementStart('div', array('id' => 'anon_notice')); $this->elementStart('div', array('id' => 'anon_notice'));
$this->raw(common_markup_to_html($m)); $this->raw(common_markup_to_html($m));

3
doc-src/about
View File

@ -1,6 +1,5 @@
%%site.name%% is a %%site.name%% is a
[micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) service social network based on the Free Software [GNU social](http://www.gnu.org/software/social/) tool.
based on the Free Software [StatusNet](http://status.net/) tool.
If you [register](%%action.register%%) for an account, If you [register](%%action.register%%) for an account,
you can post small (%%site.textlimit%% chars or less) text notices you can post small (%%site.textlimit%% chars or less) text notices

41
doc-src/faq
View File

@ -1,42 +1,17 @@
These are some *Frequently Asked Questions* about this service, with These are some *Frequently Asked Questions* about this service, with
some answers. some answers.
What is %%site.name%%? What is this site?
---------------------- ----------------------
%%site.name%% is a [micro-blogging](http://en.wikipedia.org/wiki/Micro-blogging) service. This is a social network, running the GNU social software.
You can use it to write short notices about yourself, where you are,
and what you're doing, and those notices will be sent to all your friends
and fans.
How is %%site.name%% different from Twitter, Jaiku, Pownce, Plurk, others? You can use it to make connections between friends, family and
-------------------------------------------------------------------------- colleagues -- writing short notices about yourself, where you are, and
what you're doing, and those notices will be sent to all your contacts.
%%site.name%% is an [Open Network Service](http://opendefinition.org/ossd). Our main In the future, we'll be adding support for photo, video and file
goal is to provide a fair and transparent service that preserves users' autonomy. In sharing, as well as events, better contact management and mobile
particular, all the software used for %%site.name%% is [Free Software](http://en.wikipedia.org/wiki/Free_Software), and all the data is available devices.
under the [%%license.title%%](%%license.url%%) license, making it Open Data.
The software also implements the [OpenMicroBlogging](http://openmicroblogging.org/) protocol, meaning that you can have friends on other microblogging services
that can receive your notices.
The goal here is *autonomy* -- you deserve the right to manage your own on-line
presence. If you don't like how %%site.name%% works, you can take your data and the source code and set up your own server (or move your account to another one).
Where is feature X?
-------------------
The software we run, [StatusNet](http://status.net/), is still in its early stages,
and many features people expect from microblogging sites are not yet implemented. Some important ones that are expected "soon":
* More [AJAX](http://en.wikipedia.org/wiki/AJAX)-y interface
* Maps
* Cross-post to Pownce, Jaiku, etc.
* Pull messages from Twitter, Pownce, Jaiku, etc.
* [Facebook](http://www.facebook.com/) integration
* Image, video, audio notices
There is [a list of bugs and features](http://status.net/bugs/) that you may find
interesting. New ideas or complaints are very welcome.

8
lib/action.php
View File

@ -824,14 +824,14 @@ class Action extends HTMLOutputter // lawsuit
$this->elementStart('dd', null); $this->elementStart('dd', null);
if (common_config('site', 'broughtby')) { if (common_config('site', 'broughtby')) {
// TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set. // TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is set.
$instr = _('**%%site.name%%** is a microblogging service brought to you by [%%site.broughtby%%](%%site.broughtbyurl%%).'); $instr = _('**%%site.name%%** is a social network, courtesy of [%%site.broughtby%%](%%site.broughtbyurl%%).');
} else { } else {
// TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set. // TRANS: First sentence of the StatusNet site license. Used if 'broughtby' is not set.
$instr = _('**%%site.name%%** is a microblogging service.'); $instr = _('**%%site.name%%** is a social network.');
} }
$instr .= ' '; $instr .= ' ';
// TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license. // TRANS: Second sentence of the StatusNet site license. Mentions the StatusNet source code license.
$instr .= sprintf(_('It runs the [StatusNet](http://status.net/) microblogging software, version %s, available under the [GNU Affero General Public License](http://www.fsf.org/licensing/licenses/agpl-3.0.html).'), STATUSNET_VERSION); $instr .= sprintf(_('It runs on [GNU social](http://www.gnu.org/software/social/), version %s, available under the [GNU Affero General Public License](http://www.fsf.org/licensing/licenses/agpl-3.0.html).'), STATUSNET_VERSION);
$output = common_markup_to_html($instr); $output = common_markup_to_html($instr);
$this->raw($output); $this->raw($output);
$this->elementEnd('dd'); $this->elementEnd('dd');
@ -878,7 +878,7 @@ class Action extends HTMLOutputter // lawsuit
'height' => '15')); 'height' => '15'));
$this->text(' '); $this->text(' ');
// TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration. // TRANS: license message in footer. %1$s is the site name, %2$s is a link to the license URL, with a licence name set in configuration.
$notice = _('All %1$s content and data are available under the %2$s license.'); $notice = _('All content and data are available under the %2$s license.');
$link = "<a class=\"license\" rel=\"external license\" href=\"" . $link = "<a class=\"license\" rel=\"external license\" href=\"" .
htmlspecialchars(common_config('license', 'url')) . htmlspecialchars(common_config('license', 'url')) .
"\">" . "\">" .