directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fel...@apache.org
Subject svn commit: r720821 - in /directory/studio/trunk/schemaeditor/src/main: java/org/apache/directory/studio/schemaeditor/model/ resources/org/apache/directory/studio/schemaeditor/model/
Date Wed, 26 Nov 2008 11:59:50 GMT
Author: felixk
Date: Wed Nov 26 03:59:47 2008
New Revision: 720821

URL: http://svn.apache.org/viewvc?rev=720821&view=rev
Log:
- Fix NLS parameter stuff
- Add German translation

Added:
    directory/studio/trunk/schemaeditor/src/main/resources/org/apache/directory/studio/schemaeditor/model/messages_de.properties
  (with props)
Modified:
    directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/DependenciesComputer.java
    directory/studio/trunk/schemaeditor/src/main/resources/org/apache/directory/studio/schemaeditor/model/messages.properties

Modified: directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/DependenciesComputer.java
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/DependenciesComputer.java?rev=720821&r1=720820&r2=720821&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/DependenciesComputer.java
(original)
+++ directory/studio/trunk/schemaeditor/src/main/java/org/apache/directory/studio/schemaeditor/model/DependenciesComputer.java
Wed Nov 26 03:59:47 2008
@@ -29,6 +29,7 @@
 import org.apache.commons.collections.map.MultiValueMap;
 import org.apache.directory.shared.ldap.schema.SchemaObject;
 import org.apache.directory.studio.schemaeditor.controller.SchemaHandler;
+import org.eclipse.osgi.util.NLS;
 
 
 /**
@@ -128,8 +129,7 @@
             AttributeTypeImpl superiorAT = schemaHandler.getAttributeType( superior );
             if ( superiorAT == null )
             {
-                throw new DependencyComputerException( Messages.getString("DependenciesComputer.SuperiorAttributeBegin")
+ superior //$NON-NLS-1$
-                    + Messages.getString("DependenciesComputer.SuperiorAttributeEnd") );
//$NON-NLS-1$
+                throw new DependencyComputerException( NLS.bind( Messages.getString("DependenciesComputer.SuperiorAttribute"),
new String[]{superior}) ); //$NON-NLS-1$
             }
             else
             {
@@ -148,8 +148,7 @@
             SyntaxImpl syntax = schemaHandler.getSyntax( syntaxOID );
             if ( syntax == null )
             {
-                throw new DependencyComputerException( Messages.getString("DependenciesComputer.SyntaxOIDBegin")
+ syntaxOID //$NON-NLS-1$
-                    + Messages.getString("DependenciesComputer.SyntaxOIDEnd") ); //$NON-NLS-1$
+                throw new DependencyComputerException( NLS.bind( Messages.getString("DependenciesComputer.SyntaxOID"),
new String[]{syntaxOID}) ); //$NON-NLS-1$
             }
             else
             {
@@ -168,8 +167,7 @@
             MatchingRuleImpl equalityMatchingRule = schemaHandler.getMatchingRule( equalityName
);
             if ( equalityMatchingRule == null )
             {
-                throw new DependencyComputerException( Messages.getString("DependenciesComputer.EqualityBegin")
+ equalityName //$NON-NLS-1$
-                    + Messages.getString("DependenciesComputer.EqualityEnd") ); //$NON-NLS-1$
+                throw new DependencyComputerException( NLS.bind( Messages.getString("DependenciesComputer.Equality"),
new String[]{ equalityName}) ); //$NON-NLS-1$
             }
             else
             {
@@ -188,8 +186,7 @@
             MatchingRuleImpl orderingMatchingRule = schemaHandler.getMatchingRule( orderingName
);
             if ( orderingMatchingRule == null )
             {
-                throw new DependencyComputerException( Messages.getString("DependenciesComputer.OrderingBegin")
+ orderingName //$NON-NLS-1$
-                    + Messages.getString("DependenciesComputer.OrderingEnd") ); //$NON-NLS-1$
+                throw new DependencyComputerException( NLS.bind( Messages.getString("DependenciesComputer.Ordering"),
new String[]{ orderingName}) ); //$NON-NLS-1$
             }
             else
             {
@@ -208,8 +205,7 @@
             MatchingRuleImpl substringMatchingRule = schemaHandler.getMatchingRule( substringName
);
             if ( substringMatchingRule == null )
             {
-                throw new DependencyComputerException( Messages.getString("DependenciesComputer.SubstringBegin")
+ substringName //$NON-NLS-1$
-                    + Messages.getString("DependenciesComputer.SubstringEnd") ); //$NON-NLS-1$
+                throw new DependencyComputerException( NLS.bind( Messages.getString("DependenciesComputer.Substring"),new
String[]{substringName}) ); //$NON-NLS-1$
             }
             else
             {
@@ -243,8 +239,7 @@
                 ObjectClassImpl superObjectClass = schemaHandler.getObjectClass( superClassName
);
                 if ( superObjectClass == null )
                 {
-                    throw new DependencyComputerException( Messages.getString("DependenciesComputer.SuperiorObjectBegin")
+ superClassName //$NON-NLS-1$
-                        + Messages.getString("DependenciesComputer.SuperiorObjectEnd") );
//$NON-NLS-1$
+                    throw new DependencyComputerException(NLS.bind( Messages.getString("DependenciesComputer.SuperiorObject"),new
String[]{ superClassName}) ); //$NON-NLS-1$
                 }
                 else
                 {
@@ -266,8 +261,7 @@
                 AttributeTypeImpl optionalAttributeType = schemaHandler.getAttributeType(
optionalAttributeTypeName );
                 if ( optionalAttributeType == null )
                 {
-                    throw new DependencyComputerException( Messages.getString("DependenciesComputer.OptionalBegin")
+ optionalAttributeType //$NON-NLS-1$
-                        + Messages.getString("DependenciesComputer.OptionalEnd") ); //$NON-NLS-1$
+                    throw new DependencyComputerException( NLS.bind( Messages.getString("DependenciesComputer.Optional"),
new Object[]{ optionalAttributeType}) ); //$NON-NLS-1$
                 }
                 else
                 {
@@ -289,8 +283,8 @@
                 AttributeTypeImpl mandatoryAttributeType = schemaHandler.getAttributeType(
mandatoryAttributeTypeName );
                 if ( mandatoryAttributeType == null )
                 {
-                    throw new DependencyComputerException( Messages.getString("DependenciesComputer.MandatoryBegin")
//$NON-NLS-1$
-                        + mandatoryAttributeTypeName + Messages.getString("DependenciesComputer.MandatoryEnd")
); //$NON-NLS-1$
+                    throw new DependencyComputerException( NLS.bind( Messages.getString("DependenciesComputer.Mandatory"),

+                        new String[]{ mandatoryAttributeTypeName}) ); //$NON-NLS-1$
                 }
                 else
                 {
@@ -322,7 +316,7 @@
             Schema schemaFromSuperiorAT = schemaHandler.getSchema( schemaName );
             if ( schemaFromSuperiorAT == null )
             {
-                throw new DependencyComputerException( Messages.getString("DependenciesComputer.SchemaBegin")
+ schemaName + Messages.getString("DependenciesComputer.SchemaEnd") ); //$NON-NLS-1$ //$NON-NLS-2$
+                throw new DependencyComputerException( NLS.bind( Messages.getString("DependenciesComputer.Schema"),
new String[]{ schemaName }) ); //$NON-NLS-1$ //$NON-NLS-2$
             }
             else
             {

Modified: directory/studio/trunk/schemaeditor/src/main/resources/org/apache/directory/studio/schemaeditor/model/messages.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/resources/org/apache/directory/studio/schemaeditor/model/messages.properties?rev=720821&r1=720820&r2=720821&view=diff
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/resources/org/apache/directory/studio/schemaeditor/model/messages.properties
(original)
+++ directory/studio/trunk/schemaeditor/src/main/resources/org/apache/directory/studio/schemaeditor/model/messages.properties
Wed Nov 26 03:59:47 2008
@@ -15,21 +15,12 @@
 # specific language governing permissions and limitations
 # under the License.
 
-DependenciesComputer.EqualityBegin=The equality matching rule '
-DependenciesComputer.EqualityEnd=' does not exists in the Schema.
-DependenciesComputer.MandatoryBegin=The mandatory attribute type '
-DependenciesComputer.MandatoryEnd=' does not exists in the Schema.
-DependenciesComputer.OptionalBegin=The optional attribute type '
-DependenciesComputer.OptionalEnd=' does not exists in the Schema.
-DependenciesComputer.OrderingBegin=The ordering matching rule '
-DependenciesComputer.OrderingEnd=' does not exists in the Schema.
-DependenciesComputer.SchemaBegin=The schema '
-DependenciesComputer.SchemaEnd=' does not exists in the Schema.
-DependenciesComputer.SubstringBegin=The substring matching rule '
-DependenciesComputer.SubstringEnd=' does not exists in the Schema.
-DependenciesComputer.SuperiorAttributeBegin=The superior attribute type '
-DependenciesComputer.SuperiorAttributeEnd=' does not exists in the Schema.
-DependenciesComputer.SuperiorObjectBegin=The superior object class '
-DependenciesComputer.SuperiorObjectEnd=' does not exists in the Schema.
-DependenciesComputer.SyntaxOIDBegin=The syntax with OID '
-DependenciesComputer.SyntaxOIDEnd=' does not exists in the Schema.
+DependenciesComputer.Equality=The equality matching rule "{0}" does not exists in the Schema.
+DependenciesComputer.Mandatory=The mandatory attribute type "{0}" does not exists in the
Schema.
+DependenciesComputer.Optional=The optional attribute type "{0}" does not exists in the Schema.
+DependenciesComputer.Ordering=The ordering matching rule "{0}" does not exists in the Schema.
+DependenciesComputer.Schema=The schema "{0}" does not exists in the Schema.
+DependenciesComputer.Substring=The substring matching rule "{0}" does not exists in the Schema.
+DependenciesComputer.SuperiorAttribute=The superior attribute type "{0}" does not exists
in the Schema.
+DependenciesComputer.SuperiorObject=The superior object class "{0}" does not exists in the
Schema.
+DependenciesComputer.SyntaxOID=The syntax with OID "{0}" does not exists in the Schema.

Added: directory/studio/trunk/schemaeditor/src/main/resources/org/apache/directory/studio/schemaeditor/model/messages_de.properties
URL: http://svn.apache.org/viewvc/directory/studio/trunk/schemaeditor/src/main/resources/org/apache/directory/studio/schemaeditor/model/messages_de.properties?rev=720821&view=auto
==============================================================================
--- directory/studio/trunk/schemaeditor/src/main/resources/org/apache/directory/studio/schemaeditor/model/messages_de.properties
(added)
+++ directory/studio/trunk/schemaeditor/src/main/resources/org/apache/directory/studio/schemaeditor/model/messages_de.properties
Wed Nov 26 03:59:47 2008
@@ -0,0 +1,26 @@
+# 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.
+
+DependenciesComputer.Equality=Es existiert keine Gleichheits-Regel "{0}" im Schema.
+DependenciesComputer.Mandatory=Es existiert kein Pflichtattribut-Typ "{0}" im Schema.
+DependenciesComputer.Optional=Es existiert kein optionaler Attribut Typ "{0}" im Schema.
+DependenciesComputer.Ordering=Es existiert keine Sortierungs-Regel "{0}" im Schema.
+DependenciesComputer.Schema=Es existert kein Schema "{0}" im Schema.
+DependenciesComputer.Substring=Es existiert keine passende Teilstring-Regel "{0}" im Schema.
+DependenciesComputer.SuperiorAttribute=Es existiert kein \u00FCbergeordneter Attribut Typ
"{0}" im Schema.
+DependenciesComputer.SuperiorObject=Es existiert keine \u00FCbergeordnete Objekt Klasse "{0}"
im Schema.
+DependenciesComputer.SyntaxOID=Es existiert keine Syntax mit OID "{0}" im Schema.

Propchange: directory/studio/trunk/schemaeditor/src/main/resources/org/apache/directory/studio/schemaeditor/model/messages_de.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/studio/trunk/schemaeditor/src/main/resources/org/apache/directory/studio/schemaeditor/model/messages_de.properties
------------------------------------------------------------------------------
    svn:keywords = Id



Mime
View raw message