From: friendica Date: Sat, 3 Nov 2012 21:43:48 +0000 (-0700) Subject: put 1i8n position orders in welcome string X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=3303d9db7564cb73984755be5c54365d61653b8b;p=friendica.git put 1i8n position orders in welcome string --- diff --git a/boot.php b/boot.php index 1a2daa4a1d..3269761c6d 100644 --- a/boot.php +++ b/boot.php @@ -11,7 +11,7 @@ require_once('include/cache.php'); require_once('library/Mobile_Detect/Mobile_Detect.php'); define ( 'FRIENDICA_PLATFORM', 'Friendica'); -define ( 'FRIENDICA_VERSION', '3.0.1514' ); +define ( 'FRIENDICA_VERSION', '3.0.1516' ); define ( 'DFRN_PROTOCOL_VERSION', '2.23' ); define ( 'DB_UPDATE_VERSION', 1156 ); @@ -1506,9 +1506,9 @@ if(! function_exists('proc_run')) { $cmdline = implode($args," "); if(get_config('system','proc_windows')) - proc_close(proc_open('cmd /c start /b ' . $cmdline,array(),$foo)); + proc_close(proc_open('cmd /c start /b ' . $cmdline,array(),$foo,dirname(__FILE__))); else - proc_close(proc_open($cmdline." &",array(),$foo)); + proc_close(proc_open($cmdline." &",array(),$foo,dirname(__FILE__))); } } diff --git a/mod/dfrn_poll.php b/mod/dfrn_poll.php index 0d703dfb31..8abe42abbb 100644 --- a/mod/dfrn_poll.php +++ b/mod/dfrn_poll.php @@ -96,7 +96,7 @@ function dfrn_poll_init(&$a) { $_SESSION['visitor_home'] = $r[0]['url']; $_SESSION['visitor_handle'] = $r[0]['addr']; $_SESSION['visitor_visiting'] = $r[0]['uid']; - info( sprintf(t('%s welcomes %s'), $r[0]['username'] , $r[0]['name']) . EOL); + info( sprintf(t('%1$s welcomes %2$s'), $r[0]['username'] , $r[0]['name']) . EOL); // Visitors get 1 day session. $session_id = session_id(); $expire = time() + 86400; @@ -527,7 +527,7 @@ function dfrn_poll_content(&$a) { $_SESSION['visitor_id'] = $r[0]['id']; $_SESSION['visitor_home'] = $r[0]['url']; $_SESSION['visitor_visiting'] = $r[0]['uid']; - info( sprintf(t('%s welcomes %s'), $r[0]['username'] , $r[0]['name']) . EOL); + info( sprintf(t('%1$s welcomes %2$s'), $r[0]['username'] , $r[0]['name']) . EOL); // Visitors get 1 day session. $session_id = session_id(); $expire = time() + 86400; diff --git a/util/messages.po b/util/messages.po index 65ba3604dd..36fcb59129 100644 --- a/util/messages.po +++ b/util/messages.po @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: 3.0.1514\n" +"Project-Id-Version: 3.0.1516\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2012-11-01 10:00-0700\n" +"POT-Creation-Date: 2012-11-03 10:00-0700\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n"