LMS-2724 - Consistent tab naming in sample detail view and sample search

SVN: 24118

openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/client/application/Dict.java

@@ -581,6 +581,8 @@ public abstract class Dict
 
     public static final String DERIVED_SAMPLE = "derived_sample";
 
+    public static final String DERIVED_SAMPLES = "derived_samples";
+
     public static final String EXTERNAL_DATA_HEADING = "external_data_heading";
 
     public static final String SHOW_ONLY_DIRECTLY_CONNECTED = "show_only_directly_connected";

openbis/source/java/ch/systemsx/cisd/openbis/generic/client/web/public/generic-dictionary.js

@@ -15,10 +15,11 @@ var generic = {
 
   sample_properties_panel_sample_identifier: "Sample", 
   sample_properties_heading: "Sample Properties",
-  part_of_heading: "Components",
-  derived_samples_heading: "Derived Samples",
-  parent_samples_heading: "Parent Samples",
-  derived_sample: "Derived Sample",
+  part_of_heading: "Contained",
+  derived_samples_heading: "Children",
+  parent_samples_heading: "Parents",
+  derived_sample: "Child",
+  derived_samples: "Children",
   external_data_heading: "Data Sets",
   show_only_directly_connected: "directly connected",
   

openbis/source/java/ch/systemsx/cisd/openbis/generic/shared/basic/dto/AssociatedEntityKind.java

@@ -45,9 +45,9 @@ public enum AssociatedEntityKind implements Serializable
 
     SAMPLE_CONTAINER("Container", EntityKind.SAMPLE, EnumSet.of(EntityKind.SAMPLE)),
 
-    SAMPLE_PARENT("Parent", EntityKind.SAMPLE, EnumSet.of(EntityKind.SAMPLE)),
+    SAMPLE_CHILD("Child", EntityKind.SAMPLE, EnumSet.of(EntityKind.SAMPLE)),
 
-    SAMPLE_CHILD("Child", EntityKind.SAMPLE, EnumSet.of(EntityKind.SAMPLE));
+    SAMPLE_PARENT("Parent", EntityKind.SAMPLE, EnumSet.of(EntityKind.SAMPLE));
 
     private final String description;
 

openbis/source/java/ch/systemsx/cisd/openbis/plugin/generic/client/web/client/application/sample/GenericSampleViewer.java

@@ -286,7 +286,7 @@ abstract public class GenericSampleViewer extends AbstractViewerWithVerticalSpli
             properties.put(viewContext.getMessage(Dict.DERIVED_SAMPLE), generated);
         } else if (generated.length > 1)
         {
-            properties.put(viewContext.getMessage(Dict.DERIVED_SAMPLE) + "s", generated.length);
+            properties.put(viewContext.getMessage(Dict.DERIVED_SAMPLES), generated.length);
         }
         final Set<Sample> parents = sample.getParents();
         final int parentsSize = parents.size();

screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/public/screening-dictionary-dynamix.js

@@ -42,10 +42,11 @@ var screening = {
   
   
   sample_properties_heading: "Properties",
-  part_of_heading: "Components",
-  derived_samples_heading: "Derived Samples",
-  parent_samples_heading: "Parent Samples",
-  derived_sample: "Derived Sample",
+  part_of_heading: "Contained",
+  derived_samples_heading: "Children",
+  parent_samples_heading: "Parents",
+  derived_sample: "Child",
+  derived_samples: "Children",
   external_data_heading: "Data Sets",
   show_only_directly_connected: "directly connected",
 

screening/source/java/ch/systemsx/cisd/openbis/plugin/screening/client/web/public/screening-dictionary.js

@@ -52,10 +52,11 @@ button_delete_well: "Delete Well",
 
 
 sample_properties_heading: "Properties",
-part_of_heading: "Components",
-derived_samples_heading: "Derived Samples",
-parent_samples_heading: "Parent Samples",
-derived_sample: "Derived Sample",
+part_of_heading: "Contained",
+derived_samples_heading: "Children",
+parent_samples_heading: "Parents",
+derived_sample: "Child",
+derived_samples: "Children",
 external_data_heading: "Data Sets",
 show_only_directly_connected: "directly connected",