English htmls are considered to use the default path.

This commit is contained in:
MobiusDevelopment 2019-07-12 08:07:40 +00:00
parent 69b61bda96
commit 9cbca783d6
26 changed files with 65 additions and 13 deletions

View File

@ -156,6 +156,10 @@ public class HtmCache
content = loadFile(new File(Config.SCRIPT_ROOT, newPath));
}
}
if (content == null)
{
content = HTML_CACHE.get(path);
}
if ((player != null) && player.isGM() && Config.GM_DEBUG_HTML_PATHS)
{

View File

@ -12804,7 +12804,7 @@ public final class PlayerInstance extends Playable
_lang = Config.MULTILANG_DEFAULT;
}
_htmlPrefix = "data/lang/" + _lang + "/";
_htmlPrefix = _lang.equals("en") ? "" : "data/lang/" + _lang + "/";
}
else
{

View File

@ -156,6 +156,10 @@ public class HtmCache
content = loadFile(new File(Config.SCRIPT_ROOT, newPath));
}
}
if (content == null)
{
content = HTML_CACHE.get(path);
}
if ((player != null) && player.isGM() && Config.GM_DEBUG_HTML_PATHS)
{

View File

@ -12811,7 +12811,7 @@ public final class PlayerInstance extends Playable
_lang = Config.MULTILANG_DEFAULT;
}
_htmlPrefix = "data/lang/" + _lang + "/";
_htmlPrefix = _lang.equals("en") ? "" : "data/lang/" + _lang + "/";
}
else
{

View File

@ -156,6 +156,10 @@ public class HtmCache
content = loadFile(new File(Config.SCRIPT_ROOT, newPath));
}
}
if (content == null)
{
content = HTML_CACHE.get(path);
}
if ((player != null) && player.isGM() && Config.GM_DEBUG_HTML_PATHS)
{

View File

@ -12813,7 +12813,7 @@ public final class PlayerInstance extends Playable
_lang = Config.MULTILANG_DEFAULT;
}
_htmlPrefix = "data/lang/" + _lang + "/";
_htmlPrefix = _lang.equals("en") ? "" : "data/lang/" + _lang + "/";
}
else
{

View File

@ -156,6 +156,10 @@ public class HtmCache
content = loadFile(new File(Config.SCRIPT_ROOT, newPath));
}
}
if (content == null)
{
content = HTML_CACHE.get(path);
}
if ((player != null) && player.isGM() && Config.GM_DEBUG_HTML_PATHS)
{

View File

@ -12792,7 +12792,7 @@ public final class PlayerInstance extends Playable
_lang = Config.MULTILANG_DEFAULT;
}
_htmlPrefix = "data/lang/" + _lang + "/";
_htmlPrefix = _lang.equals("en") ? "" : "data/lang/" + _lang + "/";
}
else
{

View File

@ -156,6 +156,10 @@ public class HtmCache
content = loadFile(new File(Config.SCRIPT_ROOT, newPath));
}
}
if (content == null)
{
content = HTML_CACHE.get(path);
}
if ((player != null) && player.isGM() && Config.GM_DEBUG_HTML_PATHS)
{

View File

@ -12782,7 +12782,7 @@ public final class PlayerInstance extends Playable
_lang = Config.MULTILANG_DEFAULT;
}
_htmlPrefix = "data/lang/" + _lang + "/";
_htmlPrefix = _lang.equals("en") ? "" : "data/lang/" + _lang + "/";
}
else
{

View File

@ -156,6 +156,10 @@ public class HtmCache
content = loadFile(new File(Config.SCRIPT_ROOT, newPath));
}
}
if (content == null)
{
content = HTML_CACHE.get(path);
}
if ((player != null) && player.isGM() && Config.GM_DEBUG_HTML_PATHS)
{

View File

@ -12788,7 +12788,7 @@ public final class PlayerInstance extends Playable
_lang = Config.MULTILANG_DEFAULT;
}
_htmlPrefix = "data/lang/" + _lang + "/";
_htmlPrefix = _lang.equals("en") ? "" : "data/lang/" + _lang + "/";
}
else
{

View File

@ -156,6 +156,10 @@ public class HtmCache
content = loadFile(new File(Config.SCRIPT_ROOT, newPath));
}
}
if (content == null)
{
content = HTML_CACHE.get(path);
}
if ((player != null) && player.isGM() && Config.GM_DEBUG_HTML_PATHS)
{

View File

@ -12794,7 +12794,7 @@ public final class PlayerInstance extends Playable
_lang = Config.MULTILANG_DEFAULT;
}
_htmlPrefix = "data/lang/" + _lang + "/";
_htmlPrefix = _lang.equals("en") ? "" : "data/lang/" + _lang + "/";
}
else
{

View File

@ -156,6 +156,10 @@ public class HtmCache
content = loadFile(new File(Config.SCRIPT_ROOT, newPath));
}
}
if (content == null)
{
content = HTML_CACHE.get(path);
}
if ((player != null) && player.isGM() && Config.GM_DEBUG_HTML_PATHS)
{

View File

@ -13736,7 +13736,7 @@ public final class PlayerInstance extends Playable
_lang = Config.MULTILANG_DEFAULT;
}
_htmlPrefix = "data/lang/" + _lang + "/";
_htmlPrefix = _lang.equals("en") ? "" : "data/lang/" + _lang + "/";
}
else
{

View File

@ -156,6 +156,10 @@ public class HtmCache
content = loadFile(new File(Config.SCRIPT_ROOT, newPath));
}
}
if (content == null)
{
content = HTML_CACHE.get(path);
}
if ((player != null) && player.isGM() && Config.GM_DEBUG_HTML_PATHS)
{

View File

@ -12646,7 +12646,7 @@ public final class PlayerInstance extends Playable
_lang = Config.MULTILANG_DEFAULT;
}
_htmlPrefix = "data/lang/" + _lang + "/";
_htmlPrefix = _lang.equals("en") ? "" : "data/lang/" + _lang + "/";
}
else
{

View File

@ -156,6 +156,10 @@ public class HtmCache
content = loadFile(new File(Config.SCRIPT_ROOT, newPath));
}
}
if (content == null)
{
content = HTML_CACHE.get(path);
}
if ((player != null) && player.isGM() && Config.GM_DEBUG_HTML_PATHS)
{

View File

@ -12653,7 +12653,7 @@ public final class PlayerInstance extends Playable
_lang = Config.MULTILANG_DEFAULT;
}
_htmlPrefix = "data/lang/" + _lang + "/";
_htmlPrefix = _lang.equals("en") ? "" : "data/lang/" + _lang + "/";
}
else
{

View File

@ -156,6 +156,10 @@ public class HtmCache
content = loadFile(new File(Config.SCRIPT_ROOT, newPath));
}
}
if (content == null)
{
content = HTML_CACHE.get(path);
}
if ((player != null) && player.isGM() && Config.GM_DEBUG_HTML_PATHS)
{

View File

@ -12638,7 +12638,7 @@ public final class PlayerInstance extends Playable
_lang = Config.MULTILANG_DEFAULT;
}
_htmlPrefix = "data/lang/" + _lang + "/";
_htmlPrefix = _lang.equals("en") ? "" : "data/lang/" + _lang + "/";
}
else
{

View File

@ -156,6 +156,10 @@ public class HtmCache
content = loadFile(new File(Config.SCRIPT_ROOT, newPath));
}
}
if (content == null)
{
content = HTML_CACHE.get(path);
}
if ((player != null) && player.isGM() && Config.GM_DEBUG_HTML_PATHS)
{

View File

@ -12644,7 +12644,7 @@ public final class PlayerInstance extends Playable
_lang = Config.MULTILANG_DEFAULT;
}
_htmlPrefix = "data/lang/" + _lang + "/";
_htmlPrefix = _lang.equals("en") ? "" : "data/lang/" + _lang + "/";
}
else
{

View File

@ -156,6 +156,10 @@ public class HtmCache
content = loadFile(new File(Config.SCRIPT_ROOT, newPath));
}
}
if (content == null)
{
content = HTML_CACHE.get(path);
}
if ((player != null) && player.isGM() && Config.GM_DEBUG_HTML_PATHS)
{

View File

@ -12644,7 +12644,7 @@ public final class PlayerInstance extends Playable
_lang = Config.MULTILANG_DEFAULT;
}
_htmlPrefix = "data/lang/" + _lang + "/";
_htmlPrefix = _lang.equals("en") ? "" : "data/lang/" + _lang + "/";
}
else
{