lib/babelyoda.rb in babelyoda-2.1.2 vs lib/babelyoda.rb in babelyoda-2.1.3
- old
+ new
@@ -162,19 +162,18 @@
langs = ENV['LANGS'].split(',').map { |s| s.to_sym }
end
end
$logger.info "Pushing local keys for '#{langs.join(', ')}' to the remote..."
spec.strings_files.each do |filename|
- local_keyset = nil
+ local_keyset = Babelyoda::Strings.new(filename, spec.development_language).read!
+ $logger.debug "Processing keyset: #{local_keyset.name}"
langs.each do |lang|
- unless local_keyset
- local_keyset = Babelyoda::Strings.new(filename, lang).read!
- $logger.debug "Processing keyset: #{local_keyset.name}"
- else
- strings = Babelyoda::Strings.new(strings_filename(local_keyset.name, lang), lang).read!
- local_keyset.merge!(strings, preserve: true)
- end
+ next if lang == spec.development_language
+ fn = strings_filename(local_keyset.name, lang)
+ next unless File.exist?(fn)
+ strings = Babelyoda::Strings.new(fn, lang).read!
+ local_keyset.merge!(strings, preserve: true)
end
remote_keyset = spec.engine.load_keyset(local_keyset.name, nil, :unapproved)
result = remote_keyset.merge!(local_keyset, preserve: true)
remote_keyset.ensure_languages!(spec.all_languages)