Merge branch 'devops_3' of git.stu.neva.ru:cloudtechlab/devops-service into devops_3

devops-service/core/devops-messages.rb

@@ -15,16 +15,17 @@ module Devops
       end
 
       def merge file
+        puts "Trying to merge messages with file '#{file}'"
         lang = lang_key
         messages = read_file(file)[lang]
         raise "It is undefined main key '#{lang}' in file '#{file}'" if messages.nil?
-        @@messages.merge!(messages)
+        @@messages.deep_merge!(messages)
       end
 
       def translate key, params={}
         msg = @@messages
         key.split(".").each do |msgk|
-          msg = msg[key]
+          msg = msg[msgk]
           raise "Invalid message key '#{key}'" if msg.nil?
         end
         raise "Invalid message value with key '#{key}', it must be a string" unless msg.is_a?(String)