Merge branch 'master' of git://github.com/friendika/friendika

2 files changed, 51 insertions, 0 deletions

diff --git a/include/Contact.php b/include/Contact.php
index 7cac3c0e0..4ca77d065 100644
--- a/include/Contact.php
+++ b/include/Contact.php
@@ -14,11 +14,13 @@ function user_remove($uid) {
 	q("DELETE FROM `group` WHERE `uid` = %d", intval($uid));
 	q("DELETE FROM `group_member` WHERE `uid` = %d", intval($uid));
 	q("DELETE FROM `intro` WHERE `uid` = %d", intval($uid));
+	q("DELETE FROM `event` WHERE `uid` = %d", intval($uid));
 	q("DELETE FROM `item` WHERE `uid` = %d", intval($uid));
 	q("DELETE FROM `mail` WHERE `uid` = %d", intval($uid));
 	q("DELETE FROM `photo` WHERE `uid` = %d", intval($uid));
 	q("DELETE FROM `profile` WHERE `uid` = %d", intval($uid));
 	q("DELETE FROM `profile_check` WHERE `uid` = %d", intval($uid));
+	q("DELETE FROM `pconfig` WHERE `uid` = %d", intval($uid));
 	q("DELETE FROM `user` WHERE `uid` = %d", intval($uid));
 	if($uid == local_user()) {
 		unset($_SESSION['authenticated']);
@@ -41,6 +43,9 @@ function contact_remove($id) {
 	q("DELETE FROM `mail` WHERE `contact-id` = %d ",
 		intval($id)
 	);
+	q("DELETE FROM `event` WHERE `cid` = %d ",
+		intval($id)
+	);
 }
 
 
diff --git a/include/pgettext.php b/include/pgettext.php
new file mode 100644
index 000000000..2ffee70bc
--- /dev/null
+++ b/include/pgettext.php
@@ -0,0 +1,46 @@
+<?php
+/**
+ * translation support
+ */
+
+// load string translation table for alternate language
+
+if(! function_exists('load_translation_table')) {
+function load_translation_table($lang) {
+	global $a;
+
+	if(file_exists("view/$lang/strings.php"))
+		include("view/$lang/strings.php");
+}}
+
+// translate string if translation exists
+
+if(! function_exists('t')) {
+function t($s) {
+
+	$a = get_app();
+
+	if(x($a->strings,$s)) {
+		$t = $a->strings[$s];
+		return is_array($t)?$t[0]:$t;
+	}
+	return $s;
+}}
+
+if(! function_exists('tt')){
+function tt($singular, $plural, $count){
+	
+	$a = get_app();
+
+	if(x($a->strings,$singular)) {
+		$t = $a->strings[$singular];
+		$k = string_plural_select($count);
+		return is_array($t)?$t[$k]:$t;
+	}
+	
+	if ($count!=1){
+		return $plural;
+	} else {
+		return $singular;
+	}
+}}
\ No newline at end of file