From 56d1c441d3b591c161e36e5a001cca83a7d17c93 Mon Sep 17 00:00:00 2001
From: Dongsu, KIM <ds5apn@gmail.com>
Date: Fri, 19 Jul 2013 05:39:08 -0400
Subject: [PATCH] Update Korean Translation
---
src/main/java/com/gitblit/wicket/pages/BasePage.java | 111 ++++++++++++++-----------------------------------------
1 files changed, 28 insertions(+), 83 deletions(-)
diff --git a/src/main/java/com/gitblit/wicket/pages/BasePage.java b/src/main/java/com/gitblit/wicket/pages/BasePage.java
index bb7d8c9..71713cd 100644
--- a/src/main/java/com/gitblit/wicket/pages/BasePage.java
+++ b/src/main/java/com/gitblit/wicket/pages/BasePage.java
@@ -32,17 +32,13 @@
import javax.servlet.http.HttpServletRequest;
import org.apache.wicket.Application;
-import org.apache.wicket.MarkupContainer;
+import org.apache.wicket.Page;
import org.apache.wicket.PageParameters;
import org.apache.wicket.RedirectToUrlException;
-import org.apache.wicket.RequestCycle;
-import org.apache.wicket.RestartResponseException;
import org.apache.wicket.markup.html.CSSPackageResource;
import org.apache.wicket.markup.html.basic.Label;
-import org.apache.wicket.markup.html.link.BookmarkablePageLink;
import org.apache.wicket.markup.html.link.ExternalLink;
import org.apache.wicket.markup.html.panel.FeedbackPanel;
-import org.apache.wicket.markup.html.panel.Fragment;
import org.apache.wicket.protocol.http.RequestUtils;
import org.apache.wicket.protocol.http.servlet.ServletWebRequest;
import org.slf4j.Logger;
@@ -56,14 +52,13 @@
import com.gitblit.GitBlit;
import com.gitblit.Keys;
import com.gitblit.models.ProjectModel;
-import com.gitblit.models.RepositoryModel;
import com.gitblit.models.TeamModel;
import com.gitblit.models.UserModel;
import com.gitblit.utils.StringUtils;
import com.gitblit.utils.TimeUtils;
+import com.gitblit.wicket.GitBlitWebApp;
import com.gitblit.wicket.GitBlitWebSession;
import com.gitblit.wicket.WicketUtils;
-import com.gitblit.wicket.panels.LinkPanel;
public abstract class BasePage extends SessionPage {
@@ -105,7 +100,7 @@
} catch (Throwable t) {
bundle = ResourceBundle.getBundle("com.gitblit.wicket.GitBlitWebApp");
}
- timeUtils = new TimeUtils(bundle);
+ timeUtils = new TimeUtils(bundle, getTimeZone());
}
return timeUtils;
}
@@ -129,27 +124,22 @@
}
protected void setupPage(String repositoryName, String pageName) {
+ String siteName = GitBlit.getString(Keys.web.siteName, Constants.NAME);
+ if (StringUtils.isEmpty(siteName)) {
+ siteName = Constants.NAME;
+ }
if (repositoryName != null && repositoryName.trim().length() > 0) {
- add(new Label("title", getServerName() + " - " + repositoryName));
+ add(new Label("title", repositoryName + " - " + siteName));
} else {
- add(new Label("title", getServerName()));
+ add(new Label("title", siteName));
}
- ExternalLink rootLink = new ExternalLink("rootLink", urlFor(RepositoriesPage.class, null).toString());
+ ExternalLink rootLink = new ExternalLink("rootLink", urlFor(GitBlitWebApp.HOME_PAGE_CLASS, null).toString());
WicketUtils.setHtmlTooltip(rootLink, GitBlit.getString(Keys.web.siteName, Constants.NAME));
add(rootLink);
// Feedback panel for info, warning, and non-fatal error messages
add(new FeedbackPanel("feedback"));
-
- // footer
- if (GitBlit.getBoolean(Keys.web.authenticateViewPages, true)
- || GitBlit.getBoolean(Keys.web.authenticateAdminPages, true)) {
- UserFragment userFragment = new UserFragment("userPanel", "userFragment", BasePage.this);
- add(userFragment);
- } else {
- add(new Label("userPanel", ""));
- }
add(new Label("gbVersion", "v" + Constants.getVersion()));
if (GitBlit.getBoolean(Keys.web.aggressiveHeapManagement, false)) {
@@ -255,21 +245,6 @@
return req.getServerName();
}
- public static String getRepositoryUrl(RepositoryModel repository) {
- StringBuilder sb = new StringBuilder();
- sb.append(WicketUtils.getGitblitURL(RequestCycle.get().getRequest()));
- sb.append(Constants.GIT_PATH);
- sb.append(repository.name);
-
- // inject username into repository url if authentication is required
- if (repository.accessRestriction.exceeds(AccessRestrictionType.NONE)
- && GitBlitWebSession.get().isLoggedIn()) {
- String username = GitBlitWebSession.get().getUsername();
- sb.insert(sb.indexOf("://") + 3, username + "@");
- }
- return sb.toString();
- }
-
protected List<ProjectModel> getProjectModels() {
final UserModel user = GitBlitWebSession.get().getUser();
List<ProjectModel> projects = GitBlit.self().getProjectModels(user, true);
@@ -358,22 +333,28 @@
}
public void error(String message, boolean redirect) {
- logger.error(message + " for " + GitBlitWebSession.get().getUsername());
- if (redirect) {
- GitBlitWebSession.get().cacheErrorMessage(message);
- String relativeUrl = urlFor(RepositoriesPage.class, null).toString();
- String absoluteUrl = RequestUtils.toAbsolutePath(relativeUrl);
- throw new RedirectToUrlException(absoluteUrl);
- } else {
- super.error(message);
- }
+ error(message, null, redirect ? getApplication().getHomePage() : null);
}
public void error(String message, Throwable t, boolean redirect) {
- logger.error(message, t);
- if (redirect) {
+ error(message, t, getApplication().getHomePage());
+ }
+
+ public void error(String message, Throwable t, Class<? extends Page> toPage) {
+ error(message, t, toPage, null);
+ }
+
+ public void error(String message, Throwable t, Class<? extends Page> toPage, PageParameters params) {
+ if (t == null) {
+ logger.error(message + " for " + GitBlitWebSession.get().getUsername());
+ } else {
+ logger.error(message + " for " + GitBlitWebSession.get().getUsername(), t);
+ }
+ if (toPage != null) {
GitBlitWebSession.get().cacheErrorMessage(message);
- throw new RestartResponseException(getApplication().getHomePage());
+ String relativeUrl = urlFor(toPage, params).toString();
+ String absoluteUrl = RequestUtils.toAbsolutePath(relativeUrl);
+ throw new RedirectToUrlException(absoluteUrl);
} else {
super.error(message);
}
@@ -387,41 +368,5 @@
GitBlitWebSession.get().cacheRequest(getClass());
}
error(message, true);
- }
-
- /**
- * Panel fragment for displaying login or logout/change_password links.
- *
- */
- static class UserFragment extends Fragment {
-
- private static final long serialVersionUID = 1L;
-
- public UserFragment(String id, String markupId, MarkupContainer markupProvider) {
- super(id, markupId, markupProvider);
-
- GitBlitWebSession session = GitBlitWebSession.get();
- if (session.isLoggedIn()) {
- UserModel user = session.getUser();
- boolean editCredentials = GitBlit.self().supportsCredentialChanges(user);
- boolean standardLogin = session.authenticationType.isStandard();
-
- // username, logout, and change password
- add(new Label("username", user.getDisplayName() + ":"));
- add(new LinkPanel("loginLink", null, markupProvider.getString("gb.logout"),
- LogoutPage.class).setVisible(standardLogin));
-
- // quick and dirty hack for showing a separator
- add(new Label("separator", "|").setVisible(standardLogin && editCredentials));
- add(new BookmarkablePageLink<Void>("changePasswordLink",
- ChangePasswordPage.class).setVisible(editCredentials));
- } else {
- // login
- add(new Label("username").setVisible(false));
- add(new Label("loginLink").setVisible(false));
- add(new Label("separator").setVisible(false));
- add(new Label("changePasswordLink").setVisible(false));
- }
- }
}
}
--
Gitblit v1.9.1