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

Minor labeling things for StatusNet to GNU social migration

This commit is contained in:
Mikael Nordfeldth 2013-11-01 14:04:40 +01:00
parent 6bc11b63e3
commit bd86519d50
2 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
classes/Notice.php
View File

@ -34,14 +34,11 @@
* @license GNU Affero General Public License http://www.gnu.org/licenses/ * @license GNU Affero General Public License http://www.gnu.org/licenses/
*/ */
if (!defined('STATUSNET') && !defined('LACONICA')) { if (!defined('GNUSOCIAL')) { exit(1); }
exit(1);
}
/** /**
* Table Definition for notice * Table Definition for notice
*/ */
require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
/* We keep 200 notices, the max number of notices available per API request, /* We keep 200 notices, the max number of notices available per API request,
* in the memcached cache. */ * in the memcached cache. */

19
lib/action.php
View File

@ -30,9 +30,6 @@
if (!defined('GNUSOCIAL')) { exit(1); } if (!defined('GNUSOCIAL')) { exit(1); }
require_once INSTALLDIR.'/lib/noticeform.php';
require_once INSTALLDIR.'/lib/htmloutputter.php';
/** /**
* Base class for all actions * Base class for all actions
* *
@ -1051,32 +1048,32 @@ class Action extends HTMLOutputter // lawsuit
*/ */
function showLicenses() function showLicenses()
{ {
$this->showStatusNetLicense(); $this->showGNUsocialLicense();
$this->showContentLicense(); $this->showContentLicense();
} }
/** /**
* Show StatusNet license. * Show GNU social license.
* *
* @return nothing * @return nothing
*/ */
function showStatusNetLicense() function showGNUsocialLicense()
{ {
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 GNU social site license. Used if 'broughtby' is set.
// TRANS: Text between [] is a link description, text between () is the link itself. // TRANS: Text between [] is a link description, text between () is the link itself.
// TRANS: Make sure there is no whitespace between "]" and "(". // TRANS: Make sure there is no whitespace between "]" and "(".
// TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby // TRANS: "%%site.broughtby%%" is the value of the variable site.broughtby
$instr = _('**%%site.name%%** is a social network, courtesy of [%%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 GNU social site license. Used if 'broughtby' is not set.
$instr = _('**%%site.name%%** is a social network.'); $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 GNU social site license. Mentions the GNU social source code license.
// TRANS: Make sure there is no whitespace between "]" and "(". // TRANS: Make sure there is no whitespace between "]" and "(".
// TRANS: Text between [] is a link description, text between () is the link itself. // TRANS: [%1$s](%2$s) is a link description followed by the link itself
// TRANS: %s is the version of StatusNet that is being used. // TRANS: %3$s is the version of GNU social that is being used.
$instr .= sprintf(_('It runs on [%1$s](%2$s), version %3$s, available under the [GNU Affero General Public License](http://www.fsf.org/licensing/licenses/agpl-3.0.html).'), GNUSOCIAL_ENGINE, GNUSOCIAL_ENGINE_URL, GNUSOCIAL_VERSION); $instr .= sprintf(_('It runs on [%1$s](%2$s), version %3$s, available under the [GNU Affero General Public License](http://www.fsf.org/licensing/licenses/agpl-3.0.html).'), GNUSOCIAL_ENGINE, GNUSOCIAL_ENGINE_URL, GNUSOCIAL_VERSION);
$output = common_markup_to_html($instr); $output = common_markup_to_html($instr);
$this->raw($output); $this->raw($output);