aboutsummaryrefslogtreecommitdiffstats
path: root/mod/locs.php
diff options
context:
space:
mode:
authorAndrew Manning <tamanning@zoho.com>2016-04-03 21:36:29 -0400
committerAndrew Manning <tamanning@zoho.com>2016-04-03 21:36:29 -0400
commit0523b4b2f1012a8b5f3bffb7f136a20dc9a4e43f (patch)
treea92197de4503ec52889dc05483493f4df1a305b8 /mod/locs.php
parent99d9456b3addc651a68874ddd391d25684252c4d (diff)
parentb4c1baada1fba46d4d75f40a7e78111d70d54e7a (diff)
downloadvolse-hubzilla-0523b4b2f1012a8b5f3bffb7f136a20dc9a4e43f.tar.gz
volse-hubzilla-0523b4b2f1012a8b5f3bffb7f136a20dc9a4e43f.tar.bz2
volse-hubzilla-0523b4b2f1012a8b5f3bffb7f136a20dc9a4e43f.zip
Merge branch 'master' of https://github.com/redmatrix/hubzilla into contextual-help
Diffstat (limited to 'mod/locs.php')
-rw-r--r--mod/locs.php15
1 files changed, 8 insertions, 7 deletions
diff --git a/mod/locs.php b/mod/locs.php
index 9f66e3263..1daf41b89 100644
--- a/mod/locs.php
+++ b/mod/locs.php
@@ -6,7 +6,7 @@ function locs_post(&$a) {
if(! local_channel())
return;
- $channel = $a->get_channel();
+ $channel = App::get_channel();
if($_REQUEST['primary']) {
$hubloc_id = intval($_REQUEST['primary']);
@@ -84,7 +84,7 @@ function locs_content(&$a) {
return;
}
- $channel = $a->get_channel();
+ $channel = App::get_channel();
if($_REQUEST['sync']) {
proc_run('php','include/notifier.php','location',$channel['channel_id']);
@@ -110,11 +110,12 @@ function locs_content(&$a) {
$o = replace_macros(get_markup_template('locmanage.tpl'), array(
'$header' => t('Manage Channel Locations'),
- '$loc' => t('Location (address)'),
- '$mkprm' => t('Primary Location'),
- '$drop' => t('Drop location'),
+ '$loc' => t('Location'),
+ '$addr' => t('Address'),
+ '$mkprm' => t('Primary'),
+ '$drop' => t('Drop'),
'$submit' => t('Submit'),
- '$sync' => t('Sync now'),
+ '$sync' => t('Sync Now'),
'$sync_text' => t('Please wait several minutes between consecutive operations.'),
'$drop_text' => t('When possible, drop a location by logging into that website/hub and removing your channel.'),
'$last_resort' => t('Use this form to drop the location if the hub is no longer operating.'),
@@ -122,4 +123,4 @@ function locs_content(&$a) {
));
return $o;
-} \ No newline at end of file
+}