Merge pull request #962 from JoKeyser/fixIssue699

ejabberd, ikiwiki, ttrss: user login descriptions, fixes #699

plinth/modules/ejabberd/__init__.py

@@ -21,11 +21,14 @@ Plinth module to configure ejabberd server
 
 from django.urls import reverse_lazy
 from django.utils.translation import ugettext_lazy as _
+from plinth.utils import format_lazy
+
 import logging
 import socket
 
 from plinth import actions
 from plinth import action_utils
+from plinth import cfg
 from plinth import frontpage
 from plinth import service as service_module
 from plinth.menu import main_menu
@@ -45,9 +48,13 @@ description = [
     _('XMPP is an open and standardized communication protocol. Here '
       'you can run and configure your XMPP server, called ejabberd.'),
 
-    _('To actually communicate, you can use the web client or any other '
+    format_lazy(
-      '<a href=\'http://xmpp.org/xmpp-software/clients/\' target=\'_blank\''
+        _('To actually communicate, you can use the <a href="/plinth/apps/'
-      '>XMPP client</a>.'),
+          'jsxc">web client</a> or any other <a href=\'http://xmpp.org/xmpp-'
+          'software/clients/\' target=\'_blank\'>XMPP client</a>. '
+          'When enabled, ejabberd can be accessed by any <a href="/plinth/sys'
+          '/users">user with a {box_name} login</a>.'),
+        box_name=_(cfg.box_name))
 ]
 
 reserved_usernames = ['ejabberd']

plinth/modules/ikiwiki/__init__.py

@@ -20,9 +20,11 @@ Plinth module to configure ikiwiki
 """
 
 from django.utils.translation import ugettext_lazy as _
+from plinth.utils import format_lazy
 
 from plinth import actions
 from plinth import action_utils
+from plinth import cfg
 from plinth import frontpage
 from plinth import service as service_module
 from plinth.menu import main_menu
@@ -43,7 +45,14 @@ description = [
       'several lightweight markup languages, including Markdown, and '
       'common blogging functionality such as comments and RSS feeds. '
       'When enabled, the blogs and wikis will be available '
-      'from <a href="/ikiwiki">/ikiwiki</a>.')
+      'at <a href="/ikiwiki">/ikiwiki</a> (once created).'),
+
+    format_lazy(
+        _('Only {box_name} users in the <b>admin</b> group can <i>create</i> '
+          'and <i>manage</i> blogs and wikis, but any user in the <b>wiki</b> '
+          'group can <i>edit</i> existing ones. In the <a href="/plinth/sys/'
+          'users">User Configuration</a> you can change these '
+          'permissions or add new users.'), box_name=_(cfg.box_name))
 ]
 
 

plinth/modules/ttrss/__init__.py

@@ -20,9 +20,11 @@ Plinth module to configure Tiny Tiny RSS.
 """
 
 from django.utils.translation import ugettext_lazy as _
+from plinth.utils import format_lazy
 
 from plinth import actions
 from plinth import action_utils
+from plinth import cfg
 from plinth import frontpage
 from plinth import service as service_module
 from plinth.menu import main_menu
@@ -41,8 +43,11 @@ description = [
       'designed to allow reading news from any location, while feeling as '
       'close to a real desktop application as possible.'),
 
-    _('When enabled, Tiny Tiny RSS will be available from <a href="/tt-rss">'
+    format_lazy(
-      '/tt-rss</a> path on the web server.'),
+        _('When enabled, Tiny Tiny RSS will be available from <a href="/tt-'
+          'rss">/tt-rss</a> path on the web server. It can be accessed by '
+          'any <a href="/plinth/sys/users">user with a {box_name} login</a>.'),
+        box_name=_(cfg.box_name))
 ]
 
 service = None