summaryrefslogtreecommitdiff
path: root/src/org/fox/ttrss/ArticleFragment.java
diff options
context:
space:
mode:
authorAndrew Dolgov <fox@fakecake.org>2012-02-21 09:04:10 +0300
committerAndrew Dolgov <fox@fakecake.org>2012-02-21 09:04:10 +0300
commitc33708a1cfd75e067ec97c825557c526721404eb (patch)
treefad31e64733db86a2670148520ca85cdf4ab8c15 /src/org/fox/ttrss/ArticleFragment.java
parent449ba2f1dcd98b9f6e5eb8b1d8f366229b893bd4 (diff)
support attachments in combined mode, fix french translation, bump
version
Diffstat (limited to 'src/org/fox/ttrss/ArticleFragment.java')
-rw-r--r--src/org/fox/ttrss/ArticleFragment.java6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/org/fox/ttrss/ArticleFragment.java b/src/org/fox/ttrss/ArticleFragment.java
index d79998db..071ffba5 100644
--- a/src/org/fox/ttrss/ArticleFragment.java
+++ b/src/org/fox/ttrss/ArticleFragment.java
@@ -153,7 +153,7 @@ public class ArticleFragment extends Fragment {
"<body>" + articleContent;
if (m_article.attachments != null && m_article.attachments.size() != 0) {
- String attachments = "<div class=\"attachments\">Attachments: ";
+ String attachments = "<div class=\"attachments\">" + getString(R.string.attachments) + " ";
for (Attachment a : m_article.attachments) {
if (a.content_type != null && a.content_url != null && a.content_type.indexOf("image") != -1) {
@@ -163,9 +163,9 @@ public class ArticleFragment extends Fragment {
String atitle = (a.title != null && a.title.length() > 0) ? a.title : new File(url.getFile()).getName();
- content += "<br/><img src=\"" + url.toString().replace("\"", "\\\"") + "\">";
+ content += "<br/><img src=\"" + url.toString().trim().replace("\"", "\\\"") + "\">";
- attachments += "<a href=\""+url.toString().replace("\"", "\\\"") + "\">" + atitle + "</a>, ";
+ attachments += "<a href=\""+url.toString().trim().replace("\"", "\\\"") + "\">" + atitle + "</a>, ";
} catch (MalformedURLException e) {
//