From 11c14e192b907acd3fdc2d6a9bcf4faafc593afe Mon Sep 17 00:00:00 2001
From: Rafael Cavazin <rafaelcavazin@gmail.com>
Date: Sun, 27 Jan 2013 11:13:06 -0500
Subject: [PATCH] updating latest props, and some pt-br fixing
---
src/com/gitblit/wicket/panels/BasePanel.java | 30 +++++++++++++++++++++++-------
1 files changed, 23 insertions(+), 7 deletions(-)
diff --git a/src/com/gitblit/wicket/panels/BasePanel.java b/src/com/gitblit/wicket/panels/BasePanel.java
index 8ea2a69..ec87917 100644
--- a/src/com/gitblit/wicket/panels/BasePanel.java
+++ b/src/com/gitblit/wicket/panels/BasePanel.java
@@ -15,6 +15,7 @@
*/
package com.gitblit.wicket.panels;
+import java.util.ResourceBundle;
import java.util.TimeZone;
import org.apache.wicket.AttributeModifier;
@@ -25,12 +26,15 @@
import com.gitblit.Constants;
import com.gitblit.GitBlit;
import com.gitblit.Keys;
+import com.gitblit.utils.TimeUtils;
import com.gitblit.wicket.GitBlitWebSession;
import com.gitblit.wicket.WicketUtils;
public abstract class BasePanel extends Panel {
private static final long serialVersionUID = 1L;
+
+ private transient TimeUtils timeUtils;
public BasePanel(String wicketId) {
super(wicketId);
@@ -38,7 +42,20 @@
protected TimeZone getTimeZone() {
return GitBlit.getBoolean(Keys.web.useClientTimezone, false) ? GitBlitWebSession.get()
- .getTimezone() : TimeZone.getDefault();
+ .getTimezone() : GitBlit.getTimezone();
+ }
+
+ protected TimeUtils getTimeUtils() {
+ if (timeUtils == null) {
+ ResourceBundle bundle;
+ try {
+ bundle = ResourceBundle.getBundle("com.gitblit.wicket.GitBlitWebApp", GitBlitWebSession.get().getLocale());
+ } catch (Throwable t) {
+ bundle = ResourceBundle.getBundle("com.gitblit.wicket.GitBlitWebApp");
+ }
+ timeUtils = new TimeUtils(bundle);
+ }
+ return timeUtils;
}
protected void setPersonSearchTooltip(Component component, String value, Constants.SearchType searchType) {
@@ -72,17 +89,16 @@
private static final long serialVersionUID = 1L;
- public JavascriptTextPrompt(String event, String msg) {
+ private String initialValue = "";
+
+ public JavascriptTextPrompt(String event, String msg, String value) {
super(event, true, new Model<String>(msg));
+ initialValue = value;
}
protected String newValue(final String currentValue, final String message) {
String result = "var userText = prompt('" + message + "','"
- + (currentValue == null ? "" : currentValue) + "'); " + "return userText; ";
- // String result = prefix;
- // if (currentValue != null) {
- // result = prefix + currentValue;
- // }
+ + (initialValue == null ? "" : initialValue) + "'); " + "return userText; ";
return result;
}
}
--
Gitblit v1.9.1