Commit a2cb0a03 authored by Evan Prodromou's avatar Evan Prodromou

Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

parents f1701647 c9c316db
......@@ -96,7 +96,7 @@ class FeaturedAction extends Action
function getInstructions()
{
return sprintf(_('A selection of some of the great users on %s'),
return sprintf(_('A selection of some great users on %s'),
common_config('site', 'name'));
}
......
......@@ -3,7 +3,7 @@
based on the Free Software [StatusNet](http://status.net/) tool.
If you [register](%%action.register%%) for an account,
you can post small (140 chars or less) text notices
you can post small (%%site.textlimit%% chars or less) text notices
about yourself, where you are, what you're doing, or practically
anything you want. You can also subscribe to the notices of your
friends, or other people you're interested in, and follow them on the
......
%%site.name%% is a **microblogging service**. Users post short (140
%%site.name%% is a **microblogging service**. Users post short (%%site.textlimit%%
character) notices which are broadcast to their friends and fans using
the Web, RSS, or instant messages.
......@@ -30,4 +30,4 @@ Here are some documents that you might find helpful in understanding
* [Privacy](%%doc.privacy%%) - %%site.name%%'s privacy policy
* [Source](%%doc.source%%) - How to get the StatusNet source code
* [Badge](%%doc.badge%%) - How to put a StatusNet badge on your blog or homepage
* [Bookmarklet](%%doc.bookmarklet%%) - Bookmarklet for posting Web pages
\ No newline at end of file
* [Bookmarklet](%%doc.bookmarklet%%) - Bookmarklet for posting Web pages
......@@ -20,7 +20,7 @@ Sending updates
---------------
You send updates by sending messages to %%xmpp.user%%@%%xmpp.server%%. Messages
should be less than 140 characters; longer messages will be truncated.
should be less than %%site.textlimit%% characters; longer messages will be truncated.
Commands
--------
......
......@@ -278,6 +278,20 @@ function main()
&& !preg_match('/rss$/', $action)
&& !preg_match('/^Api/', $action)
) {
// set returnto
$rargs =& common_copy_args($args);
unset($rargs['action']);
if (common_config('site', 'fancy')) {
unset($rargs['p']);
}
if (array_key_exists('submit', $rargs)) {
unset($rargs['submit']);
}
foreach (array_keys($_COOKIE) as $cookie) {
unset($rargs[$cookie]);
}
common_set_returnto(common_local_url($action, $rargs));
common_redirect(common_local_url('login'));
return;
}
......
......@@ -32,6 +32,21 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
exit(1);
}
// Locale category constants are usually predefined, but may not be
// on some systems such as Win32.
$LC_CATEGORIES = array('LC_CTYPE',
'LC_NUMERIC',
'LC_TIME',
'LC_COLLATE',
'LC_MONETARY',
'LC_MESSAGES',
'LC_ALL');
foreach ($LC_CATEGORIES as $key => $name) {
if (!defined($name)) {
define($name, $key);
}
}
if (!function_exists('gettext')) {
require_once("php-gettext/gettext.inc");
}
......@@ -283,6 +298,7 @@ function get_all_languages() {
'en' => array('q' => 1, 'lang' => 'en', 'name' => 'English (US)', 'direction' => 'ltr'),
'es' => array('q' => 1, 'lang' => 'es', 'name' => 'Spanish', 'direction' => 'ltr'),
'fi' => array('q' => 1, 'lang' => 'fi', 'name' => 'Finnish', 'direction' => 'ltr'),
'fa' => array('q' => 1, 'lang' => 'fa', 'name' => 'Persian', 'direction' => 'rtl'),
'fr-fr' => array('q' => 1, 'lang' => 'fr', 'name' => 'French', 'direction' => 'ltr'),
'ga' => array('q' => 0.5, 'lang' => 'ga', 'name' => 'Galician', 'direction' => 'ltr'),
'he' => array('q' => 0.5, 'lang' => 'he', 'name' => 'Hebrew', 'direction' => 'rtl'),
......
......@@ -91,8 +91,16 @@ function common_language()
if (_have_config() && common_logged_in()) {
$user = common_current_user();
$user_language = $user->language;
if ($user_language)
return $user_language;
if ($user->language) {
// Validate -- we don't want to end up with a bogus code
// left over from some old junk.
foreach (common_config('site', 'languages') as $code => $info) {
if ($info['lang'] == $user_language) {
return $user_language;
}
}
}
}
// Otherwise, find the best match for the languages requested by the
......
......@@ -8,12 +8,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-12-16 22:51+0000\n"
"PO-Revision-Date: 2009-12-16 22:51:43+0000\n"
"POT-Creation-Date: 2009-12-21 21:17+0000\n"
"PO-Revision-Date: 2009-12-21 21:17:12+0000\n"
"Language-Team: Arabic\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: MediaWiki 1.16alpha (r60142); Translate extension (2009-12-06)\n"
"X-Generator: MediaWiki 1.16alpha (r60279); Translate extension (2009-12-06)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ar\n"
"X-Message-Group: out-statusnet\n"
......@@ -1233,8 +1233,8 @@ msgid "Featured users, page %d"
msgstr "مستخدمون مختارون، صفحة %d"
#: actions/featured.php:99
#, php-format
msgid "A selection of some of the great users on %s"
#, fuzzy, php-format
msgid "A selection of some great users on %s"
msgstr "قسم للمستخدمين المتميزين على %s"
#: actions/file.php:34
......@@ -5262,47 +5262,47 @@ msgstr "رسالة"
msgid "Moderate"
msgstr ""
#: lib/util.php:829
#: lib/util.php:837
msgid "a few seconds ago"
msgstr "قبل لحظات قليلة"
#: lib/util.php:831
#: lib/util.php:839
msgid "about a minute ago"
msgstr "قبل دقيقة تقريبًا"
#: lib/util.php:833
#: lib/util.php:841
#, php-format
msgid "about %d minutes ago"
msgstr ""
#: lib/util.php:835
#: lib/util.php:843
msgid "about an hour ago"
msgstr "قبل ساعة تقريبًا"
#: lib/util.php:837
#: lib/util.php:845
#, php-format
msgid "about %d hours ago"
msgstr ""
#: lib/util.php:839
#: lib/util.php:847
msgid "about a day ago"
msgstr "قبل يوم تقريبا"
#: lib/util.php:841
#: lib/util.php:849
#, php-format
msgid "about %d days ago"
msgstr ""
#: lib/util.php:843
#: lib/util.php:851
msgid "about a month ago"
msgstr "قبل شهر تقريبًا"
#: lib/util.php:845
#: lib/util.php:853
#, php-format
msgid "about %d months ago"
msgstr ""
#: lib/util.php:847
#: lib/util.php:855
msgid "about a year ago"
msgstr "قبل سنة تقريبًا"
......
......@@ -8,12 +8,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-12-16 22:51+0000\n"
"PO-Revision-Date: 2009-12-16 22:51:46+0000\n"
"POT-Creation-Date: 2009-12-21 21:17+0000\n"
"PO-Revision-Date: 2009-12-21 21:17:15+0000\n"
"Language-Team: Egyptian Spoken Arabic\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: MediaWiki 1.16alpha (r60142); Translate extension (2009-12-06)\n"
"X-Generator: MediaWiki 1.16alpha (r60279); Translate extension (2009-12-06)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: arz\n"
"X-Message-Group: out-statusnet\n"
......@@ -1234,8 +1234,8 @@ msgid "Featured users, page %d"
msgstr "مستخدمون مختارون، صفحه %d"
#: actions/featured.php:99
#, php-format
msgid "A selection of some of the great users on %s"
#, fuzzy, php-format
msgid "A selection of some great users on %s"
msgstr "قسم للمستخدمين المتميزين على %s"
#: actions/file.php:34
......@@ -5263,47 +5263,47 @@ msgstr "رسالة"
msgid "Moderate"
msgstr ""
#: lib/util.php:829
#: lib/util.php:837
msgid "a few seconds ago"
msgstr "قبل لحظات قليلة"
#: lib/util.php:831
#: lib/util.php:839
msgid "about a minute ago"
msgstr "قبل دقيقه تقريبًا"
#: lib/util.php:833
#: lib/util.php:841
#, php-format
msgid "about %d minutes ago"
msgstr ""
#: lib/util.php:835
#: lib/util.php:843
msgid "about an hour ago"
msgstr "قبل ساعه تقريبًا"
#: lib/util.php:837
#: lib/util.php:845
#, php-format
msgid "about %d hours ago"
msgstr ""
#: lib/util.php:839
#: lib/util.php:847
msgid "about a day ago"
msgstr "قبل يوم تقريبا"
#: lib/util.php:841
#: lib/util.php:849
#, php-format
msgid "about %d days ago"
msgstr ""
#: lib/util.php:843
#: lib/util.php:851
msgid "about a month ago"
msgstr "قبل شهر تقريبًا"
#: lib/util.php:845
#: lib/util.php:853
#, php-format
msgid "about %d months ago"
msgstr ""
#: lib/util.php:847
#: lib/util.php:855
msgid "about a year ago"
msgstr "قبل سنه تقريبًا"
......
......@@ -8,12 +8,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-12-16 22:51+0000\n"
"PO-Revision-Date: 2009-12-16 22:51:49+0000\n"
"POT-Creation-Date: 2009-12-21 21:17+0000\n"
"PO-Revision-Date: 2009-12-21 21:17:18+0000\n"
"Language-Team: Bulgarian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: MediaWiki 1.16alpha (r60142); Translate extension (2009-12-06)\n"
"X-Generator: MediaWiki 1.16alpha (r60279); Translate extension (2009-12-06)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: bg\n"
"X-Message-Group: out-statusnet\n"
......@@ -1262,7 +1262,7 @@ msgstr "Избрани потребители, страница %d"
#: actions/featured.php:99
#, php-format
msgid "A selection of some of the great users on %s"
msgid "A selection of some great users on %s"
msgstr ""
#: actions/file.php:34
......@@ -5479,47 +5479,47 @@ msgstr "Съобщение"
msgid "Moderate"
msgstr ""
#: lib/util.php:829
#: lib/util.php:837
msgid "a few seconds ago"
msgstr "преди няколко секунди"
#: lib/util.php:831
#: lib/util.php:839
msgid "about a minute ago"
msgstr "преди около минута"
#: lib/util.php:833
#: lib/util.php:841
#, php-format
msgid "about %d minutes ago"
msgstr "преди около %d минути"
#: lib/util.php:835
#: lib/util.php:843
msgid "about an hour ago"
msgstr "преди около час"
#: lib/util.php:837
#: lib/util.php:845
#, php-format
msgid "about %d hours ago"
msgstr "преди около %d часа"
#: lib/util.php:839
#: lib/util.php:847
msgid "about a day ago"
msgstr "преди около ден"
#: lib/util.php:841
#: lib/util.php:849
#, php-format
msgid "about %d days ago"
msgstr "преди около %d дни"
#: lib/util.php:843
#: lib/util.php:851
msgid "about a month ago"
msgstr "преди около месец"
#: lib/util.php:845
#: lib/util.php:853
#, php-format
msgid "about %d months ago"
msgstr "преди около %d месеца"
#: lib/util.php:847
#: lib/util.php:855
msgid "about a year ago"
msgstr "преди около година"
......
This diff is collapsed.
......@@ -9,12 +9,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-12-16 22:51+0000\n"
"PO-Revision-Date: 2009-12-16 22:51:55+0000\n"
"POT-Creation-Date: 2009-12-21 21:17+0000\n"
"PO-Revision-Date: 2009-12-21 21:17:24+0000\n"
"Language-Team: Czech\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: MediaWiki 1.16alpha (r60142); Translate extension (2009-12-06)\n"
"X-Generator: MediaWiki 1.16alpha (r60279); Translate extension (2009-12-06)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: cs\n"
"X-Message-Group: out-statusnet\n"
......@@ -1268,7 +1268,7 @@ msgstr ""
#: actions/featured.php:99
#, php-format
msgid "A selection of some of the great users on %s"
msgid "A selection of some great users on %s"
msgstr ""
#: actions/file.php:34
......@@ -5456,47 +5456,47 @@ msgstr "Zpráva"
msgid "Moderate"
msgstr ""
#: lib/util.php:829
#: lib/util.php:837
msgid "a few seconds ago"
msgstr "před pár sekundami"
#: lib/util.php:831
#: lib/util.php:839
msgid "about a minute ago"
msgstr "asi před minutou"
#: lib/util.php:833
#: lib/util.php:841
#, php-format
msgid "about %d minutes ago"
msgstr "asi před %d minutami"
#: lib/util.php:835
#: lib/util.php:843
msgid "about an hour ago"
msgstr "asi před hodinou"
#: lib/util.php:837
#: lib/util.php:845
#, php-format
msgid "about %d hours ago"
msgstr "asi před %d hodinami"
#: lib/util.php:839
#: lib/util.php:847
msgid "about a day ago"
msgstr "asi přede dnem"
#: lib/util.php:841
#: lib/util.php:849
#, php-format
msgid "about %d days ago"
msgstr "před %d dny"
#: lib/util.php:843
#: lib/util.php:851
msgid "about a month ago"
msgstr "asi před měsícem"
#: lib/util.php:845
#: lib/util.php:853
#, php-format
msgid "about %d months ago"
msgstr "asi před %d mesíci"
#: lib/util.php:847
#: lib/util.php:855
msgid "about a year ago"
msgstr "asi před rokem"
......
This diff is collapsed.
......@@ -9,12 +9,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-12-16 22:51+0000\n"
"PO-Revision-Date: 2009-12-16 22:52:01+0000\n"
"POT-Creation-Date: 2009-12-21 21:17+0000\n"
"PO-Revision-Date: 2009-12-21 21:17:29+0000\n"
"Language-Team: Greek\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: MediaWiki 1.16alpha (r60142); Translate extension (2009-12-06)\n"
"X-Generator: MediaWiki 1.16alpha (r60279); Translate extension (2009-12-06)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: el\n"
"X-Message-Group: out-statusnet\n"
......@@ -1257,7 +1257,7 @@ msgstr ""
#: actions/featured.php:99
#, php-format
msgid "A selection of some of the great users on %s"
msgid "A selection of some great users on %s"
msgstr ""
#: actions/file.php:34
......@@ -5342,47 +5342,47 @@ msgstr "Μήνυμα"
msgid "Moderate"
msgstr ""
#: lib/util.php:829
#: lib/util.php:837
msgid "a few seconds ago"
msgstr ""
#: lib/util.php:831
#: lib/util.php:839
msgid "about a minute ago"
msgstr ""
#: lib/util.php:833
#: lib/util.php:841
#, php-format
msgid "about %d minutes ago"
msgstr ""
#: lib/util.php:835
#: lib/util.php:843
msgid "about an hour ago"
msgstr ""
#: lib/util.php:837
#: lib/util.php:845
#, php-format
msgid "about %d hours ago"
msgstr ""
#: lib/util.php:839
#: lib/util.php:847
msgid "about a day ago"
msgstr ""
#: lib/util.php:841
#: lib/util.php:849
#, php-format
msgid "about %d days ago"
msgstr ""
#: lib/util.php:843
#: lib/util.php:851
msgid "about a month ago"
msgstr ""
#: lib/util.php:845
#: lib/util.php:853
#, php-format
msgid "about %d months ago"
msgstr ""
#: lib/util.php:847
#: lib/util.php:855
msgid "about a year ago"
msgstr ""
......
# Translation of StatusNet to British English
#
# Author@translatewiki.net: Bruce89
# Author@translatewiki.net: CiaranG
# Author@translatewiki.net: Lockal
# --
......@@ -9,12 +10,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2009-12-16 22:51+0000\n"
"PO-Revision-Date: 2009-12-16 22:52:04+0000\n"
"POT-Creation-Date: 2009-12-21 21:17+0000\n"
"PO-Revision-Date: 2009-12-21 21:17:32+0000\n"
"Language-Team: British English\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: MediaWiki 1.16alpha (r60142); Translate extension (2009-12-06)\n"
"X-Generator: MediaWiki 1.16alpha (r60279); Translate extension (2009-12-06)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: en-gb\n"
"X-Message-Group: out-statusnet\n"
......@@ -83,6 +84,7 @@ msgstr "Feed for friends of %s (Atom)"
msgid ""
"This is the timeline for %s and friends but no one has posted anything yet."
msgstr ""
"This is the timeline for %s and friends but no one has posted anything yet."
#: actions/all.php:132
#, php-format
......@@ -90,6 +92,8 @@ msgid ""
"Try subscribing to more people, [join a group](%%action.groups%%) or post "
"something yourself."
msgstr ""
"Try subscribing to more people, [join a group](%%action.groups%%) or post "
"something yourself."
#: actions/all.php:134
#, php-format
......@@ -97,6 +101,8 @@ msgid ""
"You can try to [nudge %s](../%s) from his profile or [post something to his "
"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)."
msgstr ""
"You can try to [nudge %s](../%s) from his profile or [post something to his "
"or her attention](%%%%action.newnotice%%%%?status_textarea=%s)."
#: actions/all.php:137 actions/replies.php:209 actions/showstream.php:202
#, php-format
......@@ -104,6 +110,8 @@ msgid ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
"post a notice to his or her attention."
msgstr ""
"Why not [register an account](%%%%action.register%%%%) and then nudge %s or "
"post a notice to his or her attention."
#: actions/all.php:165
msgid "You and friends"
......@@ -142,6 +150,8 @@ msgid ""
"You must specify a parameter named 'device' with a value of one of: sms, im, "
"none"
msgstr ""
"You must specify a parameter named 'device' with a value of one of: sms, im, "
"none"
#: actions/apiaccountupdatedeliverydevice.php:132
#, fuzzy
......@@ -172,6 +182,8 @@ msgid ""
"The server was unable to handle that much POST data (%s bytes) due to its "
"current configuration."
msgstr ""
"The server was unable to handle that much POST data (%s bytes) due to its "
"current configuration."
#: actions/apiaccountupdateprofilebackgroundimage.php:136
#: actions/apiaccountupdateprofilebackgroundimage.php:146
......@@ -186,9 +198,8 @@ msgid "Could not update your design."
msgstr "Could not update your design."
#: actions/apiblockcreate.php:105
#, fuzzy
msgid "You cannot block yourself!"
msgstr "Couldn't update user."
msgstr "You cannot block yourself!"
#: actions/apiblockcreate.php:119
msgid "Block user failed."
......@@ -291,7 +302,7 @@ msgstr "Could not unfollow user: User not found."
#: actions/apifriendshipsdestroy.php:120
msgid "You cannot unfollow yourself!"
msgstr ""
msgstr "You cannot unfollow yourself!"
#: actions/apifriendshipsexists.php:94
msgid "Two user ids or screen_names must be supplied."
......@@ -350,7 +361,7 @@ msgstr "Location is too long (max 255 chars)."
#: actions/newgroup.php:159
#, php-format
msgid "Too many aliases! Maximum %d."
msgstr ""
msgstr "Too many aliases! Maximum %d."
#: actions/apigroupcreate.php:264 actions/editgroup.php:224
#: actions/newgroup.php:168
......@@ -367,7 +378,7 @@ msgstr "Alias \"%s\" already in use. Try another one."
#: actions/apigroupcreate.php:286 actions/editgroup.php:234
#: actions/newgroup.php:178
msgid "Alias can't be the same as nickname."
msgstr ""
msgstr "Alias can't be the same as nickname."
#: actions/apigroupismember.php:95 actions/apigroupjoin.php:104
#: actions/apigroupleave.php:104 actions/apigroupmembership.php:91
......@@ -381,22 +392,21 @@ msgstr "You are already a member of that group."
#: actions/apigroupjoin.php:119 actions/joingroup.php:95 lib/command.php:221
msgid "You have been blocked from that group by the admin."
msgstr ""
msgstr "You have been blocked from that group by the admin."
#: actions/apigroupjoin.php:138
#, fuzzy, php-format
#, php-format
msgid "Could not join user %s to group %s."
msgstr "Could not join user %s to group %s"
msgstr "Could not join user %s to group %s."
#: actions/apigroupleave.php:114
#, fuzzy
msgid "You are not a member of this group."
msgstr "You are not a member of that group."
msgstr "You are not a member of this group."
#: actions/apigroupleave.php:124
#, fuzzy, php-format
#, php-format
msgid "Could not remove user %s to group %s."
msgstr "Could not remove user %s to group %s"
msgstr "Could not remove user %s to group %s."
#: actions/apigrouplist.php:95
#, php-format
......@@ -432,14 +442,12 @@ msgid "No such notice."
msgstr "No such notice."
#: actions/apistatusesretweet.php:83
#, fuzzy
msgid "Cannot repeat your own notice."
msgstr "Can't turn on notification."
msgstr "Cannot repeat your own notice."
#: actions/apistatusesretweet.php:91
#, fuzzy
msgid "Already repeated that notice."
msgstr "Delete this notice"
msgstr "Already repeated that notice."
#: actions/apistatusesshow.php:138
msgid "Status deleted."
......@@ -462,12 +470,11 @@ msgstr "Not found"
#: actions/apistatusesupdate.php:227 actions/newnotice.php:183
#, php-format
msgid "Max notice size is %d chars, including attachment URL."
msgstr ""
msgstr "Max notice size is %d chars, including attachment URL."
#: actions/apisubscriptions.php:231 actions/apisubscriptions.php:261
#, fuzzy
msgid "Unsupported format."
msgstr "Unsupported image file format."
msgstr "Unsupported format."
#: actions/apitimelinefavorites.php:108
#, php-format
......@@ -514,17 +521,17 @@ msgstr "%s updates from everyone!"
#: actions/apitimelineretweetedbyme.php:112
#, php-format