diff options
Diffstat (limited to 'lib')
-rw-r--r-- | lib/common.php | 2 | ||||
-rw-r--r-- | lib/designsettings.php | 2 | ||||
-rw-r--r-- | lib/imagefile.php | 4 | ||||
-rw-r--r-- | lib/language.php | 1 | ||||
-rw-r--r-- | lib/noticelist.php | 28 | ||||
-rw-r--r-- | lib/popularnoticesection.php | 5 | ||||
-rw-r--r-- | lib/rssaction.php | 12 | ||||
-rw-r--r-- | lib/searchaction.php | 4 | ||||
-rw-r--r-- | lib/searchgroupnav.php | 4 | ||||
-rw-r--r-- | lib/userprofile.php | 57 |
10 files changed, 76 insertions, 43 deletions
diff --git a/lib/common.php b/lib/common.php index 9b3ded037..732c22bfd 100644 --- a/lib/common.php +++ b/lib/common.php @@ -22,7 +22,7 @@ if (!defined('STATUSNET') && !defined('LACONICA')) { exit(1); } //exit with 200 response, if this is checking fancy from the installer if (isset($_REQUEST['p']) && $_REQUEST['p'] == 'check-fancy') { exit; } -define('STATUSNET_VERSION', '0.9.0rc1'); +define('STATUSNET_VERSION', '0.9.0dev'); define('LACONICA_VERSION', STATUSNET_VERSION); // compatibility define('STATUSNET_CODENAME', 'Stand'); diff --git a/lib/designsettings.php b/lib/designsettings.php index 5ce9ddeda..99f44b5b7 100644 --- a/lib/designsettings.php +++ b/lib/designsettings.php @@ -107,7 +107,7 @@ class DesignSettingsAction extends AccountSettingsAction 'type' => 'file', 'id' => 'design_background-image_file')); $this->element('p', 'form_guide', _('You can upload your personal ' . - 'background image. The maximum file size is 2Mb.')); + 'background image. The maximum file size is 2MB.')); $this->element('input', array('name' => 'MAX_FILE_SIZE', 'type' => 'hidden', 'id' => 'MAX_FILE_SIZE', diff --git a/lib/imagefile.php b/lib/imagefile.php index cf1668f20..6bc8e599b 100644 --- a/lib/imagefile.php +++ b/lib/imagefile.php @@ -214,9 +214,9 @@ class ImageFile $value = ImageFile::maxFileSizeInt(); if ($value > 1024 * 1024) { - return ($value/(1024*1024)).'Mb'; + return ($value/(1024*1024)) . _('MB'); } else if ($value > 1024) { - return ($value/(1024)).'kB'; + return ($value/(1024)) . _('kB'); } else { return $value; } diff --git a/lib/language.php b/lib/language.php index a99bf89e3..4fc45bafe 100644 --- a/lib/language.php +++ b/lib/language.php @@ -172,6 +172,7 @@ function get_all_languages() { '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'), + 'hsb' => array('q' => 0.8, 'lang' => 'hsb', 'name' => 'Upper Sorbian', 'direction' => 'ltr'), 'is' => array('q' => 0.1, 'lang' => 'is', 'name' => 'Icelandic', 'direction' => 'ltr'), 'it' => array('q' => 1, 'lang' => 'it', 'name' => 'Italian', 'direction' => 'ltr'), 'jp' => array('q' => 0.5, 'lang' => 'ja', 'name' => 'Japanese', 'direction' => 'ltr'), diff --git a/lib/noticelist.php b/lib/noticelist.php index 5877827ff..21cec528f 100644 --- a/lib/noticelist.php +++ b/lib/noticelist.php @@ -392,15 +392,19 @@ class NoticeListItem extends Widget $name = $location->getName(); - if (empty($name)) { - // XXX: Could be a translation issue. Fall back to... something? - return; - } - $lat = $this->notice->lat; $lon = $this->notice->lon; $latlon = (!empty($lat) && !empty($lon)) ? $lat.';'.$lon : ''; + if (empty($name)) { + $latdms = $this->decimalDegreesToDMS(abs($lat)); + $londms = $this->decimalDegreesToDMS(abs($lon)); + $name = sprintf( + _('%1$u°%2$u\'%3$u"%4$s %5$u°%6$u\'%7$u"%8$s'), + $latdms['deg'],$latdms['min'], $latdms['sec'],($lat>0?_('N'):_('S')), + $londms['deg'],$londms['min'], $londms['sec'],($lon>0?_('E'):_('W'))); + } + $url = $location->getUrl(); $this->out->elementStart('span', array('class' => 'location')); @@ -418,6 +422,20 @@ class NoticeListItem extends Widget $this->out->elementEnd('span'); } + function decimalDegreesToDMS($dec) + { + + $vars = explode(".",$dec); + $deg = $vars[0]; + $tempma = "0.".$vars[1]; + + $tempma = $tempma * 3600; + $min = floor($tempma / 60); + $sec = $tempma - ($min*60); + + return array("deg"=>$deg,"min"=>$min,"sec"=>$sec); + } + /** * Show the source of the notice * diff --git a/lib/popularnoticesection.php b/lib/popularnoticesection.php index 35b914a50..9fbc9d2dd 100644 --- a/lib/popularnoticesection.php +++ b/lib/popularnoticesection.php @@ -68,8 +68,9 @@ class PopularNoticeSection extends NoticeSection } $qry .= ' GROUP BY notice.id,notice.profile_id,notice.content,notice.uri,' . 'notice.rendered,notice.url,notice.created,notice.modified,' . - 'notice.reply_to,notice.is_local,notice.source,notice.conversation ' . - 'ORDER BY weight DESC'; + 'notice.reply_to,notice.is_local,notice.source,notice.conversation, ' . + 'notice.lat,notice.lon,location_id,location_ns' . + ' ORDER BY weight DESC'; $offset = 0; $limit = NOTICES_PER_SECTION + 1; diff --git a/lib/rssaction.php b/lib/rssaction.php index 3b303f73e..d591c99ed 100644 --- a/lib/rssaction.php +++ b/lib/rssaction.php @@ -176,8 +176,10 @@ class Rss10Action extends Action $this->showChannel(); $this->showImage(); - foreach ($this->notices as $n) { - $this->showItem($n); + if (count($this->notices)) { + foreach ($this->notices as $n) { + $this->showItem($n); + } } $this->showCreators(); @@ -203,8 +205,10 @@ class Rss10Action extends Action $this->elementStart('items'); $this->elementStart('rdf:Seq'); - foreach ($this->notices as $notice) { - $this->element('rdf:li', array('rdf:resource' => $notice->uri)); + if (count($this->notices)) { + foreach ($this->notices as $notice) { + $this->element('rdf:li', array('rdf:resource' => $notice->uri)); + } } $this->elementEnd('rdf:Seq'); diff --git a/lib/searchaction.php b/lib/searchaction.php index 130b28ff5..bb71a2ba1 100644 --- a/lib/searchaction.php +++ b/lib/searchaction.php @@ -123,8 +123,8 @@ class SearchAction extends Action if (!common_config('site', 'fancy')) { $this->hidden('action', $this->trimmed('action')); } - $this->input('q', 'Keyword(s)', $q); - $this->submit('search', 'Search'); + $this->input('q', _('Keyword(s)'), $q); + $this->submit('search', _('Search')); $this->elementEnd('li'); $this->elementEnd('ul'); $this->elementEnd('fieldset'); diff --git a/lib/searchgroupnav.php b/lib/searchgroupnav.php index 677365ea9..e843dc096 100644 --- a/lib/searchgroupnav.php +++ b/lib/searchgroupnav.php @@ -79,9 +79,9 @@ class SearchGroupNav extends Widget } $this->out->menuItem(common_local_url('peoplesearch', $args), _('People'), _('Find people on this site'), $action_name == 'peoplesearch', 'nav_search_people'); - $this->out->menuItem(common_local_url('noticesearch', $args), _('Notice'), + $this->out->menuItem(common_local_url('noticesearch', $args), _('Notices'), _('Find content of notices'), $action_name == 'noticesearch', 'nav_search_notice'); - $this->out->menuItem(common_local_url('groupsearch', $args), _('Group'), + $this->out->menuItem(common_local_url('groupsearch', $args), _('Groups'), _('Find groups on this site'), $action_name == 'groupsearch', 'nav_search_group'); $this->action->elementEnd('ul'); } diff --git a/lib/userprofile.php b/lib/userprofile.php index ee205af85..07e575085 100644 --- a/lib/userprofile.php +++ b/lib/userprofile.php @@ -304,34 +304,43 @@ class UserProfile extends Widget } $this->out->elementEnd('li'); - if ($cur->hasRight(Right::SANDBOXUSER)) { - $this->out->elementStart('li', 'entity_sandbox'); - if ($this->user->isSandboxed()) { - $usf = new UnSandboxForm($this->out, $this->profile, $r2args); - $usf->show(); - } else { - $sf = new SandboxForm($this->out, $this->profile, $r2args); - $sf->show(); + if ($cur->hasRight(Right::SANDBOXUSER) || + $cur->hasRight(Right::SILENCEUSER) || + $cur->hasRight(Right::DELETEUSER)) { + $this->out->elementStart('li', 'entity_moderation'); + $this->out->element('p', null, _('Moderate')); + $this->out->elementStart('ul'); + if ($cur->hasRight(Right::SANDBOXUSER)) { + $this->out->elementStart('li', 'entity_sandbox'); + if ($this->user->isSandboxed()) { + $usf = new UnSandboxForm($this->out, $this->profile, $r2args); + $usf->show(); + } else { + $sf = new SandboxForm($this->out, $this->profile, $r2args); + $sf->show(); + } + $this->out->elementEnd('li'); } - $this->out->elementEnd('li'); - } - if ($cur->hasRight(Right::SILENCEUSER)) { - $this->out->elementStart('li', 'entity_silence'); - if ($this->user->isSilenced()) { - $usf = new UnSilenceForm($this->out, $this->profile, $r2args); - $usf->show(); - } else { - $sf = new SilenceForm($this->out, $this->profile, $r2args); - $sf->show(); + if ($cur->hasRight(Right::SILENCEUSER)) { + $this->out->elementStart('li', 'entity_silence'); + if ($this->user->isSilenced()) { + $usf = new UnSilenceForm($this->out, $this->profile, $r2args); + $usf->show(); + } else { + $sf = new SilenceForm($this->out, $this->profile, $r2args); + $sf->show(); + } + $this->out->elementEnd('li'); } - $this->out->elementEnd('li'); - } - if ($cur->hasRight(Right::DELETEUSER)) { - $this->out->elementStart('li', 'entity_delete'); - $df = new DeleteUserForm($this->out, $this->profile, $r2args); - $df->show(); + if ($cur->hasRight(Right::DELETEUSER)) { + $this->out->elementStart('li', 'entity_delete'); + $df = new DeleteUserForm($this->out, $this->profile, $r2args); + $df->show(); + $this->out->elementEnd('li'); + } + $this->out->elementEnd('ul'); $this->out->elementEnd('li'); } } |