diff options
| author | friendica <info@friendica.com> | 2012-06-02 02:30:26 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2012-06-02 02:30:26 -0700 |
| commit | 608d424b0b94eacd99ceeeca3e2caf112abd5b48 (patch) | |
| tree | a2bb50fd0f913ce039f8b7ad2f1be8974d053472 /include | |
| parent | 29bdf432f012af9b1959d5b4a33b3c45d220fd64 (diff) | |
| download | volse-hubzilla-608d424b0b94eacd99ceeeca3e2caf112abd5b48.tar.gz volse-hubzilla-608d424b0b94eacd99ceeeca3e2caf112abd5b48.tar.bz2 volse-hubzilla-608d424b0b94eacd99ceeeca3e2caf112abd5b48.zip | |
"howlong" added to marital status.
Diffstat (limited to 'include')
| -rw-r--r-- | include/datetime.php | 6 | ||||
| -rw-r--r-- | include/profile_advanced.php | 3 |
2 files changed, 7 insertions, 2 deletions
diff --git a/include/datetime.php b/include/datetime.php index f4dcfce62..3b1491e4d 100644 --- a/include/datetime.php +++ b/include/datetime.php @@ -244,7 +244,7 @@ function timesel($pre,$h,$m) { // Limited to range of timestamps if(! function_exists('relative_date')) { -function relative_date($posted_date) { +function relative_date($posted_date,$format = null) { $localtime = datetime_convert('UTC',date_default_timezone_get(),$posted_date); @@ -274,7 +274,9 @@ function relative_date($posted_date) { if ($d >= 1) { $r = round($d); // translators - e.g. 22 hours ago, 1 minute ago - return sprintf( t('%1$d %2$s ago'),$r, (($r == 1) ? $str[0] : $str[1])); + if(! $format) + $format = t('%1$d %2$s ago'); + return sprintf( $format,$r, (($r == 1) ? $str[0] : $str[1])); } } }} diff --git a/include/profile_advanced.php b/include/profile_advanced.php index 8c2acd8e7..2326ae716 100644 --- a/include/profile_advanced.php +++ b/include/profile_advanced.php @@ -39,6 +39,9 @@ function advanced_profile(&$a) { if($a->profile['with']) $profile['marital']['with'] = $a->profile['with']; + if(strlen($a->profile['howlong']) && $a->profile['howlong'] !== '0000-00-00 00:00:00') { + $profile['howlong'] = relative_date($a->profile['howlong'], t('for %1$d %2$s')); + } if($a->profile['sexual']) $profile['sexual'] = array( t('Sexual Preference:'), $a->profile['sexual'] ); |