fix encoding error

This commit is contained in:
chiu 2020-04-07 22:18:11 +08:00
parent 26a748d05d
commit 47f206e33d
1 changed files with 4 additions and 4 deletions

View File

@ -17,9 +17,9 @@ end
@original_dir = Dir.pwd
`cd "#{dir_pwd}" && git add app/templates/ app/assets built_in_extensions.rb config/mongoid.yml bin/ && cd "#{@original_dir}"` #using git to add modified files and to avoid git pull not working
#Add patchfile to Admin area
@patchfile_li = File.read(app_path+"/patchfile_li.txt")
@patchfile_li_choices = File.read(app_path+"/patchfile_li_choices.txt")
@file_text = File.read(dir_pwd+'/app/views/shared/_side_bar.html.erb')
@patchfile_li = File.read(app_path+"/patchfile_li.txt").force_encoding('UTF-8')
@patchfile_li_choices = File.read(app_path+"/patchfile_li_choices.txt").force_encoding('UTF-8')
@file_text = File.read(dir_pwd+'/app/views/shared/_side_bar.html.erb').force_encoding('UTF-8')
if !@file_text.include?('<div class="patchfile sub-nav-block icons-megaphone">')
@indert_index = @file_text.index('</nav>')
@file_text.insert(@indert_index , @patchfile_li_choices)
@ -51,7 +51,7 @@ all_template.each do |folder|
puts "changing header.html.erb in #{folder}/home/header.html.erb"
if folder.split('/')[-1] != 'mobile'
filename = folder+'home/header.html.erb'
texts = File.read(filename)
texts = File.read(filename).force_encoding('UTF-8')
texts_html = Nokogiri::HTML.parse(texts)
if texts_html.css('.navbar-brand').length == 1
new_texts = texts.gsub(texts_html.css('.navbar-brand').to_s.gsub("%7B",'{').gsub('%7D','}'),change_text)