GNUsocial/gnu-social
4
0
Fork 1
Code Issues Releases Wiki Activity

Use sprintf and gettext to output the DMS version of the location. More translator-friendly.

Browse Source
This commit is contained in:
Craig Andrews 2009-11-21 22:34:54 -05:00
parent 99604267d0
commit bdc0d2dc78
1 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/noticelist.php
View File

@ -397,7 +397,12 @@ class NoticeListItem extends Widget
$latlon = (!empty($lat) && !empty($lon)) ? $lat.';'.$lon : ''; $latlon = (!empty($lat) && !empty($lon)) ? $lat.';'.$lon : '';
if (empty($name)) { if (empty($name)) {
$name = $this->decimalDegreesToDMS(abs($lat)) . ($lat>0?'N ':'S ') . $this->decimalDegreesToDMS(abs($lon)) . ($lon>0?'E':'W'); $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(); $url = $location->getUrl();
@ -428,7 +433,6 @@ class NoticeListItem extends Widget
$min = floor($tempma / 60); $min = floor($tempma / 60);
$sec = $tempma - ($min*60); $sec = $tempma - ($min*60);
return $deg . '°' . $min . "'" . $sec . "\"";
return array("deg"=>$deg,"min"=>$min,"sec"=>$sec); return array("deg"=>$deg,"min"=>$min,"sec"=>$sec);
} }