Merge branch 'dev' of https://github.com/redmatrix/hubzilla into dev_merge

21 files changed, 22 insertions, 22 deletions

diff --git a/Zotlabs/Module/Bookmarks.php b/Zotlabs/Module/Bookmarks.php
index e62f5ce96..e147ffe6c 100644
--- a/Zotlabs/Module/Bookmarks.php
+++ b/Zotlabs/Module/Bookmarks.php
@@ -8,7 +8,7 @@ class Bookmarks extends \Zotlabs\Web\Controller {
 		if(! local_channel())
 			return;
 
-		nav_set_selected(t('View Bookmarks'));
+		nav_set_selected('View Bookmarks');
 
 		$item_id = intval($_REQUEST['item']);
 		$burl = trim($_REQUEST['burl']);
diff --git a/Zotlabs/Module/Cdav.php b/Zotlabs/Module/Cdav.php
index abaec26a6..77052f97c 100644
--- a/Zotlabs/Module/Cdav.php
+++ b/Zotlabs/Module/Cdav.php
@@ -824,7 +824,7 @@ class Cdav extends \Zotlabs\Web\Controller {
 		}
 
 		if(argv(1) === 'calendar') {
-			nav_set_selected(t('CalDAV'));
+			nav_set_selected('CalDAV');
 			$caldavBackend = new \Sabre\CalDAV\Backend\PDO($pdo);
 			$calendars = $caldavBackend->getCalendarsForUser($principalUri);
 		}
@@ -1025,7 +1025,7 @@ class Cdav extends \Zotlabs\Web\Controller {
 
 
 		if(argv(1) === 'addressbook') {
-			nav_set_selected(t('CardDAV'));
+			nav_set_selected('CardDAV');
 			$carddavBackend = new \Sabre\CardDAV\Backend\PDO($pdo);
 			$addressbooks = $carddavBackend->getAddressBooksForUser($principalUri);
 		}
diff --git a/Zotlabs/Module/Channel.php b/Zotlabs/Module/Channel.php
index 8550c69cd..508d2b57a 100644
--- a/Zotlabs/Module/Channel.php
+++ b/Zotlabs/Module/Channel.php
@@ -94,7 +94,7 @@ class Channel extends \Zotlabs\Web\Controller {
 		}
 		else {
 			if(\App::$profile['profile_uid'] == local_channel()) {
-				nav_set_selected(t('Channel Home'));
+				nav_set_selected('Channel Home');
 			}
 		}
 
diff --git a/Zotlabs/Module/Chat.php b/Zotlabs/Module/Chat.php
index 138ca1cb5..378c9f4dd 100644
--- a/Zotlabs/Module/Chat.php
+++ b/Zotlabs/Module/Chat.php
@@ -91,7 +91,7 @@ class Chat extends \Zotlabs\Web\Controller {
 	
 		if(local_channel()) {
 			$channel = \App::get_channel();
-			nav_set_selected(t('My Chatrooms'));
+			nav_set_selected('My Chatrooms');
 		}
 
 		$ob = \App::get_observer();
diff --git a/Zotlabs/Module/Connections.php b/Zotlabs/Module/Connections.php
index 6ad1e9528..f42ff9b84 100644
--- a/Zotlabs/Module/Connections.php
+++ b/Zotlabs/Module/Connections.php
@@ -30,7 +30,7 @@ class Connections extends \Zotlabs\Web\Controller {
 			return login();
 		}
 
-		nav_set_selected(t('Connections'));
+		nav_set_selected('Connections');
 	
 		$blocked     = false;
 		$hidden      = false;
diff --git a/Zotlabs/Module/Directory.php b/Zotlabs/Module/Directory.php
index 6268e99c6..caf0190ae 100644
--- a/Zotlabs/Module/Directory.php
+++ b/Zotlabs/Module/Directory.php
@@ -77,7 +77,7 @@ class Directory extends \Zotlabs\Web\Controller {
 		$pubforums = get_directory_setting($observer, 'pubforums');
 	
 		$o = '';
-		nav_set_selected(t('Directory'));
+		nav_set_selected('Directory');
 	
 		if(x($_POST,'search'))
 			$search = notags(trim($_POST['search']));
diff --git a/Zotlabs/Module/Events.php b/Zotlabs/Module/Events.php
index 0541f5e9b..33c8b8249 100644
--- a/Zotlabs/Module/Events.php
+++ b/Zotlabs/Module/Events.php
@@ -272,7 +272,7 @@ class Events extends \Zotlabs\Web\Controller {
 			return;
 		}
 	
-		nav_set_selected(t('Events'));
+		nav_set_selected('Events');
 	
 		if((argc() > 2) && (argv(1) === 'ignore') && intval(argv(2))) {
 			$r = q("update event set dismissed = 1 where id = %d and uid = %d",
diff --git a/Zotlabs/Module/Help.php b/Zotlabs/Module/Help.php
index f3cc3aa5f..f1b1acaef 100644
--- a/Zotlabs/Module/Help.php
+++ b/Zotlabs/Module/Help.php
@@ -15,7 +15,7 @@ require_once('include/help.php');
 class Help extends \Zotlabs\Web\Controller {
 
 	function get() {
-		nav_set_selected(t('Help'));
+		nav_set_selected('Help');
 
 		if($_REQUEST['search']) {
 			$o .= '<div id="help-content" class="generic-content-wrapper">';
diff --git a/Zotlabs/Module/Invite.php b/Zotlabs/Module/Invite.php
index bbd98150d..0bcd1c1fa 100644
--- a/Zotlabs/Module/Invite.php
+++ b/Zotlabs/Module/Invite.php
@@ -95,7 +95,7 @@ class Invite extends \Zotlabs\Web\Controller {
 			return;
 		}
 
-		nav_set_selected(t('Invite'));
+		nav_set_selected('Invite');
 	
 		$tpl = get_markup_template('invite.tpl');
 		$invonly = false;
diff --git a/Zotlabs/Module/Lang.php b/Zotlabs/Module/Lang.php
index 84776c3ea..0e5d85d05 100644
--- a/Zotlabs/Module/Lang.php
+++ b/Zotlabs/Module/Lang.php
@@ -5,7 +5,7 @@ namespace Zotlabs\Module;
 class Lang extends \Zotlabs\Web\Controller {
 
 	function get() {
-		nav_set_selected(t('Language'));
+		nav_set_selected('Language');
 		return lang_selector();
 	}
 	
diff --git a/Zotlabs/Module/Mail.php b/Zotlabs/Module/Mail.php
index e5509961a..12f3b8152 100644
--- a/Zotlabs/Module/Mail.php
+++ b/Zotlabs/Module/Mail.php
@@ -140,7 +140,7 @@ class Mail extends \Zotlabs\Web\Controller {
 	function get() {
 	
 		$o = '';
-		nav_set_selected(t('Mail'));
+		nav_set_selected('Mail');
 	
 		if(! local_channel()) {
 			notice( t('Permission denied.') . EOL);
diff --git a/Zotlabs/Module/Mood.php b/Zotlabs/Module/Mood.php
index 85c8a3042..ad29ec7e8 100644
--- a/Zotlabs/Module/Mood.php
+++ b/Zotlabs/Module/Mood.php
@@ -117,7 +117,7 @@ class Mood extends \Zotlabs\Web\Controller {
 			return;
 		}
 
-		nav_set_selected(t('Mood'));
+		nav_set_selected('Mood');
 
 		$parent = ((x($_GET,'parent')) ? intval($_GET['parent']) : '0');
 	
diff --git a/Zotlabs/Module/Network.php b/Zotlabs/Module/Network.php
index 2b5584c35..ee736ff42 100644
--- a/Zotlabs/Module/Network.php
+++ b/Zotlabs/Module/Network.php
@@ -154,7 +154,7 @@ class Network extends \Zotlabs\Web\Controller {
 				));
 			}
 	
-			nav_set_selected(t('Activity'));
+			nav_set_selected('Grid');
 
 			$channel_acl = array(
 				'allow_cid' => $channel['channel_allow_cid'], 
diff --git a/Zotlabs/Module/Photos.php b/Zotlabs/Module/Photos.php
index 2ca9bfe50..caef45d98 100644
--- a/Zotlabs/Module/Photos.php
+++ b/Zotlabs/Module/Photos.php
@@ -555,7 +555,7 @@ class Photos extends \Zotlabs\Web\Controller {
 		$sql_extra = permissions_sql($owner_uid,get_observer_hash(),'photo');
 		$sql_attach = permissions_sql($owner_uid,get_observer_hash(),'attach');
 
-		nav_set_selected(t('Photos'));
+		nav_set_selected('Photos');
 	
 		$o = "";
 	
diff --git a/Zotlabs/Module/Poke.php b/Zotlabs/Module/Poke.php
index 0bd1187c7..d13ec5ced 100644
--- a/Zotlabs/Module/Poke.php
+++ b/Zotlabs/Module/Poke.php
@@ -150,7 +150,7 @@ class Poke extends \Zotlabs\Web\Controller {
 			return;
 		}
 
-		nav_set_selected(t('Poke'));
+		nav_set_selected('Poke');
 	
 		$name = '';
 		$id = '';
diff --git a/Zotlabs/Module/Probe.php b/Zotlabs/Module/Probe.php
index 859bed315..2e65f107c 100644
--- a/Zotlabs/Module/Probe.php
+++ b/Zotlabs/Module/Probe.php
@@ -8,7 +8,7 @@ class Probe extends \Zotlabs\Web\Controller {
 
 	function get() {
 
-		nav_set_selected(t('Remote Diagnostics'));
+		nav_set_selected('Remote Diagnostics');
 
 		$o .= '<h3>Probe Diagnostic</h3>';
 	
diff --git a/Zotlabs/Module/Rpost.php b/Zotlabs/Module/Rpost.php
index e716d1330..5d2f0d7e8 100644
--- a/Zotlabs/Module/Rpost.php
+++ b/Zotlabs/Module/Rpost.php
@@ -61,7 +61,7 @@ class Rpost extends \Zotlabs\Web\Controller {
 			return login();
 		}
 
-		nav_set_selected(t('Post'));
+		nav_set_selected('Post');
 	
 		// If we have saved rpost session variables, but nothing in the current $_REQUEST, recover the saved variables
 	
diff --git a/Zotlabs/Module/Search.php b/Zotlabs/Module/Search.php
index e1d35b879..37e9a336f 100644
--- a/Zotlabs/Module/Search.php
+++ b/Zotlabs/Module/Search.php
@@ -22,7 +22,7 @@ class Search extends \Zotlabs\Web\Controller {
 		if($load)
 			$_SESSION['loadtime'] = datetime_convert();
 	
-		nav_set_selected(t('Search'));
+		nav_set_selected('Search');
 	
 		require_once("include/bbcode.php");
 		require_once('include/security.php');
diff --git a/Zotlabs/Module/Suggest.php b/Zotlabs/Module/Suggest.php
index c3f4a6d5a..f79e4e245 100644
--- a/Zotlabs/Module/Suggest.php
+++ b/Zotlabs/Module/Suggest.php
@@ -29,7 +29,7 @@ class Suggest extends \Zotlabs\Web\Controller {
 			return;
 		}
 
-		nav_set_selected(t('Suggest Channels'));
+		nav_set_selected('Suggest Channels');
 	
 		$_SESSION['return_url'] = z_root() . '/' . \App::$cmd;
 	
diff --git a/Zotlabs/Module/Webpages.php b/Zotlabs/Module/Webpages.php
index e449a790f..97ec55ba3 100644
--- a/Zotlabs/Module/Webpages.php
+++ b/Zotlabs/Module/Webpages.php
@@ -35,7 +35,7 @@ class Webpages extends \Zotlabs\Web\Controller {
 			return;
 		}
 
-		nav_set_selected(t('Webpages'));
+		nav_set_selected('Webpages');
 
 		$which = argv(1);
 		
diff --git a/Zotlabs/Module/Wiki.php b/Zotlabs/Module/Wiki.php
index fe2bfbdfb..d6a01af11 100644
--- a/Zotlabs/Module/Wiki.php
+++ b/Zotlabs/Module/Wiki.php
@@ -76,7 +76,7 @@ class Wiki extends \Zotlabs\Web\Controller {
 
 			$wiki_owner = true;
 
-			nav_set_selected(t('Wiki'));
+			nav_set_selected('Wiki');
 
 			// Obtain the default permission settings of the channel
 			$owner_acl = array(