Resolved conflict in view/it/hstrings.php

1 files changed, 16 insertions, 5 deletions

diff --git a/mod/poke.php b/mod/poke.php
index f66d28956..7245ceee7 100755
--- a/mod/poke.php
+++ b/mod/poke.php
@@ -22,7 +22,7 @@ function poke_init(&$a) {
 		return;
 
 	$uid = local_channel();
-	$channel = $a->get_channel();
+	$channel = App::get_channel();
 
 	$verb = notags(trim($_REQUEST['verb']));
 	
@@ -158,16 +158,27 @@ function poke_content(&$a) {
 		if($v[1] !== 'NOTRANSLATION')
 			$shortlist[] = array($k,$v[1]);
 
-	$tpl = get_markup_template('poke_content.tpl');
 
-	$o = replace_macros($tpl,array(
-		'$title' => t('Poke/Prod'),
-		'$desc' => t('poke, prod or do other things to somebody'),
+	$poke_basic = get_config('system','poke_basic');
+	if($poke_basic) {
+		$title = t('Poke');
+		$desc = t('Poke somebody');
+	}
+	else {
+		$title = t('Poke/Prod');
+		$desc = t('Poke, prod or do other things to somebody');
+	}
+
+	$o = replace_macros(get_markup_template('poke_content.tpl'),array(
+		'$title' => $title,
+		'$poke_basic' => $poke_basic,
+		'$desc' => $desc,
 		'$clabel' => t('Recipient'),
 		'$choice' => t('Choose what you wish to do to recipient'),
 		'$verbs' => $shortlist,
 		'$parent' => $parent,
 		'$prv_desc' => t('Make this post private'),
+		'$private' => array('private', t('Make this post private'), false, ''),
 		'$submit' => t('Submit'),
 		'$name' => $name,
 		'$id' => $id