From 01774948d84794d1d9c216f9a6859d7f150815d5 Mon Sep 17 00:00:00 2001 From: James Moger <james.moger@gitblit.com> Date: Fri, 15 Jun 2012 15:50:59 -0400 Subject: [PATCH] Externalized some more strings. Updated Spanish translation from eguervos. --- src/com/gitblit/wicket/pages/SummaryPage.java | 9 +++++---- 1 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/com/gitblit/wicket/pages/SummaryPage.java b/src/com/gitblit/wicket/pages/SummaryPage.java index acb4180..ef2ee55 100644 --- a/src/com/gitblit/wicket/pages/SummaryPage.java +++ b/src/com/gitblit/wicket/pages/SummaryPage.java @@ -84,12 +84,12 @@ add(new Label("repositoryOwner", getRepositoryModel().owner)); add(WicketUtils.createTimestampLabel("repositoryLastChange", - JGitUtils.getLastChange(r, null), getTimeZone())); + JGitUtils.getLastChange(r), getTimeZone())); if (metricsTotal == null) { add(new Label("branchStats", "")); } else { add(new Label("branchStats", - MessageFormat.format("{0} commits and {1} tags in {2}", metricsTotal.count, + MessageFormat.format(getString("gb.branchStats"), metricsTotal.count, metricsTotal.tag, TimeUtils.duration(metricsTotal.duration)))); } add(new BookmarkablePageLink<Void>("metrics", MetricsPage.class, @@ -158,7 +158,8 @@ } } if (!StringUtils.isEmpty(readme)) { - String markdownText = JGitUtils.getStringContent(r, head.getTree(), readme); + String [] encodings = GitBlit.getEncodings(); + String markdownText = JGitUtils.getStringContent(r, head.getTree(), readme, encodings); htmlText = MarkdownUtils.transformMarkdown(markdownText); } } catch (ParseException p) { @@ -188,7 +189,7 @@ && GitBlit.getBoolean(Keys.web.generateActivityGraph, true)) { IChartData data = WicketUtils.getChartData(metrics); - ChartProvider provider = new ChartProvider(new Dimension(400, 100), ChartType.LINE, + ChartProvider provider = new ChartProvider(new Dimension(290, 100), ChartType.LINE, data); ChartAxis dateAxis = new ChartAxis(ChartAxisType.BOTTOM); dateAxis.setLabels(new String[] { metrics.get(0).name, -- Gitblit v1.9.1