comparison MoinMoin/theme/__init__.py @ 2732:b185b5b80d1b

merged main
author Thomas Waldmann <tw AT waldmann-edv DOT de>
date Sun, 19 Aug 2007 19:51:56 +0200
parents 59b3d8b8971f 9817a90b6fde
children 9b43bd4e9e38
comparison
equal deleted inserted replaced
2731:a62313ef3473 2732:b185b5b80d1b
1188 """ Return subscribe/unsubscribe link to valid users 1188 """ Return subscribe/unsubscribe link to valid users
1189 1189
1190 @rtype: unicode 1190 @rtype: unicode
1191 @return: subscribe or unsubscribe link 1191 @return: subscribe or unsubscribe link
1192 """ 1192 """
1193 if not (self.cfg.mail_enabled and self.request.user.valid): 1193 if not (self.cfg.mail_enabled or self.cfg.jabber_enabled and self.request.user.valid):
1194 return '' 1194 return ''
1195 1195
1196 _ = self.request.getText 1196 _ = self.request.getText
1197 if self.request.user.isSubscribedTo([page.page_name]): 1197 if self.request.user.isSubscribedTo([page.page_name]):
1198 text = _("Unsubscribe", formatted=False) 1198 text = _("Unsubscribe", formatted=False)