Commit dd0a99f5 authored by Evan Prodromou's avatar Evan Prodromou

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

parents 01dc77c2 0ddfcc55
......@@ -145,7 +145,7 @@ class ApiGroupJoinAction extends ApiAuthAction
switch($this->format) {
case 'xml':
$this->show_single_xml_group($this->group);
$this->showSingleXmlGroup($this->group);
break;
case 'json':
$this->showSingleJsonGroup($this->group);
......
......@@ -131,7 +131,7 @@ class ApiGroupLeaveAction extends ApiAuthAction
switch($this->format) {
case 'xml':
$this->show_single_xml_group($this->group);
$this->showSingleXmlGroup($this->group);
break;
case 'json':
$this->showSingleJsonGroup($this->group);
......
......@@ -289,7 +289,7 @@ class DesignadminpanelAction extends AdminPanelAction
function showStylesheets()
{
parent::showStylesheets();
$this->cssLink('css/farbtastic.css','base','screen, projection, tv');
$this->cssLink('js/farbtastic/farbtastic.css',null,'screen, projection, tv');
}
/**
......
......@@ -130,7 +130,7 @@ class EmailsettingsAction extends AccountSettingsAction
if (common_config('emailpost', 'enabled') && $user->email) {
$this->elementStart('fieldset', array('id' => 'settings_email_incoming'));
$this->element('legend',_('Incoming email'));
$this->element('legend', null, _('Incoming email'));
if ($user->incomingemail) {
$this->elementStart('p');
$this->element('span', 'address', $user->incomingemail);
......
......@@ -16,17 +16,17 @@
height: 101px;
}
.farbtastic .wheel {
background: url(../../../js/farbtastic/wheel.png) no-repeat;
background: url(wheel.png) no-repeat;
width: 195px;
height: 195px;
}
.farbtastic .overlay {
background: url(../../../js/farbtastic/mask.png) no-repeat;
background: url(mask.png) no-repeat;
}
.farbtastic .marker {
width: 17px;
height: 17px;
margin: -8px 0 0 -8px;
overflow: hidden;
background: url(../../../js/farbtastic/marker.png) no-repeat;
background: url(marker.png) no-repeat;
}
// A shim to implement the W3C Geolocation API Specification using Gears or the Ajax API
if (typeof navigator.geolocation == "undefined" || navigator.geolocation.shim ) (function(){
if (typeof navigator.geolocation == "undefined" || navigator.geolocation.shim ) { (function(){
// -- BEGIN GEARS_INIT
(function() {
......@@ -23,8 +23,7 @@ if (typeof navigator.geolocation == "undefined" || navigator.geolocation.shim )
}
} catch (e) {
// Safari
if ((typeof navigator.mimeTypes != 'undefined')
&& navigator.mimeTypes["application/x-googlegears"]) {
if ((typeof navigator.mimeTypes != 'undefined') && navigator.mimeTypes["application/x-googlegears"]) {
factory = document.createElement("object");
factory.style.display = "none";
factory.width = 0;
......@@ -64,8 +63,8 @@ var GearsGeoLocation = (function() {
return function(position) {
callback(position);
self.lastPosition = position;
}
}
};
};
// -- PUBLIC
return {
......@@ -112,7 +111,7 @@ var AjaxGeoLocation = (function() {
var queue = [];
var addLocationQueue = function(callback) {
queue.push(callback);
}
};
var runLocationQueue = function() {
if (hasGoogleLoader()) {
......@@ -121,18 +120,18 @@ var AjaxGeoLocation = (function() {
call();
}
}
}
};
window['_google_loader_apiLoaded'] = function() {
runLocationQueue();
}
};
var hasGoogleLoader = function() {
return (window['google'] && google['loader']);
}
};
var checkGoogleLoader = function(callback) {
if (hasGoogleLoader()) return true;
if (hasGoogleLoader()) { return true; }
addLocationQueue(callback);
......@@ -155,7 +154,7 @@ var AjaxGeoLocation = (function() {
var self = this;
if (!checkGoogleLoader(function() {
self.getCurrentPosition(successCallback, errorCallback, options);
})) return;
})) { return; }
if (google.loader.ClientLocation) {
var cl = google.loader.ClientLocation;
......@@ -168,7 +167,7 @@ var AjaxGeoLocation = (function() {
accuracy: 43000, // same as Gears accuracy over wifi?
altitudeAccuracy: null,
heading: null,
speed: null,
speed: null
},
// extra info that is outside of the bounds of the core API
address: {
......@@ -215,3 +214,4 @@ var AjaxGeoLocation = (function() {
navigator.geolocation = (window.google && google.gears) ? GearsGeoLocation() : AjaxGeoLocation();
})();
}
......@@ -509,7 +509,7 @@ var SN = { // StatusNet
}
if (typeof(location.name) == 'undefined') {
NLN_text = position.coords.latitude + ';' + position.coords.longitude;
NLN_text = data.lat + ';' + data.lon;
}
else {
NLN_text = location.name;
......@@ -525,13 +525,13 @@ var SN = { // StatusNet
$('#'+SN.C.S.NoticeDataGeo).attr('checked', true);
var cookieValue = {
'NLat': data.lat,
'NLon': data.lon,
'NLNS': lns,
'NLID': lid,
'NLN': NLN_text,
'NLNU': location.url,
'NDG': true
NLat: data.lat,
NLon: data.lon,
NLNS: lns,
NLID: lid,
NLN: NLN_text,
NLNU: location.url,
NDG: true
};
$.cookie(SN.C.S.NoticeDataGeoCookie, JSON.stringify(cookieValue));
});
......@@ -566,9 +566,9 @@ var SN = { // StatusNet
$('#'+SN.C.S.NoticeLon).val(position.coords.longitude);
var data = {
'lat': position.coords.latitude,
'lon': position.coords.longitude,
'token': $('#token').val()
lat: position.coords.latitude,
lon: position.coords.longitude,
token: $('#token').val()
};
getJSONgeocodeURL(geocodeURL, data);
......@@ -593,9 +593,9 @@ var SN = { // StatusNet
else {
if (NLat.length > 0 && NLon.length > 0) {
var data = {
'lat': NLat,
'lon': NLon,
'token': $('#token').val()
lat: NLat,
lon: NLon,
token: $('#token').val()
};
getJSONgeocodeURL(geocodeURL, data);
......@@ -624,8 +624,6 @@ var SN = { // StatusNet
else {
removeNoticeDataGeo();
}
$('#'+SN.C.S.NoticeDataText).focus();
}).change();
}
},
......
......@@ -314,7 +314,7 @@ class DesignSettingsAction extends AccountSettingsAction
function showStylesheets()
{
parent::showStylesheets();
$this->cssLink('css/farbtastic.css','base','screen, projection, tv');
$this->cssLink('js/farbtastic/farbtastic.css',null,'screen, projection, tv');
}
/**
......
......@@ -63,7 +63,7 @@ class StatusNet
}
}
if (!class_exists($pluginclass)) {
throw new ServerException(500, "Plugin $name not found.");
throw new ServerException("Plugin $name not found.", 500);
}
}
......
This diff is collapsed.
This diff is collapsed.
# Translation of StatusNet to French
#
# Author@translatewiki.net: Crochet.david
# Author@translatewiki.net: IAlex
# Author@translatewiki.net: Isoph
# Author@translatewiki.net: Jean-Frédéric
......@@ -13,11 +14,11 @@ msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-01-15 19:15+0000\n"
"PO-Revision-Date: 2010-01-15 19:16:56+0000\n"
"PO-Revision-Date: 2010-01-16 17:52:07+0000\n"
"Language-Team: French\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: MediaWiki 1.16alpha (r61101); Translate extension (2010-01-04)\n"
"X-Generator: MediaWiki 1.16alpha (r61138); Translate extension (2010-01-04)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: fr\n"
"X-Message-Group: out-statusnet\n"
......@@ -517,14 +518,12 @@ msgid "Password"
msgstr "Mot de passe"
#: actions/apioauthauthorize.php:338
#, fuzzy
msgid "Deny"
msgstr "Conception"
msgstr "Refuser"
#: actions/apioauthauthorize.php:344
#, fuzzy
msgid "Allow"
msgstr "Tous"
msgstr "Autoriser"
#: actions/apioauthauthorize.php:361
msgid "Allow or deny access to your account information."
......@@ -4751,7 +4750,7 @@ msgstr ""
#: lib/applicationeditform.php:299
msgid "Read-only"
msgstr ""
msgstr "Lecture seule"
#: lib/applicationeditform.php:317
msgid "Read-write"
......@@ -4760,6 +4759,8 @@ msgstr ""
#: lib/applicationeditform.php:318
msgid "Default access for this application: read-only, or read-write"
msgstr ""
"Accès par défaut pour cette application : en lecture seule ou en lecture-"
"écriture"
#: lib/applicationlist.php:154
#, fuzzy
......
This diff is collapsed.
......@@ -11,12 +11,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-01-15 19:15+0000\n"
"PO-Revision-Date: 2010-01-15 19:17:22+0000\n"
"POT-Creation-Date: 2010-01-18 23:16+0000\n"
"PO-Revision-Date: 2010-01-18 23:18:49+0000\n"
"Language-Team: Japanese\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: MediaWiki 1.16alpha (r61101); Translate extension (2010-01-04)\n"
"X-Generator: MediaWiki 1.16alpha (r61218); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ja\n"
"X-Message-Group: out-statusnet\n"
......@@ -54,9 +54,9 @@ msgid "No such user."
msgstr "そのような利用者はいません。"
#: actions/all.php:84
#, fuzzy, php-format
#, php-format
msgid "%1$s and friends, page %2$d"
msgstr "%1$s ブロックされたプロファイル、ページ %2$d"
msgstr "%1$s と友人、ページ %2$d"
#: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
......@@ -4358,12 +4358,12 @@ msgstr "あなたはこのサイトでつぶやきを投稿するのが禁止さ
msgid "Problem saving notice."
msgstr "つぶやきを保存する際に問題が発生しました。"
#: classes/Notice.php:1052
#: classes/Notice.php:1059
#, php-format
msgid "DB error inserting reply: %s"
msgstr "返信を追加する際にデータベースエラー : %s"
#: classes/Notice.php:1423
#: classes/Notice.php:1441
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
......
......@@ -10,11 +10,11 @@ msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-01-15 19:15+0000\n"
"PO-Revision-Date: 2010-01-15 19:17:31+0000\n"
"PO-Revision-Date: 2010-01-16 17:52:38+0000\n"
"Language-Team: Macedonian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: MediaWiki 1.16alpha (r61101); Translate extension (2010-01-04)\n"
"X-Generator: MediaWiki 1.16alpha (r61138); Translate extension (2010-01-04)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: mk\n"
"X-Message-Group: out-statusnet\n"
......@@ -52,9 +52,9 @@ msgid "No such user."
msgstr "Нема таков корисник."
#: actions/all.php:84
#, fuzzy, php-format
#, php-format
msgid "%1$s and friends, page %2$d"
msgstr "%1$s блокирани профили, стр. %2$d"
msgstr "%1$s и пријателите, стр. %2$d"
#: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
......
......@@ -11,11 +11,11 @@ msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-01-15 19:15+0000\n"
"PO-Revision-Date: 2010-01-15 19:17:42+0000\n"
"PO-Revision-Date: 2010-01-16 17:52:50+0000\n"
"Language-Team: Dutch\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: MediaWiki 1.16alpha (r61101); Translate extension (2010-01-04)\n"
"X-Generator: MediaWiki 1.16alpha (r61138); Translate extension (2010-01-04)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: nl\n"
"X-Message-Group: out-statusnet\n"
......@@ -53,9 +53,9 @@ msgid "No such user."
msgstr "Onbekende gebruiker."
#: actions/all.php:84
#, fuzzy, php-format
#, php-format
msgid "%1$s and friends, page %2$d"
msgstr "%1$s geblokkeerde profielen, pagina %2$d"
msgstr "%1$s en vrienden, pagina %2$d"
#: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
......
......@@ -11,7 +11,7 @@ msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-01-15 19:15+0000\n"
"PO-Revision-Date: 2010-01-15 19:17:45+0000\n"
"PO-Revision-Date: 2010-01-16 17:52:53+0000\n"
"Last-Translator: Piotr Drąg <piotrdrag@gmail.com>\n"
"Language-Team: Polish <pl@li.org>\n"
"MIME-Version: 1.0\n"
......@@ -19,7 +19,7 @@ msgstr ""
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
"|| n%100>=20) ? 1 : 2);\n"
"X-Generator: MediaWiki 1.16alpha (r61101); Translate extension (2010-01-04)\n"
"X-Generator: MediaWiki 1.16alpha (r61138); Translate extension (2010-01-04)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: pl\n"
"X-Message-Group: out-statusnet\n"
......@@ -56,9 +56,9 @@ msgid "No such user."
msgstr "Brak takiego użytkownika."
#: actions/all.php:84
#, fuzzy, php-format
#, php-format
msgid "%1$s and friends, page %2$d"
msgstr "%1$s zablokowane profile, strona %2$d"
msgstr "%1$s i przyjaciele, strona %2$d"
#: actions/all.php:86 actions/all.php:167 actions/allrss.php:115
#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
......@@ -4684,7 +4684,6 @@ msgstr ""
"Domyślny dostęp do tej aplikacji: tylko do odczytu lub do odczytu i zapisu"
#: lib/applicationlist.php:154
#, fuzzy
msgid "Revoke"
msgstr "Unieważnij"
......
This diff is collapsed.
......@@ -2,6 +2,7 @@
#
# Author@translatewiki.net: Brion
# Author@translatewiki.net: Lockal
# Author@translatewiki.net: Rubin
# Author@translatewiki.net: Александр Сигачёв
# --
# This file is distributed under the same license as the StatusNet package.
......@@ -10,12 +11,12 @@ msgid ""
msgstr ""
"Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-01-15 19:15+0000\n"
"PO-Revision-Date: 2010-01-15 19:17:57+0000\n"
"POT-Creation-Date: 2010-01-18 23:16+0000\n"
"PO-Revision-Date: 2010-01-18 23:19:49+0000\n"
"Language-Team: Russian\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: MediaWiki 1.16alpha (r61101); Translate extension (2010-01-04)\n"
"X-Generator: MediaWiki 1.16alpha (r61218); Translate extension (2010-01-16)\n"
"X-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ru\n"
"X-Message-Group: out-statusnet\n"
......@@ -453,7 +454,6 @@ msgid "There was a problem with your session token. Try again, please."
msgstr "Проблема с Вашей сессией. Попробуйте ещё раз, пожалуйста."
#: actions/apioauthauthorize.php:146
#, fuzzy
msgid "Invalid nickname / password!"
msgstr "Неверное имя или пароль."
......@@ -4406,12 +4406,12 @@ msgstr "Вам запрещено поститься на этом сайте (
msgid "Problem saving notice."
msgstr "Проблемы с сохранением записи."
#: classes/Notice.php:1052
#: classes/Notice.php:1059
#, php-format
msgid "DB error inserting reply: %s"
msgstr "Ошибка баз данных при вставке ответа для %s"
#: classes/Notice.php:1423
#: classes/Notice.php:1441
#, php-format
msgid "RT @%1$s %2$s"
msgstr "RT @%1$s %2$s"
......
......@@ -8,7 +8,7 @@ msgid ""
msgstr ""
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2010-01-15 19:15+0000\n"
"POT-Creation-Date: 2010-01-18 23:16+0000\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
......@@ -4102,12 +4102,12 @@ msgstr ""
msgid "Problem saving notice."
msgstr ""
#: classes/Notice.php:1052
#: classes/Notice.php:1059
#, php-format
msgid "DB error inserting reply: %s"
msgstr ""
#: classes/Notice.php:1423
#: classes/Notice.php:1441
#, php-format
msgid "RT @%1$s %2$s"
msgstr ""
......
This diff is collapsed.
This diff is collapsed.
This diff is collapsed.
......@@ -356,8 +356,6 @@ class MobileProfilePlugin extends WAP20Plugin
$contentLimit = Notice::maxContent();
$form->out->inlineScript('maxLength = ' . $contentLimit . ';');
if ($contentLimit > 0) {
$form->out->element('div', array('id' => 'notice_text-count'),
$contentLimit);
......
......@@ -179,10 +179,12 @@ padding-bottom:4px;
}
.notice div.entry-content {
margin-left:0;
width:62.5%;
width:75%;
max-width:100%;
min-width:0;
}
.notice-options {
width:34%;
width:50px;
margin-right:1%;
}
......@@ -190,12 +192,29 @@ margin-right:1%;
width:16px;
height:16px;
}
.notice-options a,
.notice-options input {
.notice .notice-options a,
.notice .notice-options input {
box-shadow:none;
-moz-box-shadow:none;
-webkit-box-shadow:none;
}
.notice .notice-options a,
.notice .notice-options form {
margin:-4px 0 0 0;
}
.notice .notice-options .notice_repeat,
.notice .notice-options .notice_delete {
margin-top:18px;
}
.notice .notice-options .notice_reply,
.notice .notice-options .notice_repeat {
margin-left:18px;
}
.notice .notice-options .notice_delete {
float:left;
}
.entity_profile {
width:auto;
......
Several example plugins are included in the plugins/ directory. You
can enable a plugin with the following line in config.php:
addPlugin('Example', array('param1' => 'value1',
'param2' => 'value2'));
This will look for and load files named 'ExamplePlugin.php' or
'Example/ExamplePlugin.php' either in the plugins/ directory (for
plugins that ship with StatusNet) or in the local/ directory (for
plugins you write yourself or that you get from somewhere else) or
local/plugins/.
Plugins are documented in their own directories.
Additional information on using and developing plugins can be found
on the StatusNet wiki:
http://status.net/wiki/Plugins
http://status.net/wiki/Plugin_development
......@@ -31,8 +31,6 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
exit(1);
}
define('RECAPTCHA', '0.2');
require_once(INSTALLDIR.'/plugins/Recaptcha/recaptchalib.php');
class RecaptchaPlugin extends Plugin
......@@ -88,4 +86,16 @@ class RecaptchaPlugin extends Plugin
return false;
}
}
function onPluginVersion(&$versions)
{
$versions[] = array('name' => 'Recaptcha',
'version' => STATUSNET_VERSION,
'author' => 'Eric Helgeson',
'homepage' => 'http://status.net/wiki/Plugin:Recaptcha',
'rawdescription' =>
_m('Uses <a href="http://recaptcha.org/">Recaptcha</a> service to add a '.
'captcha to the registration page.'));
return true;
}
}
......@@ -53,7 +53,17 @@ if (have_option('i', 'id')) {
if (!empty($user)) {
if (empty($user->email)) {
print "No email registered for user '$user->nickname'\n";
# Check for unconfirmed emails
$unconfirmed_email = new Confirm_address();
$unconfirmed_email->user_id = $user->id;
$unconfirmed_email->address_type = 'email';
$unconfirmed_email->find(true);
if (empty($unconfirmed_email->address)) {
print "No email registered for user '$user->nickname'\n";
} else {
print "Unconfirmed Adress: $unconfirmed_email->address\n";
}
} else {
print "$user->email\n";
}
......@@ -65,7 +75,18 @@ if (have_option('e', 'email')) {
$user->email = get_option_value('e', 'email');
$user->find(false);
if (!$user->fetch()) {
print "No users with email $user->email\n";
# Check unconfirmed emails
$unconfirmed_email = new Confirm_address();
$unconfirmed_email->address = $user->email;
$unconfirmed_email->address_type = 'email';
$unconfirmed_email->find(true);
if (empty($unconfirmed_email->user_id)) {
print "No users with email $user->email\n";
} else {
$user=User::staticGet('id', $unconfirmed_email->user_id);
print "Unconfirmed Address: $user->id $user->nickname\n";
}
exit(0);
}
do {
......
......@@ -73,7 +73,7 @@ input.checkbox,
input.radio {
position:relative;
top:2px;
left:0;
left:auto;
border:0;
}
......@@ -568,7 +568,8 @@ float:right;
font-size:0.8em;
}
.form_notice #notice_data-geo_wrap label {
.form_notice #notice_data-geo_wrap label,
.form_notice #notice_data-geo_wrap input {
position:absolute;
top:25px;
right:4px;
......@@ -579,7 +580,7 @@ height:16px;
display:block;
}
.form_notice #notice_data-geo_wrap input {
display:none;
visibility:hidden;
}
.form_notice #notice_data-geo_wrap label {
font-weight:normal;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment