From 9af47c10c6a268877c1d232c8d71ee6df4f8a7ab Mon Sep 17 00:00:00 2001 From: Jeroen Baten <jeroen@jeroenbaten.nl> Date: Fri, 04 Jan 2013 05:18:37 -0500 Subject: [PATCH] Dutch translation before spellcheck --- src/com/gitblit/wicket/panels/BasePanel.java | 66 +++++++++++++++++++++++++++++--- 1 files changed, 59 insertions(+), 7 deletions(-) diff --git a/src/com/gitblit/wicket/panels/BasePanel.java b/src/com/gitblit/wicket/panels/BasePanel.java index 6ebb8a7..ec87917 100644 --- a/src/com/gitblit/wicket/panels/BasePanel.java +++ b/src/com/gitblit/wicket/panels/BasePanel.java @@ -1,5 +1,21 @@ +/* + * Copyright 2011 gitblit.com. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + */ package com.gitblit.wicket.panels; +import java.util.ResourceBundle; import java.util.TimeZone; import org.apache.wicket.AttributeModifier; @@ -7,33 +23,50 @@ import org.apache.wicket.markup.html.panel.Panel; import org.apache.wicket.model.Model; +import com.gitblit.Constants; import com.gitblit.GitBlit; import com.gitblit.Keys; -import com.gitblit.utils.JGitUtils.SearchType; +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); } protected TimeZone getTimeZone() { - return GitBlit.self().settings().getBoolean(Keys.web.useClientTimezone, false) ? GitBlitWebSession.get().getTimezone() : TimeZone.getDefault(); + return GitBlit.getBoolean(Keys.web.useClientTimezone, false) ? GitBlitWebSession.get() + .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, SearchType searchType) { - if (searchType.equals(SearchType.AUTHOR)) { + protected void setPersonSearchTooltip(Component component, String value, Constants.SearchType searchType) { + if (searchType.equals(Constants.SearchType.AUTHOR)) { WicketUtils.setHtmlTooltip(component, getString("gb.searchForAuthor") + " " + value); - } else if (searchType.equals(SearchType.COMMITTER)) { + } else if (searchType.equals(Constants.SearchType.COMMITTER)) { WicketUtils.setHtmlTooltip(component, getString("gb.searchForCommitter") + " " + value); } } - public class JavascriptEventConfirmation extends AttributeModifier { + public static class JavascriptEventConfirmation extends AttributeModifier { private static final long serialVersionUID = 1L; @@ -42,7 +75,8 @@ } protected String newValue(final String currentValue, final String replacementValue) { - String prefix = "var conf = confirm('" + replacementValue + "'); " + "if (!conf) return false; "; + String prefix = "var conf = confirm('" + replacementValue + "'); " + + "if (!conf) return false; "; String result = prefix; if (currentValue != null) { result = prefix + currentValue; @@ -50,4 +84,22 @@ return result; } } + + public static class JavascriptTextPrompt extends AttributeModifier { + + private static final long serialVersionUID = 1L; + + 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 + "','" + + (initialValue == null ? "" : initialValue) + "'); " + "return userText; "; + return result; + } + } } -- Gitblit v1.9.1