Merge remote-tracking branch 'upstream/master' into i18n

game/engines/default/engine/I18N.lua

@@ -115,6 +115,12 @@ function _M:loadLocale(file)
 	print("[I18N] Loaded locale file:", file)
 end
 
+function _M:resetBreakTextAllCharacter()
+	if _getFlagI18N("break_text_all_character") then
+		core.display.breakTextAllCharacter(true)
+	end
+end
+
 function _M:setLocale(lc)
 	cur_locale_name = lc
 	if not locales[lc] then locales[lc] = {} end

game/engines/default/engine/Module.lua

@@ -925,7 +925,7 @@ function _M:instanciate(mod, name, new_game, no_reboot, extra_module_info)
 	core.game.resetLocale()
 
 	-- Reset white space breaking
-	core.display.breakTextAllCharacter(true)
+	core.display.breakTextAllCharacter(false)
 
 	-- Turn based by default
 	core.game.setRealtime(0)
@@ -946,6 +946,7 @@ function _M:instanciate(mod, name, new_game, no_reboot, extra_module_info)
 	-- Load localizations
 	if mod.i18n_support and config.settings.locale then
 		I18N:loadLocale("/data/locales/"..config.settings.locale..".lua")
+		I18N:resetBreakTextAllCharacter()
 	end
 
 	-- Load font packages