From 4cb8de6f266bd2bd43c8e0912251b41337524488 Mon Sep 17 00:00:00 2001 From: tosmers Date: Sun, 15 Feb 2015 18:54:53 +0000 Subject: [PATCH] =?UTF-8?q?[UPDATE]=20In=20der=20Klasse=20ccm-portlet-book?= =?UTF-8?q?marks/src/com/arsdigita/portlet/bookmarks/ui/BookmarksPortletEd?= =?UTF-8?q?itor.java=20den=20ersten=20Parameter=20der=20add-Methode=20in?= =?UTF-8?q?=20der=20Zeile=20251,=20252,=20254=20und=20258=20umgeschrieben,?= =?UTF-8?q?=20um=20die=20Funktionalit=C3=A4t=20der=20GlobalizationUtil,=20?= =?UTF-8?q?die=20neu=20in=20diesem=20Paket=20ist,=20auszun=C3=BCtzen.=20Di?= =?UTF-8?q?e=20Konstatnen=20in=20ccm-portlet-bookmarks/src/com/arsdigita/p?= =?UTF-8?q?ortlet/bookmarks/BookmarkConstants.java=20umgeschrieben.=20(wer?= =?UTF-8?q?den=20noch=20gel=C3=B6scht)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit git-svn-id: https://svn.libreccm.org/ccm/trunk@3207 8810af33-2d31-482b-a856-94f89814c4df --- .../portlet/bookmarks/BookmarkConstants.java | 15 ++++++++------- .../bookmarks/ui/BookmarksPortletEditor.java | 11 ++++++----- 2 files changed, 14 insertions(+), 12 deletions(-) diff --git a/ccm-portlet-bookmarks/src/com/arsdigita/portlet/bookmarks/BookmarkConstants.java b/ccm-portlet-bookmarks/src/com/arsdigita/portlet/bookmarks/BookmarkConstants.java index 4e812ffaa..46f03cf60 100644 --- a/ccm-portlet-bookmarks/src/com/arsdigita/portlet/bookmarks/BookmarkConstants.java +++ b/ccm-portlet-bookmarks/src/com/arsdigita/portlet/bookmarks/BookmarkConstants.java @@ -8,6 +8,7 @@ package com.arsdigita.portlet.bookmarks; import com.arsdigita.bebop.Label; import com.arsdigita.globalization.GlobalizedMessage; +import com.arsdigita.portlet.bookmarks.util.GlobalizationUtil; /** * @author cgyg9330 @@ -44,13 +45,13 @@ public interface BookmarkConstants { // editing - public static final String NO_BOOKMARKS_YET = (String)new GlobalizedMessage("bookmarks.header.no-bookmarks", BUNDLE_NAME).localize(); - public static final String EXISTING_BOOKMARKS = (String)new GlobalizedMessage("bookmarks.header.existing-bookmarks", BUNDLE_NAME).localize(); - public static final String NEW_WINDOW = (String)new GlobalizedMessage("bookmarks.new-window", BUNDLE_NAME).localize(); - public static final Label ADD_NEW_BOOKMARK_LABEL = new Label((String)new GlobalizedMessage("bookmarks.add", BUNDLE_NAME).localize(), Label.BOLD); - public static final Label TITLE_LABEL = new Label((String)new GlobalizedMessage("bookmarks.title", BUNDLE_NAME).localize(), Label.BOLD); - public static final Label DESCRIPTION_LABEL = new Label((String)new GlobalizedMessage("bookmarks.description", BUNDLE_NAME).localize(), Label.BOLD); - public static final Label URL_LABEL = new Label((String)new GlobalizedMessage("bookmarks.url", BUNDLE_NAME).localize(), Label.BOLD); + public static final GlobalizedMessage NO_BOOKMARKS_YET = GlobalizationUtil.globalize("bookmarks.header.no-bookmarks"); + public static final GlobalizedMessage EXISTING_BOOKMARKS = GlobalizationUtil.globalize("bookmarks.header.existing-bookmarks"); + public static final GlobalizedMessage NEW_WINDOW = GlobalizationUtil.globalize("bookmarks.new-window"); + public static final Label ADD_NEW_BOOKMARK_LABEL = new Label(GlobalizationUtil.globalize("bookmarks.add"), Label.BOLD); + public static final Label TITLE_LABEL = new Label(GlobalizationUtil.globalize("bookmarks.title"), Label.BOLD); + public static final Label DESCRIPTION_LABEL = new Label(GlobalizationUtil.globalize("bookmarks.description"), Label.BOLD); + public static final Label URL_LABEL = new Label(GlobalizationUtil.globalize("bookmarks.url"), Label.BOLD); // errors diff --git a/ccm-portlet-bookmarks/src/com/arsdigita/portlet/bookmarks/ui/BookmarksPortletEditor.java b/ccm-portlet-bookmarks/src/com/arsdigita/portlet/bookmarks/ui/BookmarksPortletEditor.java index 868d83b2b..35aedc0d4 100644 --- a/ccm-portlet-bookmarks/src/com/arsdigita/portlet/bookmarks/ui/BookmarksPortletEditor.java +++ b/ccm-portlet-bookmarks/src/com/arsdigita/portlet/bookmarks/ui/BookmarksPortletEditor.java @@ -209,7 +209,8 @@ public class BookmarksPortletEditor m_description = new TextField(new StringParameter(Link.DESCRIPTION)); m_newWindow = new CheckboxGroup(Link.TARGET_WINDOW); - m_newWindow.addOption(new Option(NEW_WINDOW_YES, NEW_WINDOW)); + m_newWindow.addOption(new Option(NEW_WINDOW_YES, new Label( + GlobalizationUtil.globalize("bookmarks.new-window")))); try { m_newWindow.addPrintListener(new PrintListener() { @@ -247,14 +248,14 @@ public class BookmarksPortletEditor add(m_existingBookmarks, ColumnPanel.FULL_WIDTH); add(new HorizontalLine(), ColumnPanel.FULL_WIDTH); - add(ADD_NEW_BOOKMARK_LABEL, ColumnPanel.FULL_WIDTH); - add(TITLE_LABEL, ColumnPanel.RIGHT); + add(new Label(GlobalizationUtil.globalize("bookmarks.add"), Label.BOLD), ColumnPanel.FULL_WIDTH); + add(new Label(GlobalizationUtil.globalize("bookmarks.title"), Label.BOLD), ColumnPanel.RIGHT); add(m_title); - add(DESCRIPTION_LABEL, ColumnPanel.RIGHT); + add(new Label(GlobalizationUtil.globalize("bookmarks.description"), Label.BOLD), ColumnPanel.RIGHT); add(m_description); - add(URL_LABEL, ColumnPanel.RIGHT); + add(new Label(GlobalizationUtil.globalize("bookmarks.url"), Label.BOLD), ColumnPanel.RIGHT); add(m_url); add(new Label("")); // fill up the left hand column add(m_newWindow);