From df35adb4488c65ceb750c1230c67a5c0c51d338f Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Sun, 25 Mar 2012 20:31:40 -0400 Subject: [PATCH] Include partial Japanese translation with Manager --- src/com/gitblit/wicket/pages/RepositoriesPage.java | 10 +++++++--- 1 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/com/gitblit/wicket/pages/RepositoriesPage.java b/src/com/gitblit/wicket/pages/RepositoriesPage.java index 07f7ad4..839f4e3 100644 --- a/src/com/gitblit/wicket/pages/RepositoriesPage.java +++ b/src/com/gitblit/wicket/pages/RepositoriesPage.java @@ -16,7 +16,7 @@ package com.gitblit.wicket.pages; import java.io.File; -import java.io.FileReader; +import java.io.FileInputStream; import java.io.InputStream; import java.io.InputStreamReader; import java.text.MessageFormat; @@ -26,6 +26,7 @@ import org.apache.wicket.PageParameters; import org.apache.wicket.markup.html.basic.Label; import org.apache.wicket.resource.ContextRelativeResource; +import org.eclipse.jgit.lib.Constants; import com.gitblit.GitBlit; import com.gitblit.Keys; @@ -119,8 +120,11 @@ File file = new File(messageSource); if (file.exists()) { try { - FileReader reader = new FileReader(file); + FileInputStream fis = new FileInputStream(file); + InputStreamReader reader = new InputStreamReader(fis, + Constants.CHARACTER_ENCODING); message = MarkdownUtils.transformMarkdown(reader); + reader.close(); } catch (Throwable t) { message = "Failed to read " + file; warn(message, t); @@ -138,7 +142,7 @@ try { ContextRelativeResource res = WicketUtils.getResource(file); InputStream is = res.getResourceStream().getInputStream(); - InputStreamReader reader = new InputStreamReader(is); + InputStreamReader reader = new InputStreamReader(is, Constants.CHARACTER_ENCODING); message = MarkdownUtils.transformMarkdown(reader); reader.close(); } catch (Throwable t) { -- Gitblit v1.9.1