Return-Path: Delivered-To: apmail-directory-commits-archive@www.apache.org Received: (qmail 32960 invoked from network); 27 Nov 2008 17:54:57 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (140.211.11.2) by minotaur.apache.org with SMTP; 27 Nov 2008 17:54:57 -0000 Received: (qmail 73436 invoked by uid 500); 27 Nov 2008 17:55:08 -0000 Delivered-To: apmail-directory-commits-archive@directory.apache.org Received: (qmail 73406 invoked by uid 500); 27 Nov 2008 17:55:08 -0000 Mailing-List: contact commits-help@directory.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@directory.apache.org Delivered-To: mailing list commits@directory.apache.org Received: (qmail 73397 invoked by uid 99); 27 Nov 2008 17:55:08 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 27 Nov 2008 09:55:08 -0800 X-ASF-Spam-Status: No, hits=-2000.0 required=10.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 27 Nov 2008 17:53:49 +0000 Received: by eris.apache.org (Postfix, from userid 65534) id F2D9B238899A; Thu, 27 Nov 2008 09:54:05 -0800 (PST) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r721250 - in /directory/studio/trunk/ldapbrowser-ui/src/main: java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/ resources/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/ Date: Thu, 27 Nov 2008 17:54:05 -0000 To: commits@directory.apache.org From: felixk@apache.org X-Mailer: svnmailer-1.0.8 Message-Id: <20081127175405.F2D9B238899A@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: felixk Date: Thu Nov 27 09:54:04 2008 New Revision: 721250 URL: http://svn.apache.org/viewvc?rev=721250&view=rev Log: - Externalize Strings - Add German translation Added: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/Messages.java (with props) directory/studio/trunk/ldapbrowser-ui/src/main/resources/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/ directory/studio/trunk/ldapbrowser-ui/src/main/resources/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/messages.properties (with props) directory/studio/trunk/ldapbrowser-ui/src/main/resources/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/messages_de.properties (with props) Modified: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/FilterAndSortRunnable.java directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/OpenDefaultEditorAction.java directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/OpenEntryEditorAction.java directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/OpenSearchResultEditorPreferencePage.java directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorActionGroup.java directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorContentProvider.java directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorInput.java directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorNavigationLocation.java directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorPasteAction.java directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorQuickFilterWidget.java directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/ShowDNAction.java directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/ShowLinksAction.java directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/ShowQuickFilterAction.java Modified: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/FilterAndSortRunnable.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/FilterAndSortRunnable.java?rev=721250&r1=721249&r2=721250&view=diff ============================================================================== --- directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/FilterAndSortRunnable.java (original) +++ directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/FilterAndSortRunnable.java Thu Nov 27 09:54:04 2008 @@ -70,7 +70,7 @@ */ public String getName() { - return ""; + return ""; //$NON-NLS-1$ } @@ -88,17 +88,17 @@ */ public void run( StudioProgressMonitor monitor ) { - monitor.beginTask( "Filter and Sort", 3 ); + monitor.beginTask( Messages.getString( "FilterAndSortRunnable.FilterAndSort" ), 3 ); //$NON-NLS-1$ monitor.worked( 1 ); - monitor.setTaskName( "Filter and Sort" ); + monitor.setTaskName( Messages.getString( "FilterAndSortRunnable.FilterAndSort" ) ); //$NON-NLS-1$ - monitor.reportProgress( "Filtering..." ); - this.filteredAndSortedElements = this.configuration.getFilter().filter( this.mainWidget.getViewer(), "", + monitor.reportProgress( Messages.getString( "FilterAndSortRunnable.Filtering" ) ); //$NON-NLS-1$ + this.filteredAndSortedElements = this.configuration.getFilter().filter( this.mainWidget.getViewer(), "", //$NON-NLS-1$ elements ); monitor.worked( 1 ); - monitor.reportProgress( "Sorting..." ); + monitor.reportProgress( Messages.getString( "FilterAndSortRunnable.Sorting" ) ); //$NON-NLS-1$ this.configuration.getSorter().sort( this.mainWidget.getViewer(), this.filteredAndSortedElements ); monitor.worked( 1 ); } @@ -118,7 +118,7 @@ */ public String getErrorMessage() { - return ""; + return ""; //$NON-NLS-1$ } Added: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/Messages.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/Messages.java?rev=721250&view=auto ============================================================================== --- directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/Messages.java (added) +++ directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/Messages.java Thu Nov 27 09:54:04 2008 @@ -0,0 +1,51 @@ +/* + * Licensed to the Apache Software Foundation (ASF) under one + * or more contributor license agreements. See the NOTICE file + * distributed with this work for additional information + * regarding copyright ownership. The ASF licenses this file + * to you 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 org.apache.directory.studio.ldapbrowser.ui.editors.searchresult; + + +import java.util.MissingResourceException; +import java.util.ResourceBundle; + + +public class Messages +{ + private static final String BUNDLE_NAME = "org.apache.directory.studio.ldapbrowser.ui.editors.searchresult.messages"; //$NON-NLS-1$ + + private static final ResourceBundle RESOURCE_BUNDLE = ResourceBundle.getBundle( BUNDLE_NAME ); + + + private Messages() + { + } + + + public static String getString( String key ) + { + try + { + return RESOURCE_BUNDLE.getString( key ); + } + catch ( MissingResourceException e ) + { + return '!' + key + '!'; + } + } +} Propchange: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/Messages.java ------------------------------------------------------------------------------ svn:eol-style = native Modified: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/OpenDefaultEditorAction.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/OpenDefaultEditorAction.java?rev=721250&r1=721249&r2=721250&view=diff ============================================================================== --- directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/OpenDefaultEditorAction.java (original) +++ directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/OpenDefaultEditorAction.java Thu Nov 27 09:54:04 2008 @@ -108,7 +108,7 @@ */ public String getText() { - return "Edit Value"; + return Messages.getString( "OpenDefaultEditorAction.EditValue" ); //$NON-NLS-1$ } Modified: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/OpenEntryEditorAction.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/OpenEntryEditorAction.java?rev=721250&r1=721249&r2=721250&view=diff ============================================================================== --- directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/OpenEntryEditorAction.java (original) +++ directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/OpenEntryEditorAction.java Thu Nov 27 09:54:04 2008 @@ -129,7 +129,7 @@ */ public String getText() { - return "Edit Entry..."; + return Messages.getString( "OpenEntryEditorAction.EditEntry" ); //$NON-NLS-1$ } Modified: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/OpenSearchResultEditorPreferencePage.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/OpenSearchResultEditorPreferencePage.java?rev=721250&r1=721249&r2=721250&view=diff ============================================================================== --- directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/OpenSearchResultEditorPreferencePage.java (original) +++ directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/OpenSearchResultEditorPreferencePage.java Thu Nov 27 09:54:04 2008 @@ -42,8 +42,8 @@ */ public OpenSearchResultEditorPreferencePage() { - super.setText( "Preferences..." ); - super.setToolTipText( "Preferences..." ); + super.setText( Messages.getString( "OpenSearchResultEditorPreferencePage.Preferences" ) ); //$NON-NLS-1$ + super.setToolTipText( Messages.getString( "OpenSearchResultEditorPreferencePage.PreferencesToolTip" ) ); //$NON-NLS-1$ super.setEnabled( true ); } Modified: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorActionGroup.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorActionGroup.java?rev=721250&r1=721249&r2=721250&view=diff ============================================================================== --- directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorActionGroup.java (original) +++ directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorActionGroup.java Thu Nov 27 09:54:04 2008 @@ -104,61 +104,61 @@ /** The open value editor preferences action. */ private ValueEditorPreferencesAction openValueEditorPreferencesAction; - private static final String copyTableAction = "copyTableAction"; + private static final String copyTableAction = "copyTableAction"; //$NON-NLS-1$ - private static final String refreshSearchAction = "refreshSearchAction"; + private static final String refreshSearchAction = "refreshSearchAction"; //$NON-NLS-1$ - private final static String newValueAction = "newValueAction"; + private final static String newValueAction = "newValueAction"; //$NON-NLS-1$ - private final static String newSearchAction = "newSearchAction"; + private final static String newSearchAction = "newSearchAction"; //$NON-NLS-1$ - private static final String newBatchOperationAction = "newBatchOperationAction"; + private static final String newBatchOperationAction = "newBatchOperationAction"; //$NON-NLS-1$ - private final static String copyAction = "copyAction"; + private final static String copyAction = "copyAction"; //$NON-NLS-1$ - private final static String pasteAction = "pasteAction"; + private final static String pasteAction = "pasteAction"; //$NON-NLS-1$ - private final static String deleteAction = "deleteAction"; + private final static String deleteAction = "deleteAction"; //$NON-NLS-1$ - private static final String copyDnAction = "copyDnAction"; + private static final String copyDnAction = "copyDnAction"; //$NON-NLS-1$ - private static final String copyUrlAction = "copyUrlAction"; + private static final String copyUrlAction = "copyUrlAction"; //$NON-NLS-1$ - private static final String copyAttriuteDescriptionAction = "copyAttriuteDescriptionAction"; + private static final String copyAttriuteDescriptionAction = "copyAttriuteDescriptionAction"; //$NON-NLS-1$ - private static final String copyValueUtf8Action = "copyValueUtf8Action"; + private static final String copyValueUtf8Action = "copyValueUtf8Action"; //$NON-NLS-1$ - private static final String copyValueBase64Action = "copyValueBase64Action"; + private static final String copyValueBase64Action = "copyValueBase64Action"; //$NON-NLS-1$ - private static final String copyValueHexAction = "copyValueHexAction"; + private static final String copyValueHexAction = "copyValueHexAction"; //$NON-NLS-1$ - private static final String copyValueAsLdifAction = "copyValueAsLdifAction"; + private static final String copyValueAsLdifAction = "copyValueAsLdifAction"; //$NON-NLS-1$ - private static final String copySearchFilterAction = "copySearchFilterAction"; + private static final String copySearchFilterAction = "copySearchFilterAction"; //$NON-NLS-1$ - private static final String copyNotSearchFilterAction = "copyNotSearchFilterAction"; + private static final String copyNotSearchFilterAction = "copyNotSearchFilterAction"; //$NON-NLS-1$ - private static final String copyAndSearchFilterAction = "copyAndSearchFilterAction"; + private static final String copyAndSearchFilterAction = "copyAndSearchFilterAction"; //$NON-NLS-1$ - private static final String copyOrSearchFilterAction = "copyOrSearchFilterAction"; + private static final String copyOrSearchFilterAction = "copyOrSearchFilterAction"; //$NON-NLS-1$ - private static final String openSearchResultAction = "showEntryInSearchResultsAction"; + private static final String openSearchResultAction = "showEntryInSearchResultsAction"; //$NON-NLS-1$ - private static final String locateDnInDitAction = "locateDnInDitAction"; + private static final String locateDnInDitAction = "locateDnInDitAction"; //$NON-NLS-1$ - private static final String showOcdAction = "showOcdAction"; + private static final String showOcdAction = "showOcdAction"; //$NON-NLS-1$ - private static final String showAtdAction = "showAtdAction"; + private static final String showAtdAction = "showAtdAction"; //$NON-NLS-1$ - private static final String showEqualityMrdAction = "showEqualityMrdAction"; + private static final String showEqualityMrdAction = "showEqualityMrdAction"; //$NON-NLS-1$ - private static final String showSubstringMrdAction = "showSubstringMrdAction"; + private static final String showSubstringMrdAction = "showSubstringMrdAction"; //$NON-NLS-1$ - private static final String showOrderingMrdAction = "showOrderingMrdAction"; + private static final String showOrderingMrdAction = "showOrderingMrdAction"; //$NON-NLS-1$ - private static final String showLsdAction = "showLsdAction"; + private static final String showLsdAction = "showLsdAction"; //$NON-NLS-1$ - private final static String propertyDialogAction = "propertyDialogAction"; + private final static String propertyDialogAction = "propertyDialogAction"; //$NON-NLS-1$ /** The search result editor action map. */ private Map searchResultEditorActionMap; @@ -399,7 +399,8 @@ // navigation menuManager.add( searchResultEditorActionMap.get( locateDnInDitAction ) ); menuManager.add( searchResultEditorActionMap.get( openSearchResultAction ) ); - MenuManager schemaMenuManager = new MenuManager( "Open Schema Browser" ); + MenuManager schemaMenuManager = new MenuManager( Messages + .getString( "SearchResultEditorActionGroup.OpenSchemaBrowser" ) ); //$NON-NLS-1$ schemaMenuManager.add( searchResultEditorActionMap.get( showOcdAction ) ); schemaMenuManager.add( searchResultEditorActionMap.get( showAtdAction ) ); schemaMenuManager.add( searchResultEditorActionMap.get( showEqualityMrdAction ) ); @@ -407,7 +408,7 @@ schemaMenuManager.add( searchResultEditorActionMap.get( showOrderingMrdAction ) ); schemaMenuManager.add( searchResultEditorActionMap.get( showLsdAction ) ); menuManager.add( schemaMenuManager ); - MenuManager showInSubMenu = new MenuManager( "Show In" ); + MenuManager showInSubMenu = new MenuManager( Messages.getString( "SearchResultEditorActionGroup.ShowIn" ) ); //$NON-NLS-1$ showInSubMenu.add( ContributionItemFactory.VIEWS_SHOW_IN.create( PlatformUI.getWorkbench() .getActiveWorkbenchWindow() ) ); menuManager.add( showInSubMenu ); @@ -417,7 +418,8 @@ menuManager.add( searchResultEditorActionMap.get( copyAction ) ); menuManager.add( searchResultEditorActionMap.get( pasteAction ) ); menuManager.add( searchResultEditorActionMap.get( deleteAction ) ); - MenuManager advancedMenuManager = new MenuManager( "Advanced" ); + MenuManager advancedMenuManager = new MenuManager( Messages + .getString( "SearchResultEditorActionGroup.Advanced" ) ); //$NON-NLS-1$ advancedMenuManager.add( searchResultEditorActionMap.get( copyDnAction ) ); advancedMenuManager.add( searchResultEditorActionMap.get( copyUrlAction ) ); advancedMenuManager.add( new Separator() ); @@ -438,7 +440,7 @@ // edit menuManager.add( openDefaultValueEditorActionProxy ); - MenuManager editorMenuManager = new MenuManager( "Edit Value With" ); + MenuManager editorMenuManager = new MenuManager( Messages.getString( "SearchResultEditorActionGroup.EditValue" ) ); //$NON-NLS-1$ if ( openBestValueEditorActionProxy.isEnabled() ) { editorMenuManager.add( openBestValueEditorActionProxy ); Modified: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorContentProvider.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorContentProvider.java?rev=721250&r1=721249&r2=721250&view=diff ============================================================================== --- directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorContentProvider.java (original) +++ directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorContentProvider.java Thu Nov 27 09:54:04 2008 @@ -115,7 +115,7 @@ else if ( elements.length > 0 && mainWidget.getViewer() != null && !mainWidget.getViewer().getTable().isDisposed() ) { - filteredAndSortedElements = configuration.getFilter().filter( mainWidget.getViewer(), "", elements ); + filteredAndSortedElements = configuration.getFilter().filter( mainWidget.getViewer(), "", elements ); //$NON-NLS-1$ configuration.getSorter().sort( mainWidget.getViewer(), filteredAndSortedElements ); } } @@ -124,7 +124,7 @@ mainWidget.getViewer().setItemCount( filteredAndSortedElements.length ); // update state - String url = ""; + String url = ""; //$NON-NLS-1$ boolean enabled = true; if ( input != null && input instanceof ISearch ) { @@ -132,26 +132,28 @@ if ( filteredAndSortedElements.length < elements.length ) { - url += filteredAndSortedElements.length + " of "; + url += filteredAndSortedElements.length + Messages.getString( "SearchResultEditorContentProvider.Of" ); //$NON-NLS-1$ } if ( search.getSearchResults() == null ) { - url += "Search not performed - "; + url += Messages.getString( "SearchResultEditorContentProvider.SearchNotPerformed" ); //$NON-NLS-1$ enabled = false; } else if ( search.getSearchResults().length == 1 ) { - url += search.getSearchResults().length + " Result - "; + url += search.getSearchResults().length + + Messages.getString( "SearchResultEditorContentProvider.Result" ); //$NON-NLS-1$ } else { - url += search.getSearchResults().length + " Results - "; + url += search.getSearchResults().length + + Messages.getString( "SearchResultEditorContentProvider.Results" ); //$NON-NLS-1$ } // url += search.getURL(); - url += "Search Base: " + search.getSearchBase().getUpName() + " - "; - url += "Filter: " + search.getFilter(); + url += Messages.getString( "SearchResultEditorContentProvider.SearchBase" ) + search.getSearchBase().getUpName() + " - "; //$NON-NLS-1$ //$NON-NLS-2$ + url += Messages.getString( "SearchResultEditorContentProvider.Filter" ) + search.getFilter(); //$NON-NLS-1$ boolean showDn = BrowserUIPlugin.getDefault().getPreferenceStore().getBoolean( BrowserUIConstants.PREFERENCE_SEARCHRESULTEDITOR_SHOW_DN ) @@ -161,7 +163,7 @@ } else { - url = "No search selected"; + url = Messages.getString( "SearchResultEditorContentProvider.NoSearchSelected" ); //$NON-NLS-1$ enabled = false; } Modified: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorInput.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorInput.java?rev=721250&r1=721249&r2=721250&view=diff ============================================================================== --- directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorInput.java (original) +++ directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorInput.java Thu Nov 27 09:54:04 2008 @@ -95,7 +95,7 @@ */ public String getName() { - return "Search Result Editor"; + return Messages.getString( "SearchResultEditorInput.SearchResultEditor" ); //$NON-NLS-1$ } @@ -104,7 +104,7 @@ */ public String getToolTipText() { - return ""; + return Messages.getString( "SearchResultEditorInput.SearchResultEditorToolTip" ); //$NON-NLS-1$ } Modified: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorNavigationLocation.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorNavigationLocation.java?rev=721250&r1=721249&r2=721250&view=diff ============================================================================== --- directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorNavigationLocation.java (original) +++ directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorNavigationLocation.java Thu Nov 27 09:54:04 2008 @@ -24,6 +24,7 @@ import org.apache.directory.studio.ldapbrowser.core.BrowserCorePlugin; import org.apache.directory.studio.ldapbrowser.core.model.IBrowserConnection; import org.apache.directory.studio.ldapbrowser.core.model.ISearch; +import org.eclipse.osgi.util.NLS; import org.eclipse.ui.IEditorPart; import org.eclipse.ui.IMemento; import org.eclipse.ui.INavigationLocation; @@ -58,7 +59,8 @@ ISearch search = getSearch(); if ( search != null ) { - return "Search " + search.getName(); + return NLS.bind( + Messages.getString( "SearchResultEditorNavigationLocation.Search" ), new String[] { search.getName() } ); //$NON-NLS-1$ } else { @@ -73,8 +75,8 @@ public void saveState( IMemento memento ) { ISearch search = getSearch(); - memento.putString( "SEARCH", search.getName() ); - memento.putString( "CONNECTION", search.getBrowserConnection().getConnection().getId() ); + memento.putString( "SEARCH", search.getName() ); //$NON-NLS-1$ + memento.putString( "CONNECTION", search.getBrowserConnection().getConnection().getId() ); //$NON-NLS-1$ } @@ -84,8 +86,8 @@ public void restoreState( IMemento memento ) { IBrowserConnection connection = BrowserCorePlugin.getDefault().getConnectionManager().getBrowserConnectionById( - memento.getString( "CONNECTION" ) ); - ISearch search = connection.getSearchManager().getSearch( memento.getString( "SEARCH" ) ); + memento.getString( "CONNECTION" ) ); //$NON-NLS-1$ + ISearch search = connection.getSearchManager().getSearch( memento.getString( "SEARCH" ) ); //$NON-NLS-1$ super.setInput( new SearchResultEditorInput( search ) ); } @@ -173,7 +175,7 @@ */ public String toString() { - return "" + getSearch(); + return "" + getSearch(); //$NON-NLS-1$ } } Modified: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorPasteAction.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorPasteAction.java?rev=721250&r1=721249&r2=721250&view=diff ============================================================================== --- directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorPasteAction.java (original) +++ directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorPasteAction.java Thu Nov 27 09:54:04 2008 @@ -54,10 +54,10 @@ IValue[] values = getValuesToPaste(); if ( values != null ) { - return values.length > 1 ? "Paste Values" : "Paste Value"; + return values.length > 1 ? Messages.getString( "SearchResultEditorPasteAction.PasteValues" ) : Messages.getString( "SearchResultEditorPasteAction.PasteValue" ); //$NON-NLS-1$ //$NON-NLS-2$ } - return "Paste"; + return Messages.getString( "SearchResultEditorPasteAction.Paste" ); //$NON-NLS-1$ } Modified: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorQuickFilterWidget.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorQuickFilterWidget.java?rev=721250&r1=721249&r2=721250&view=diff ============================================================================== --- directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorQuickFilterWidget.java (original) +++ directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/SearchResultEditorQuickFilterWidget.java Thu Nov 27 09:54:04 2008 @@ -114,8 +114,8 @@ public void modifyText( ModifyEvent e ) { filter.setQuickFilterValue( quickFilterValueText.getText() ); - clearQuickFilterButton.setEnabled( !"".equals( quickFilterValueText.getText() ) ); - if ( !"".equals( quickFilterValueText.getText() ) ) + clearQuickFilterButton.setEnabled( !"".equals( quickFilterValueText.getText() ) ); //$NON-NLS-1$ + if ( !"".equals( quickFilterValueText.getText() ) ) //$NON-NLS-1$ { RGB fgRgb = PreferenceConverter.getColor( BrowserCommonActivator.getDefault().getPreferenceStore(), BrowserCommonConstants.PREFERENCE_QUICKFILTER_FOREGROUND_COLOR ); @@ -138,7 +138,8 @@ } ); clearQuickFilterButton = new Button( innerComposite, SWT.PUSH ); - clearQuickFilterButton.setToolTipText( "Clear Quick Filter" ); + clearQuickFilterButton.setToolTipText( Messages + .getString( "SearchResultEditorQuickFilterWidget.ClearQuickFilterToolTip" ) ); //$NON-NLS-1$ clearQuickFilterButton.setImage( BrowserCommonActivator.getDefault() .getImage( BrowserCommonConstants.IMG_CLEAR ) ); clearQuickFilterButton.setEnabled( false ); @@ -146,8 +147,8 @@ { public void widgetSelected( SelectionEvent e ) { - if ( !"".equals( quickFilterValueText.getText() ) ) - quickFilterValueText.setText( "" ); + if ( !"".equals( quickFilterValueText.getText() ) ) //$NON-NLS-1$ + quickFilterValueText.setText( "" ); //$NON-NLS-1$ } } ); @@ -163,9 +164,9 @@ */ private void destroy() { - if ( !"".equals( quickFilterValueText.getText() ) ) + if ( !"".equals( quickFilterValueText.getText() ) ) //$NON-NLS-1$ { - quickFilterValueText.setText( "" ); + quickFilterValueText.setText( "" ); //$NON-NLS-1$ } innerComposite.dispose(); innerComposite = null; Modified: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/ShowDNAction.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/ShowDNAction.java?rev=721250&r1=721249&r2=721250&view=diff ============================================================================== --- directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/ShowDNAction.java (original) +++ directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/ShowDNAction.java Thu Nov 27 09:54:04 2008 @@ -40,7 +40,7 @@ */ public ShowDNAction() { - super( "Show DN", AS_CHECK_BOX ); + super( Messages.getString( "ShowDNAction.ShowDN" ), AS_CHECK_BOX ); //$NON-NLS-1$ super.setToolTipText( getText() ); super.setEnabled( true ); super.setChecked( BrowserUIPlugin.getDefault().getPreferenceStore().getBoolean( Modified: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/ShowLinksAction.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/ShowLinksAction.java?rev=721250&r1=721249&r2=721250&view=diff ============================================================================== --- directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/ShowLinksAction.java (original) +++ directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/ShowLinksAction.java Thu Nov 27 09:54:04 2008 @@ -40,7 +40,7 @@ */ public ShowLinksAction() { - super( "DN as link", AS_CHECK_BOX ); + super( Messages.getString( "ShowLinksAction.DNAsLink" ), AS_CHECK_BOX ); //$NON-NLS-1$ super.setToolTipText( getText() ); super.setEnabled( true ); super.setChecked( BrowserUIPlugin.getDefault().getPreferenceStore().getBoolean( Modified: directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/ShowQuickFilterAction.java URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/ShowQuickFilterAction.java?rev=721250&r1=721249&r2=721250&view=diff ============================================================================== --- directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/ShowQuickFilterAction.java (original) +++ directory/studio/trunk/ldapbrowser-ui/src/main/java/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/ShowQuickFilterAction.java Thu Nov 27 09:54:04 2008 @@ -33,7 +33,7 @@ /** The Constant SHOW_QUICKFILTER_DIALOGSETTING_KEY. */ public static final String SHOW_QUICKFILTER_DIALOGSETTING_KEY = ShowQuickFilterAction.class.getName() - + ".showQuickFilter"; + + ".showQuickFilter"; //$NON-NLS-1$ /** The quick filter widget. */ private SearchResultEditorQuickFilterWidget quickFilterWidget; @@ -41,8 +41,8 @@ public ShowQuickFilterAction( SearchResultEditorQuickFilterWidget quickFilterWidget ) { - super( "Show Quick Filter", AS_CHECK_BOX ); - super.setToolTipText( "Show Quick Filter" ); + super( Messages.getString( "ShowQuickFilterAction.ShowQuickFilter" ), AS_CHECK_BOX ); //$NON-NLS-1$ + super.setToolTipText( Messages.getString( "ShowQuickFilterAction.ShowQuickFilterToolTip" ) ); //$NON-NLS-1$ super.setImageDescriptor( BrowserCommonActivator.getDefault().getImageDescriptor( BrowserCommonConstants.IMG_FILTER ) ); super.setActionDefinitionId( IWorkbenchActionDefinitionIds.FIND_REPLACE ); Added: directory/studio/trunk/ldapbrowser-ui/src/main/resources/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/messages.properties URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/src/main/resources/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/messages.properties?rev=721250&view=auto ============================================================================== --- directory/studio/trunk/ldapbrowser-ui/src/main/resources/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/messages.properties (added) +++ directory/studio/trunk/ldapbrowser-ui/src/main/resources/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/messages.properties Thu Nov 27 09:54:04 2008 @@ -0,0 +1,46 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you 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. + +FilterAndSortRunnable.FilterAndSort=Filter and Sort +FilterAndSortRunnable.Filtering=Filtering... +FilterAndSortRunnable.Sorting=Sorting... +OpenDefaultEditorAction.EditValue=Edit Value +OpenEntryEditorAction.EditEntry=Edit Entry... +OpenSearchResultEditorPreferencePage.Preferences=Preferences... +OpenSearchResultEditorPreferencePage.PreferencesToolTip=Preferences... +SearchResultEditorActionGroup.Advanced=Advanced +SearchResultEditorActionGroup.EditValue=Edit Value With +SearchResultEditorActionGroup.OpenSchemaBrowser=Open Schema Browser +SearchResultEditorActionGroup.ShowIn=Show In +SearchResultEditorContentProvider.Filter=Filter\: +SearchResultEditorContentProvider.NoSearchSelected=No search selected +SearchResultEditorContentProvider.Of=\ of +SearchResultEditorContentProvider.Result=\ Result - +SearchResultEditorContentProvider.Results=\ Results - +SearchResultEditorContentProvider.SearchBase=Search Base\: +SearchResultEditorContentProvider.SearchNotPerformed=Search not performed - +SearchResultEditorInput.SearchResultEditor=Search Result Editor +SearchResultEditorInput.SearchResultEditorToolTip= +SearchResultEditorNavigationLocation.Search=Search {0} +SearchResultEditorPasteAction.PasteValues=Paste Values +SearchResultEditorPasteAction.Paste=Paste +SearchResultEditorPasteAction.PasteValue=Paste Value +SearchResultEditorQuickFilterWidget.ClearQuickFilterToolTip=Clear Quick Filter +ShowDNAction.ShowDN=Show DN +ShowLinksAction.DNAsLink=DN as link +ShowQuickFilterAction.ShowQuickFilter=Show Quick Filter +ShowQuickFilterAction.ShowQuickFilterToolTip=Show Quick Filter Propchange: directory/studio/trunk/ldapbrowser-ui/src/main/resources/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/messages.properties ------------------------------------------------------------------------------ svn:eol-style = native Added: directory/studio/trunk/ldapbrowser-ui/src/main/resources/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/messages_de.properties URL: http://svn.apache.org/viewvc/directory/studio/trunk/ldapbrowser-ui/src/main/resources/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/messages_de.properties?rev=721250&view=auto ============================================================================== --- directory/studio/trunk/ldapbrowser-ui/src/main/resources/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/messages_de.properties (added) +++ directory/studio/trunk/ldapbrowser-ui/src/main/resources/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/messages_de.properties Thu Nov 27 09:54:04 2008 @@ -0,0 +1,45 @@ +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you 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. + +FilterAndSortRunnable.FilterAndSort=Filtern und Sortieren +FilterAndSortRunnable.Filtering=Filtern... +FilterAndSortRunnable.Sorting=Sortieren... +OpenDefaultEditorAction.EditValue=Wert editieren +OpenEntryEditorAction.EditEntry=Eintrag editieren... +OpenSearchResultEditorPreferencePage.Preferences=Pr\u00E4ferenzen... +OpenSearchResultEditorPreferencePage.PreferencesToolTip=Pr\u00E4ferenzen... +SearchResultEditorActionGroup.Advanced=Fortgeschritten +SearchResultEditorActionGroup.EditValue=Wert editieren mit +SearchResultEditorActionGroup.OpenSchemaBrowser=\u00D6ffne Schema Browser +SearchResultEditorActionGroup.ShowIn=Anzeigen in +SearchResultEditorContentProvider.NoSearchSelected=Keine Suche ausgew\u00E4hlt +SearchResultEditorContentProvider.Of=\ von +SearchResultEditorContentProvider.Result=\ Resultat - +SearchResultEditorContentProvider.Results=\ Resultate - +SearchResultEditorContentProvider.SearchBase=Suchbasis\: +SearchResultEditorContentProvider.SearchNotPerformed=Suche nicht ausgef\u00FChrt - +SearchResultEditorInput.SearchResultEditor=Suchresultat Editor +SearchResultEditorInput.SearchResultEditorToolTip= +SearchResultEditorNavigationLocation.Search=Suche {0} +SearchResultEditorPasteAction.PasteValues=Werte einf\u00FCgen +SearchResultEditorPasteAction.Paste=Einf\u00FCgen +SearchResultEditorPasteAction.PasteValue=Wert einf\u00FCgen +SearchResultEditorQuickFilterWidget.ClearQuickFilterToolTip=Schnellfilter l\u00F6schen +ShowDNAction.ShowDN=DN anzeigen +ShowLinksAction.DNAsLink=DN als Verweis +ShowQuickFilterAction.ShowQuickFilter=Schnellfilter anzeigen +ShowQuickFilterAction.ShowQuickFilterToolTip=Schnellfilter anzeigen Propchange: directory/studio/trunk/ldapbrowser-ui/src/main/resources/org/apache/directory/studio/ldapbrowser/ui/editors/searchresult/messages_de.properties ------------------------------------------------------------------------------ svn:eol-style = native