1.1 --- a/moinformat/links/html.py Mon Apr 15 23:42:51 2019 +0200
1.2 +++ b/moinformat/links/html.py Mon Apr 15 23:50:00 2019 +0200
1.3 @@ -135,13 +135,15 @@
1.4 # Attachment links.
1.5
1.6 if type == "attachment":
1.7 - return Link(self.translate_attachment(identifier), identifier, target)
1.8 + return Link(self.translate_attachment(identifier),
1.9 + identifier, target)
1.10
1.11 # Interwiki links.
1.12
1.13 url = self.mapping.get(type)
1.14 if url:
1.15 - return Link(self.translate_interwiki(url, identifier), identifier, target)
1.16 + return Link(self.translate_interwiki(url, identifier),
1.17 + identifier or type, target)
1.18
1.19 return None
1.20
2.1 --- a/moinformat/utils/links.py Mon Apr 15 23:42:51 2019 +0200
2.2 +++ b/moinformat/utils/links.py Mon Apr 15 23:50:00 2019 +0200
2.3 @@ -42,7 +42,10 @@
2.4 __unicode__ = __str__
2.5
2.6 def get_identifier(self):
2.7 - return self.identifier or self.text
2.8 + if self.identifier is not None:
2.9 + return self.identifier
2.10 + else:
2.11 + return self.text
2.12
2.13 def get_text(self):
2.14 return self.text
2.15 @@ -113,12 +116,9 @@
2.16
2.17 mapping = metadata and metadata.get("mapping")
2.18
2.19 - if prefix == "attachment":
2.20 + if prefix == "attachment" or mapping and mapping.get(prefix):
2.21 return LinkTarget(prefix, target, identifier)
2.22
2.23 - if mapping and mapping.get(prefix):
2.24 - return LinkTarget(prefix, target, identifier or prefix)
2.25 -
2.26 return None
2.27
2.28 # vim: tabstop=4 expandtab shiftwidth=4