From 6c5511020457c39961d069071ac60f7140ec724f Mon Sep 17 00:00:00 2001
From: Lukasz Jader <ljaderdev@gmail.com>
Date: Wed, 19 Sep 2012 16:24:10 -0400
Subject: [PATCH] Update polish translation of EmptyRepositoryPage
---
src/com/gitblit/wicket/pages/MarkdownPage.java | 15 ++++++++++-----
1 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/src/com/gitblit/wicket/pages/MarkdownPage.java b/src/com/gitblit/wicket/pages/MarkdownPage.java
index fc8b7cb..e032cbf 100644
--- a/src/com/gitblit/wicket/pages/MarkdownPage.java
+++ b/src/com/gitblit/wicket/pages/MarkdownPage.java
@@ -15,6 +15,7 @@
*/
package com.gitblit.wicket.pages;
+import java.text.MessageFormat;
import java.text.ParseException;
import org.apache.wicket.PageParameters;
@@ -24,8 +25,10 @@
import org.eclipse.jgit.lib.Repository;
import org.eclipse.jgit.revwalk.RevCommit;
+import com.gitblit.GitBlit;
import com.gitblit.utils.JGitUtils;
import com.gitblit.utils.MarkdownUtils;
+import com.gitblit.utils.StringUtils;
import com.gitblit.wicket.WicketUtils;
public class MarkdownPage extends RepositoryPage {
@@ -37,9 +40,11 @@
Repository r = getRepository();
RevCommit commit = JGitUtils.getCommit(r, objectId);
-
+ String [] encodings = GitBlit.getEncodings();
+
// markdown page links
- add(new Label("blameLink", getString("gb.blame")));
+ add(new BookmarkablePageLink<Void>("blameLink", BlamePage.class,
+ WicketUtils.newPathParameter(repositoryName, objectId, markdownPath)));
add(new BookmarkablePageLink<Void>("historyLink", HistoryPage.class,
WicketUtils.newPathParameter(repositoryName, objectId, markdownPath)));
add(new BookmarkablePageLink<Void>("rawLink", RawPage.class, WicketUtils.newPathParameter(
@@ -48,13 +53,13 @@
WicketUtils.newPathParameter(repositoryName, Constants.HEAD, markdownPath)));
// Read raw markdown content and transform it to html
- String markdownText = JGitUtils.getRawContentAsString(r, commit, markdownPath);
+ String markdownText = JGitUtils.getStringContent(r, commit.getTree(), markdownPath, encodings);
String htmlText;
try {
htmlText = MarkdownUtils.transformMarkdown(markdownText);
} catch (ParseException p) {
- error(p.getMessage());
- htmlText = markdownText;
+ markdownText = MessageFormat.format("<div class=\"alert alert-error\"><strong>{0}:</strong> {1}</div>{2}", getString("gb.error"), getString("gb.markdownFailure"), markdownText);
+ htmlText = StringUtils.breakLinesForHtml(markdownText);
}
// Add the html to the page
--
Gitblit v1.9.1