From 95c9da80b40a61c0d535759c00766dadff1e2f0b Mon Sep 17 00:00:00 2001 From: amartynov Date: Tue, 22 Sep 2015 15:01:32 +0300 Subject: [PATCH 1/2] fixed --- devops-service/core/devops-messages.rb | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/devops-service/core/devops-messages.rb b/devops-service/core/devops-messages.rb index b96c395..eae1f1a 100644 --- a/devops-service/core/devops-messages.rb +++ b/devops-service/core/devops-messages.rb @@ -18,13 +18,13 @@ module Devops 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) From fd21a58673bea2ea8c9f99b11dfb093a31d94d63 Mon Sep 17 00:00:00 2001 From: amartynov Date: Tue, 22 Sep 2015 15:05:13 +0300 Subject: [PATCH 2/2] messages log --- devops-service/core/devops-messages.rb | 1 + 1 file changed, 1 insertion(+) diff --git a/devops-service/core/devops-messages.rb b/devops-service/core/devops-messages.rb index eae1f1a..298bd3d 100644 --- a/devops-service/core/devops-messages.rb +++ b/devops-service/core/devops-messages.rb @@ -15,6 +15,7 @@ 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?