From 1be31659e7e92c0fdc32e629d059d2aed5fe3a63 Mon Sep 17 00:00:00 2001 From: Rafael Cavazin <rafaelcavazin@gmail.com> Date: Sun, 21 Jul 2013 11:12:11 -0400 Subject: [PATCH] Translation of lastest Strings up-do-date. Tradução das últimas Strings até a data atual. --- src/main/java/com/gitblit/wicket/pages/RepositoriesPage.java | 13 +++++++------ 1 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/gitblit/wicket/pages/RepositoriesPage.java b/src/main/java/com/gitblit/wicket/pages/RepositoriesPage.java index 4bce77f..a4a1ab5 100644 --- a/src/main/java/com/gitblit/wicket/pages/RepositoriesPage.java +++ b/src/main/java/com/gitblit/wicket/pages/RepositoriesPage.java @@ -26,8 +26,6 @@ import org.apache.wicket.Component; import org.apache.wicket.PageParameters; import org.apache.wicket.markup.html.basic.Label; -import org.apache.wicket.resource.ContextRelativeResource; -import org.apache.wicket.util.resource.ResourceStreamNotFoundException; import org.eclipse.jgit.lib.Constants; import com.gitblit.GitBlit; @@ -35,13 +33,16 @@ import com.gitblit.models.RepositoryModel; import com.gitblit.utils.MarkdownUtils; import com.gitblit.utils.StringUtils; +import com.gitblit.wicket.CacheControl; import com.gitblit.wicket.GitBlitWebSession; import com.gitblit.wicket.PageRegistration; +import com.gitblit.wicket.CacheControl.LastModified; import com.gitblit.wicket.PageRegistration.DropDownMenuItem; import com.gitblit.wicket.PageRegistration.DropDownMenuRegistration; import com.gitblit.wicket.WicketUtils; import com.gitblit.wicket.panels.RepositoriesPanel; +@CacheControl(LastModified.ACTIVITY) public class RepositoriesPage extends RootPage { public RepositoriesPage() { @@ -160,14 +161,14 @@ String message; InputStreamReader reader = null; try { - ContextRelativeResource res = WicketUtils.getResource(name); - InputStream is = res.getResourceStream().getInputStream(); + InputStream is = getClass().getResourceAsStream("/" + name); + if (is == null) { + continue; + } reader = new InputStreamReader(is, Constants.CHARACTER_ENCODING); message = MarkdownUtils.transformMarkdown(reader); reader.close(); return message; - } catch (ResourceStreamNotFoundException t) { - continue; } catch (Throwable t) { message = MessageFormat.format(getString("gb.failedToReadMessage"), file); error(message, t, false); -- Gitblit v1.9.1