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

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 ...@@ -145,7 +145,7 @@ class ApiGroupJoinAction extends ApiAuthAction
switch($this->format) { switch($this->format) {
case 'xml': case 'xml':
$this->show_single_xml_group($this->group); $this->showSingleXmlGroup($this->group);
break; break;
case 'json': case 'json':
$this->showSingleJsonGroup($this->group); $this->showSingleJsonGroup($this->group);
......
...@@ -131,7 +131,7 @@ class ApiGroupLeaveAction extends ApiAuthAction ...@@ -131,7 +131,7 @@ class ApiGroupLeaveAction extends ApiAuthAction
switch($this->format) { switch($this->format) {
case 'xml': case 'xml':
$this->show_single_xml_group($this->group); $this->showSingleXmlGroup($this->group);
break; break;
case 'json': case 'json':
$this->showSingleJsonGroup($this->group); $this->showSingleJsonGroup($this->group);
......
...@@ -289,7 +289,7 @@ class DesignadminpanelAction extends AdminPanelAction ...@@ -289,7 +289,7 @@ class DesignadminpanelAction extends AdminPanelAction
function showStylesheets() function showStylesheets()
{ {
parent::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 ...@@ -130,7 +130,7 @@ class EmailsettingsAction extends AccountSettingsAction
if (common_config('emailpost', 'enabled') && $user->email) { if (common_config('emailpost', 'enabled') && $user->email) {
$this->elementStart('fieldset', array('id' => 'settings_email_incoming')); $this->elementStart('fieldset', array('id' => 'settings_email_incoming'));
$this->element('legend',_('Incoming email')); $this->element('legend', null, _('Incoming email'));
if ($user->incomingemail) { if ($user->incomingemail) {
$this->elementStart('p'); $this->elementStart('p');
$this->element('span', 'address', $user->incomingemail); $this->element('span', 'address', $user->incomingemail);
......
...@@ -16,17 +16,17 @@ ...@@ -16,17 +16,17 @@
height: 101px; height: 101px;
} }
.farbtastic .wheel { .farbtastic .wheel {
background: url(../../../js/farbtastic/wheel.png) no-repeat; background: url(wheel.png) no-repeat;
width: 195px; width: 195px;
height: 195px; height: 195px;
} }
.farbtastic .overlay { .farbtastic .overlay {
background: url(../../../js/farbtastic/mask.png) no-repeat; background: url(mask.png) no-repeat;
} }
.farbtastic .marker { .farbtastic .marker {
width: 17px; width: 17px;
height: 17px; height: 17px;
margin: -8px 0 0 -8px; margin: -8px 0 0 -8px;
overflow: hidden; 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 // 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 // -- BEGIN GEARS_INIT
(function() { (function() {
...@@ -23,8 +23,7 @@ if (typeof navigator.geolocation == "undefined" || navigator.geolocation.shim ) ...@@ -23,8 +23,7 @@ if (typeof navigator.geolocation == "undefined" || navigator.geolocation.shim )
} }
} catch (e) { } catch (e) {
// Safari // Safari
if ((typeof navigator.mimeTypes != 'undefined') if ((typeof navigator.mimeTypes != 'undefined') && navigator.mimeTypes["application/x-googlegears"]) {
&& navigator.mimeTypes["application/x-googlegears"]) {
factory = document.createElement("object"); factory = document.createElement("object");
factory.style.display = "none"; factory.style.display = "none";
factory.width = 0; factory.width = 0;
...@@ -64,8 +63,8 @@ var GearsGeoLocation = (function() { ...@@ -64,8 +63,8 @@ var GearsGeoLocation = (function() {
return function(position) { return function(position) {
callback(position); callback(position);
self.lastPosition = position; self.lastPosition = position;
} };
} };
// -- PUBLIC // -- PUBLIC
return { return {
...@@ -112,7 +111,7 @@ var AjaxGeoLocation = (function() { ...@@ -112,7 +111,7 @@ var AjaxGeoLocation = (function() {
var queue = []; var queue = [];
var addLocationQueue = function(callback) { var addLocationQueue = function(callback) {
queue.push(callback); queue.push(callback);
} };
var runLocationQueue = function() { var runLocationQueue = function() {
if (hasGoogleLoader()) { if (hasGoogleLoader()) {
...@@ -121,18 +120,18 @@ var AjaxGeoLocation = (function() { ...@@ -121,18 +120,18 @@ var AjaxGeoLocation = (function() {
call(); call();
} }
} }
} };
window['_google_loader_apiLoaded'] = function() { window['_google_loader_apiLoaded'] = function() {
runLocationQueue(); runLocationQueue();
} };
var hasGoogleLoader = function() { var hasGoogleLoader = function() {
return (window['google'] && google['loader']); return (window['google'] && google['loader']);
} };
var checkGoogleLoader = function(callback) { var checkGoogleLoader = function(callback) {
if (hasGoogleLoader()) return true; if (hasGoogleLoader()) { return true; }
addLocationQueue(callback); addLocationQueue(callback);
...@@ -155,7 +154,7 @@ var AjaxGeoLocation = (function() { ...@@ -155,7 +154,7 @@ var AjaxGeoLocation = (function() {
var self = this; var self = this;
if (!checkGoogleLoader(function() { if (!checkGoogleLoader(function() {
self.getCurrentPosition(successCallback, errorCallback, options); self.getCurrentPosition(successCallback, errorCallback, options);
})) return; })) { return; }
if (google.loader.ClientLocation) { if (google.loader.ClientLocation) {
var cl = google.loader.ClientLocation; var cl = google.loader.ClientLocation;
...@@ -168,7 +167,7 @@ var AjaxGeoLocation = (function() { ...@@ -168,7 +167,7 @@ var AjaxGeoLocation = (function() {
accuracy: 43000, // same as Gears accuracy over wifi? accuracy: 43000, // same as Gears accuracy over wifi?
altitudeAccuracy: null, altitudeAccuracy: null,
heading: null, heading: null,
speed: null, speed: null
}, },
// extra info that is outside of the bounds of the core API // extra info that is outside of the bounds of the core API
address: { address: {
...@@ -215,3 +214,4 @@ var AjaxGeoLocation = (function() { ...@@ -215,3 +214,4 @@ var AjaxGeoLocation = (function() {
navigator.geolocation = (window.google && google.gears) ? GearsGeoLocation() : AjaxGeoLocation(); navigator.geolocation = (window.google && google.gears) ? GearsGeoLocation() : AjaxGeoLocation();
})(); })();
}
...@@ -509,7 +509,7 @@ var SN = { // StatusNet ...@@ -509,7 +509,7 @@ var SN = { // StatusNet
} }
if (typeof(location.name) == 'undefined') { if (typeof(location.name) == 'undefined') {
NLN_text = position.coords.latitude + ';' + position.coords.longitude; NLN_text = data.lat + ';' + data.lon;
} }
else { else {
NLN_text = location.name; NLN_text = location.name;
...@@ -525,13 +525,13 @@ var SN = { // StatusNet ...@@ -525,13 +525,13 @@ var SN = { // StatusNet
$('#'+SN.C.S.NoticeDataGeo).attr('checked', true); $('#'+SN.C.S.NoticeDataGeo).attr('checked', true);
var cookieValue = { var cookieValue = {
'NLat': data.lat, NLat: data.lat,
'NLon': data.lon, NLon: data.lon,
'NLNS': lns, NLNS: lns,
'NLID': lid, NLID: lid,
'NLN': NLN_text, NLN: NLN_text,
'NLNU': location.url, NLNU: location.url,
'NDG': true NDG: true
}; };
$.cookie(SN.C.S.NoticeDataGeoCookie, JSON.stringify(cookieValue)); $.cookie(SN.C.S.NoticeDataGeoCookie, JSON.stringify(cookieValue));
}); });
...@@ -566,9 +566,9 @@ var SN = { // StatusNet ...@@ -566,9 +566,9 @@ var SN = { // StatusNet
$('#'+SN.C.S.NoticeLon).val(position.coords.longitude); $('#'+SN.C.S.NoticeLon).val(position.coords.longitude);
var data = { var data = {
'lat': position.coords.latitude, lat: position.coords.latitude,
'lon': position.coords.longitude, lon: position.coords.longitude,
'token': $('#token').val() token: $('#token').val()
}; };
getJSONgeocodeURL(geocodeURL, data); getJSONgeocodeURL(geocodeURL, data);
...@@ -593,9 +593,9 @@ var SN = { // StatusNet ...@@ -593,9 +593,9 @@ var SN = { // StatusNet
else { else {
if (NLat.length > 0 && NLon.length > 0) { if (NLat.length > 0 && NLon.length > 0) {
var data = { var data = {
'lat': NLat, lat: NLat,
'lon': NLon, lon: NLon,
'token': $('#token').val() token: $('#token').val()
}; };
getJSONgeocodeURL(geocodeURL, data); getJSONgeocodeURL(geocodeURL, data);
...@@ -624,8 +624,6 @@ var SN = { // StatusNet ...@@ -624,8 +624,6 @@ var SN = { // StatusNet
else { else {
removeNoticeDataGeo(); removeNoticeDataGeo();
} }
$('#'+SN.C.S.NoticeDataText).focus();
}).change(); }).change();
} }
}, },
......
...@@ -314,7 +314,7 @@ class DesignSettingsAction extends AccountSettingsAction ...@@ -314,7 +314,7 @@ class DesignSettingsAction extends AccountSettingsAction
function showStylesheets() function showStylesheets()
{ {
parent::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 ...@@ -63,7 +63,7 @@ class StatusNet
} }
} }
if (!class_exists($pluginclass)) { if (!class_exists($pluginclass)) {
throw new ServerException(500, "Plugin $name not found."); throw new ServerException("Plugin $name not found.", 500);
} }
} }
......
...@@ -9,12 +9,12 @@ msgid "" ...@@ -9,12 +9,12 @@ msgid ""
msgstr "" msgstr ""
"Project-Id-Version: StatusNet\n" "Project-Id-Version: StatusNet\n"
"Report-Msgid-Bugs-To: \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: 2010-01-15 19:15:48+0000\n" "PO-Revision-Date: 2010-01-18 23:17:05+0000\n"
"Language-Team: Arabic\n" "Language-Team: Arabic\n"
"Content-Type: text/plain; charset=UTF-8\n" "Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\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-Translation-Project: translatewiki.net at http://translatewiki.net\n"
"X-Language-Code: ar\n" "X-Language-Code: ar\n"
"X-Message-Group: out-statusnet\n" "X-Message-Group: out-statusnet\n"
...@@ -53,9 +53,9 @@ msgid "No such user." ...@@ -53,9 +53,9 @@ msgid "No such user."
msgstr "لا مستخدم كهذا." msgstr "لا مستخدم كهذا."
#: actions/all.php:84 #: actions/all.php:84
#, fuzzy, php-format #, php-format
msgid "%1$s and friends, page %2$d" 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/all.php:86 actions/all.php:167 actions/allrss.php:115
#: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115 #: actions/apitimelinefriends.php:114 actions/apitimelinehome.php:115
...@@ -415,7 +415,7 @@ msgstr "مجموعات %s" ...@@ -415,7 +415,7 @@ msgstr "مجموعات %s"
#: actions/apioauthauthorize.php:108 actions/apioauthauthorize.php:114 #: actions/apioauthauthorize.php:108 actions/apioauthauthorize.php:114
msgid "Bad request." msgid "Bad request."
msgstr "" msgstr "طلب سيء."
#: actions/apioauthauthorize.php:134 actions/avatarsettings.php:268 #: actions/apioauthauthorize.php:134 actions/avatarsettings.php:268
#: actions/deletenotice.php:157 actions/disfavor.php:74 #: actions/deletenotice.php:157 actions/disfavor.php:74
...@@ -436,19 +436,16 @@ msgid "There was a problem with your session token. Try again, please." ...@@ -436,19 +436,16 @@ msgid "There was a problem with your session token. Try again, please."
msgstr "" msgstr ""
#: actions/apioauthauthorize.php:146 #: actions/apioauthauthorize.php:146
#, fuzzy
msgid "Invalid nickname / password!" msgid "Invalid nickname / password!"
msgstr "اسم مستخدم أو كلمة سر غير صالحة." msgstr "اسم/كلمة سر غير صحيحة!"
#: actions/apioauthauthorize.php:170 #: actions/apioauthauthorize.php:170
#, fuzzy
msgid "DB error deleting OAuth app user." msgid "DB error deleting OAuth app user."
msgstr "خطأ أثناء ضبط المستخدم." msgstr "خطأ قاعدة البيانات أثناء حذف المستخدم OAuth app"
#: actions/apioauthauthorize.php:196 #: actions/apioauthauthorize.php:196
#, fuzzy
msgid "DB error inserting OAuth app user." msgid "DB error inserting OAuth app user."
msgstr "خطأ في إدراج الأفتار" msgstr "خطأ قاعدة البيانات أثناء إدخال المستخدم OAuth app"
#: actions/apioauthauthorize.php:231 #: actions/apioauthauthorize.php:231
#, php-format #, php-format
...@@ -496,14 +493,12 @@ msgid "Password" ...@@ -496,14 +493,12 @@ msgid "Password"
msgstr "كلمة السر" msgstr "كلمة السر"
#: actions/apioauthauthorize.php:338 #: actions/apioauthauthorize.php:338
#, fuzzy
msgid "Deny" msgid "Deny"
msgstr "التصميم" msgstr "ارفض"
#: actions/apioauthauthorize.php:344 #: actions/apioauthauthorize.php:344
#, fuzzy
msgid "Allow" msgid "Allow"
msgstr "الكل" msgstr "اسمح"
#: actions/apioauthauthorize.php:361 #: actions/apioauthauthorize.php:361
msgid "Allow or deny access to your account information." msgid "Allow or deny access to your account information."
...@@ -536,7 +531,7 @@ msgstr "حُذِفت الحالة." ...@@ -536,7 +531,7 @@ msgstr "حُذِفت الحالة."
#: actions/apistatusesshow.php:144 #: actions/apistatusesshow.php:144
msgid "No status with that ID found." msgid "No status with that ID found."
msgstr "" msgstr "لا حالة وُجدت بهذه الهوية."
#: actions/apistatusesupdate.php:162 actions/newnotice.php:155 #: actions/apistatusesupdate.php:162 actions/newnotice.php:155
#: lib/mailhandler.php:60 #: lib/mailhandler.php:60
...@@ -825,9 +820,8 @@ msgid "Couldn't delete email confirmation." ...@@ -825,9 +820,8 @@ msgid "Couldn't delete email confirmation."
msgstr "تعذّر حذف تأكيد البريد الإلكتروني." msgstr "تعذّر حذف تأكيد البريد الإلكتروني."
#: actions/confirmaddress.php:144 #: actions/confirmaddress.php:144
#, fuzzy
msgid "Confirm address" msgid "Confirm address"
msgstr "عنوان التأكيد" msgstr "أكد العنوان"
#: actions/confirmaddress.php:159 #: actions/confirmaddress.php:159
#, php-format #, php-format
...@@ -1032,23 +1026,20 @@ msgstr "لا مستند كهذا." ...@@ -1032,23 +1026,20 @@ msgstr "لا مستند كهذا."
#: actions/editapplication.php:54 lib/applicationeditform.php:136 #: actions/editapplication.php:54 lib/applicationeditform.php:136
msgid "Edit application" msgid "Edit application"
msgstr "" msgstr "عدّل التطبيق"
#: actions/editapplication.php:66 #: actions/editapplication.php:66
#, fuzzy
msgid "You must be logged in to edit an application." msgid "You must be logged in to edit an application."
msgstr "يجب أن تلج لتُعدّل المجموعات." msgstr "يجب أن تكون مسجل الدخول لتعدل تطبيقا."
#: actions/editapplication.php:77 actions/showapplication.php:94 #: actions/editapplication.php:77 actions/showapplication.php:94
#, fuzzy
msgid "You are not the owner of this application." msgid "You are not the owner of this application."
msgstr "لست عضوا في تلك المجموعة." msgstr "أنت لست مالك هذا التطبيق."
#: actions/editapplication.php:81 actions/oauthconnectionssettings.php:163 #: actions/editapplication.php:81 actions/oauthconnectionssettings.php:163
#: actions/showapplication.php:87 #: actions/showapplication.php:87
#, fuzzy
msgid "No such application." msgid "No such application."
msgstr "لا إشعار كهذا." msgstr "لا تطبيق كهذا."
#: actions/editapplication.php:127 actions/newapplication.php:110 #: actions/editapplication.php:127 actions/newapplication.php:110
#: actions/showapplication.php:118 lib/action.php:1167 #: actions/showapplication.php:118 lib/action.php:1167
...@@ -1056,46 +1047,40 @@ msgid "There was a problem with your session token." ...@@ -1056,46 +1047,40 @@ msgid "There was a problem with your session token."
msgstr "" msgstr ""
#: actions/editapplication.php:161 #: actions/editapplication.php:161
#, fuzzy
msgid "Use this form to edit your application." msgid "Use this form to edit your application."
msgstr "استخدم هذا النموذج لتعديل المجموعة." msgstr "استخدم هذا النموذج لتعدل تطبيقك."
#: actions/editapplication.php:177 actions/newapplication.php:159 #: actions/editapplication.php:177 actions/newapplication.php:159
#, fuzzy
msgid "Name is required." msgid "Name is required."
msgstr "نفس كلمة السر أعلاه. مطلوب." msgstr "الاسم مطلوب."
#: actions/editapplication.php:180 actions/newapplication.php:162 #: actions/editapplication.php:180 actions/newapplication.php:162
#, fuzzy
msgid "Name is too long (max 255 chars)." msgid "Name is too long (max 255 chars)."
msgstr "الاسم الكامل طويل جدا (الأقصى 255 حرفًا)" msgstr "الاسم طويل جدا (الأقصى 255 حرفا)."
#: actions/editapplication.php:183 actions/newapplication.php:165 #: actions/editapplication.php:183 actions/newapplication.php:165
#, fuzzy
msgid "Description is required." msgid "Description is required."
msgstr "الوصف" msgstr "الوصف مطلوب."
#: actions/editapplication.php:191 #: actions/editapplication.php:191
msgid "Source URL is too long." msgid "Source URL is too long."
msgstr "" msgstr ""
#: actions/editapplication.php:197 actions/newapplication.php:182 #: actions/editapplication.php:197 actions/newapplication.php:182
#, fuzzy
msgid "Source URL is not valid." msgid "Source URL is not valid."
msgstr "الصفحة الرئيسية ليست عنونًا صالحًا." msgstr "مسار المصدر ليس صحيحا."
#: actions/editapplication.php:200 actions/newapplication.php:185 #: actions/editapplication.php:200 actions/newapplication.php:185
msgid "Organization is required." msgid "Organization is required."
msgstr "" msgstr "المنظمة مطلوبة."
#: actions/editapplication.php:203 actions/newapplication.php:188 #: actions/editapplication.php:203 actions/newapplication.php:188
#, fuzzy
msgid "Organization is too long (max 255 chars)." msgid "Organization is too long (max 255 chars)."
msgstr "الاسم الكامل طويل جدا (الأقصى 255 حرفًا)" msgstr "المنظمة طويلة جدا (الأقصى 255 حرفا)."
#: actions/editapplication.php:206 actions/newapplication.php:191 #: actions/editapplication.php:206 actions/newapplication.php:191
msgid "Organization homepage is required." msgid "Organization homepage is required."
msgstr "" msgstr "صفحة المنظمة الرئيسية مطلوبة."
#: actions/editapplication.php:215 actions/newapplication.php:203 #: actions/editapplication.php:215 actions/newapplication.php:203
msgid "Callback is too long." msgid "Callback is too long."
...@@ -1106,9 +1091,8 @@ msgid "Callback URL is not valid." ...@@ -1106,9 +1091,8 @@ msgid "Callback URL is not valid."
msgstr "" msgstr ""
#: actions/editapplication.php:255 #: actions/editapplication.php:255
#, fuzzy
msgid "Could not update application." msgid "Could not update application."
msgstr "تعذر تحديث المجموعة." msgstr "لم يمكن تحديث التطبيق."
#: actions/editgroup.php:56 #: actions/editgroup.php:56
#, php-format #, php-format
...@@ -1305,7 +1289,7 @@ msgstr "أزيل هذا العنوان." ...@@ -1305,7 +1289,7 @@ msgstr "أزيل هذا العنوان."
#: actions/emailsettings.php:446 actions/smssettings.php:518 #: actions/emailsettings.php:446 actions/smssettings.php:518
msgid "No incoming email address." msgid "No incoming email address."
msgstr "" msgstr "لا عنوان بريد إلكتروني وارد."
#: actions/emailsettings.php:456 actions/emailsettings.php:478 #: actions/emailsettings.php:456 actions/emailsettings.php:478
#: actions/smssettings.php:528 actions/smssettings.php:552 #: actions/smssettings.php:528 actions/smssettings.php:552
...@@ -1411,7 +1395,7 @@ msgstr "المستخدم الذي تستمع إليه غير موجود." ...@@ -1411,7 +1395,7 @@ msgstr "المستخدم الذي تستمع إليه غير موجود."
#: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59 #: actions/finishremotesubscribe.php:87 actions/remotesubscribe.php:59
msgid "You can use the local subscription!" msgid "You can use the local subscription!"
msgstr "" msgstr "تستطيع استخدام الاشتراك المحلي!"
#: actions/finishremotesubscribe.php:99