make 'x minutes ago' fully translateable with argument ordering. string update.

[friendica.git] / include / datetime.php

diff --git a/include/datetime.php b/include/datetime.php
old mode 100644 (file)
new mode 100755 (executable)
index 087e6cb..6d395fe
--- a/include/datetime.php
+++ b/include/datetime.php
@@ -15,7 +15,6 @@ function timezone_cmp($a, $b) {
 }}
 
 // emit a timezone selector grouped (primarily) by continent
-
 if(! function_exists('select_timezone')) {
 function select_timezone($current = 'America/Los_Angeles') {
 
@@ -55,6 +54,23 @@ function select_timezone($current = 'America/Los_Angeles') {
        return $o;
 }}
 
+// return a select using 'field_select_raw' template, with timezones 
+// groupped (primarily) by continent
+// arguments follow convetion as other field_* template array:
+// 'name', 'label', $value, 'help'
+if (!function_exists('field_timezone')){
+function field_timezone($name='timezone', $label='', $current = 'America/Los_Angeles', $help){
+       $options = select_timezone($current);
+       $options = str_replace('<select id="timezone_select" name="timezone">','', $options);
+       $options = str_replace('</select>','', $options);
+       
+       $tpl = get_markup_template('field_select_raw.tpl');
+       return replace_macros($tpl, array(
+               '$field' => array($name, $label, $current, $help, $options),
+       ));
+       
+}}
+
 // General purpose date parse/convert function.
 // $from = source timezone
 // $to   = dest timezone
@@ -244,10 +260,11 @@ function relative_date($posted_date) {
        );
     
        foreach ($a as $secs => $str) {
-       $d = $etime / $secs;
-       if ($d >= 1) {
-               $r = round($d);
-               return $r . ' ' . (($r == 1) ? $str[0] : $str[1]) . t(' ago');
+               $d = $etime / $secs;
+               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]));
         }
     }
 }}
@@ -446,4 +463,4 @@ function update_contact_birthdays() {
 
                }
        }
-}
\ No newline at end of file
+}