#1673 Make sure the shared labels don't override the labels for each …

…model

lib/editor_configuration.rb

@@ -65,14 +65,24 @@ def initialize(conf)
     @id = conf[:id]
     @filter = conf[:filter]
     @model = conf[:model]
-    @squeezed_labels_config = squeeze(conf[:labels])
+
     @squeezed_options_config = squeeze(conf[:options])
     @squeezed_layout_config = squeeze(conf[:layout])
 
+    # Create an empty label conf
+    @squeezed_labels_config = Settings.new(Hash.new())
+
+    # ... the add all the shared labels...
     superimpose_shared_file("SharedLanguageLabels.yml")
     superimpose_shared_file("SharedISO3166Codes.yml")
     superimpose_shared_file("SharedContentLabels.yml")
     superimpose_shared_file("SharedKeyOrModes.yml")
+
+    # And lastly the actual label conf, so that it
+    # overrides the shared ones if needed.
+    # I.e. "a" can be A minor or records.earlier_heading
+    # depending on the context (but not both)
+    @squeezed_labels_config = squeeze(conf[:labels])
   end
 
   def superimpose_shared_file(name)