We are no longer offering accounts on this server. Consider https://gitlab.freedesktop.org/ as a place to host projects.

Commit 15dafffb authored by Evan Prodromou's avatar Evan Prodromou

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

parents db85774f 29980338

Too many changes to show.

To preserve performance only 1000 of 1000+ files are displayed.
......@@ -1496,8 +1496,9 @@ Configuration options specific to notices.
contentlimit: max length of the plain-text content of a notice.
Default is null, meaning to use the site-wide text limit.
0 means no limit.
defaultscope: default scope for notices. Defaults to 0; set to
1 to keep notices private to this site by default.
defaultscope: default scope for notices. If null, the default
scope depends on site/private. It's 1 if the site is private,
0 otherwise. Set this value to override.
message
-------
......
......@@ -448,7 +448,7 @@ class Notice extends Memcached_DataObject
if (!empty($reply)) {
$notice->scope = $reply->scope;
} else {
$notice->scope = common_config('notice', 'defaultscope');
$notice->scope = self::defaultScope();
}
} else {
$notice->scope = $scope;
......@@ -2469,5 +2469,18 @@ class Notice extends Memcached_DataObject
$skip = array('_original', '_profile');
return array_diff($vars, $skip);
}
static function defaultScope()
{
$scope = common_config('notice', 'defaultscope');
if (is_null($scope)) {
if (common_config('site', 'private')) {
$scope = 1;
} else {
$scope = 0;
}
}
return $scope;
}
}
......@@ -288,7 +288,7 @@ $default =
'gc_limit' => 1000), // max sessions to expire at a time
'notice' =>
array('contentlimit' => null,
'defaultscope' => 0), // set to 0 for default open
'defaultscope' => null), // null means 1 if site/private, 0 otherwise
'message' =>
array('contentlimit' => null),
'location' =>
......
......@@ -15,19 +15,19 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-06-19 11:06+0000\n"
"PO-Revision-Date: 2011-06-19 11:08:34+0000\n"
"POT-Creation-Date: 2011-07-01 09:23+0000\n"
"PO-Revision-Date: 2011-07-01 09:25:51+0000\n"
"Language-Team: Arabic <http://translatewiki.net/wiki/Portal:ar>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: MediaWiki 1.19alpha (r90375); Translate extension (2011-06-02)\n"
"X-Generator: MediaWiki 1.19alpha (r91251); Translate extension (2011-06-24)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ar\n"
"X-Message-Group: #out-statusnet-core\n"
"Plural-Forms: nplurals=6; plural=(n == 0) ? 0 : ( (n == 1) ? 1 : ( (n == "
"2) ? 2 : ( (n%100 >= 3 && n%100 <= 10) ? 3 : ( (n%100 >= 11 && n%100 <= "
"99) ? 4 : 5 ) ) ) );\n"
"X-POT-Import-Date: 2011-06-18 16:18:45+0000\n"
"X-POT-Import-Date: 2011-06-19 11:22:46+0000\n"
#. TRANS: Database error message.
#, php-format
......@@ -253,6 +253,13 @@ msgstr "مسار %s الزمني"
msgid "%s's home timeline"
msgstr "مسار %s الزمني"
#. TRANS: %s is user nickname.
#. TRANS: Feed title.
#. TRANS: %s is tagger's nickname.
#, fuzzy, php-format
msgid "Feed for friends of %s (Activity Streams JSON)"
msgstr "تغذية أصدقاء %s (أتوم)"
#. TRANS: %s is user nickname.
#, php-format
msgid "Feed for friends of %s (RSS 1.0)"
......@@ -4163,6 +4170,10 @@ msgstr "المسار الزمني العام، صفحة %d"
msgid "Public timeline"
msgstr "المسار الزمني العام"
#. TRANS: Link description for public timeline feed.
msgid "Public Stream Feed (Activity Streams JSON)"
msgstr ""
#. TRANS: Link description for public timeline feed.
msgid "Public Stream Feed (RSS 1.0)"
msgstr ""
......@@ -4658,6 +4669,12 @@ msgstr "الردود على %s"
msgid "Replies to %1$s, page %2$d"
msgstr "الردود على %1$s، الصفحة %2$d"
#. TRANS: Link for feed with replies for a user.
#. TRANS: %s is a user nickname.
#, fuzzy, php-format
msgid "Replies feed for %s (Activity Streams JSON)"
msgstr "الردود على %s"
#. TRANS: Link for feed with replies for a user.
#. TRANS: %s is a user nickname.
#, php-format
......@@ -4917,6 +4934,11 @@ msgstr "إشعارات %1$s المُفضلة، الصفحة %2$d"
msgid "Could not retrieve favorite notices."
msgstr "تعذّر إنشاء مفضلة."
#. TRANS: Feed link text. %s is a username.
#, fuzzy, php-format
msgid "Feed for favorites of %s (Activity Streams JSON)"
msgstr "تغذية أصدقاء %s (أتوم)"
#. TRANS: Feed link text. %s is a username.
#, php-format
msgid "Feed for favorites of %s (RSS 1.0)"
......@@ -4975,6 +4997,11 @@ msgstr "مجموعة %s"
msgid "%1$s group, page %2$d"
msgstr "مجموعة %1$s، الصفحة %2$d"
#. TRANS: Tooltip for feed link. %s is a group nickname.
#, php-format
msgid "Notice feed for %s group (Activity Streams JSON)"
msgstr ""
#. TRANS: Tooltip for feed link. %s is a group nickname.
#, php-format
msgid "Notice feed for %s group (RSS 1.0)"
......@@ -5201,6 +5228,12 @@ msgstr "الإشعارات الموسومة ب%s، الصفحة %2$d"
msgid "Notice feed for %1$s tagged %2$s (RSS 1.0)"
msgstr ""
#. TRANS: Title for link to notice feed.
#. TRANS: %s is a user nickname.
#, php-format
msgid "Notice feed for %s (Activity Streams JSON)"
msgstr ""
#. TRANS: Title for link to notice feed.
#. TRANS: %s is a user nickname.
#, php-format
......@@ -5824,6 +5857,12 @@ msgstr "رسائل قصيرة"
msgid "Notices tagged with %1$s, page %2$d"
msgstr "الإشعارات الموسومة ب%s، الصفحة %2$d"
#. TRANS: Link label for feed on "notices with tag" page.
#. TRANS: %s is the tag the feed is for.
#, php-format
msgid "Notice feed for tag %s (Activity Streams JSON)"
msgstr ""
#. TRANS: Link label for feed on "notices with tag" page.
#. TRANS: %s is the tag the feed is for.
#, php-format
......@@ -7880,6 +7919,10 @@ msgstr "أتوم"
msgid "FOAF"
msgstr "FOAF"
#. TRANS: Feed type name. See http://activitystrea.ms/
msgid "Activity Streams"
msgstr ""
#. TRANS: Client exception thrown when an imported feed does not have an author.
msgid "No author in the feed."
msgstr ""
......
......@@ -11,17 +11,17 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet - Core\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2011-06-19 11:06+0000\n"
"PO-Revision-Date: 2011-06-19 11:08:36+0000\n"
"POT-Creation-Date: 2011-07-01 09:23+0000\n"
"PO-Revision-Date: 2011-07-01 09:25:53+0000\n"
"Language-Team: Bulgarian <http://translatewiki.net/wiki/Portal:bg>\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: MediaWiki 1.19alpha (r90375); Translate extension (2011-06-02)\n"
"X-Generator: MediaWiki 1.19alpha (r91251); Translate extension (2011-06-24)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: bg\n"