Use new jp font

also return copies of translated strings
This commit is contained in:
tdixon 2017-08-01 23:30:28 -03:00
parent c1fb09fcb5
commit 947f69d68c

View file

@ -7,14 +7,18 @@
class Language
FONT_WESTERN = 'Terminus (TTF)'
FONT_CJK = 'WenQuanYi Micro Hei'
FONT_CK = 'WenQuanYi Micro Hei'
FONT_J = 'HigashiOme Gothic regular'
LANG_WESTERN = [
'en', 'fr', 'pt_BR', 'es'
]
LANG_CJK = [
'ja', 'ko', 'zh_CN'
LANG_J = [
'ja'
]
LANGUAGES = LANG_WESTERN + LANG_CJK
LANG_CK = [
'ko', 'zh_CN'
]
LANGUAGES = LANG_WESTERN + LANG_CK + LANG_J
class << self
def set(lc)
@ -28,12 +32,15 @@ class Language
if FileTest.exist?(path)
File.open(path, "rb") do |file|
@data = Marshal.load(file)
if LANG_CJK.include? name
Font.default_name = FONT_CJK
if LANG_CK.include? name
Font.default_name = FONT_CK
elsif LANG_J.include? name
Font.default_name = FONT_J
else
Font.default_name = FONT_WESTERN
end
Journal.setLang(name)
dbg_print(Font.default_name)
end
end
end
@ -44,14 +51,13 @@ class Language
# Translate some text
def tr(string)
#dbg_print(caller_locations(1, 1).first.tap{|loc| puts "#{loc.path}:#{loc.lineno}"})
dbg_print(string)
if @data
rv = @data[Zlib::crc32(string)] || string
else
rv = string
end
dbg_print(rv)
return rv
dbg_print(string + " -> " + rv)
return String.new(rv)
end
# Turn all database items into translatable strings