diff options
| author | redmatrix <git@macgirvin.com> | 2016-03-26 14:34:19 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-03-26 14:34:19 -0700 |
| commit | d3f38c9f43665e1826c332d5afd3249666915fdf (patch) | |
| tree | d5cd83e2e76397e013755327c5a670ce9a856cd2 /mod | |
| parent | 971e7321c65a8cb424fac3de34af9176275aac17 (diff) | |
| parent | eeb1c463e37380c4dd7ac3fccf32d26e91a469ce (diff) | |
| download | volse-hubzilla-d3f38c9f43665e1826c332d5afd3249666915fdf.tar.gz volse-hubzilla-d3f38c9f43665e1826c332d5afd3249666915fdf.tar.bz2 volse-hubzilla-d3f38c9f43665e1826c332d5afd3249666915fdf.zip | |
Merge https://github.com/redmatrix/hubzilla into pending_merge
Diffstat (limited to 'mod')
| -rw-r--r-- | mod/channel.php | 3 | ||||
| -rw-r--r-- | mod/locs.php | 11 | ||||
| -rw-r--r-- | mod/manage.php | 4 |
3 files changed, 9 insertions, 9 deletions
diff --git a/mod/channel.php b/mod/channel.php index dcccb16b6..7bdc056a2 100644 --- a/mod/channel.php +++ b/mod/channel.php @@ -34,7 +34,8 @@ function channel_init(&$a) { $profile = argv(1); } - $a->page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" href="' . $a->get_baseurl() . '/feed/' . $which .'" />' . "\r\n" ; + $a->page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" title="' . t('Only posts') . '" href="' . $a->get_baseurl() . '/feed/' . $which . '?top=1" />' . "\r\n" ; + $a->page['htmlhead'] .= '<link rel="alternate" type="application/atom+xml" title="' . t('Posts and comments') . '" href="' . $a->get_baseurl() . '/feed/' . $which . '" />' . "\r\n" ; // Not yet ready for prime time diff --git a/mod/locs.php b/mod/locs.php index 9f66e3263..8452f62d1 100644 --- a/mod/locs.php +++ b/mod/locs.php @@ -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 +} diff --git a/mod/manage.php b/mod/manage.php index cb845befe..d769f0393 100644 --- a/mod/manage.php +++ b/mod/manage.php @@ -167,9 +167,7 @@ function manage_content(&$a) { '$intros_format' => t('%d new introductions'), '$channel_usage_message' => $channel_usage_message, '$delegated_desc' => t('Delegated Channel'), - '$delegates' => $delegates, - '$locs' => t('Manage locations') - + '$delegates' => $delegates )); return $o; |