Upstream/Plan
1
0
Fork 0
mirror of https://github.com/plan-player-analytics/Plan.git synced 2024-11-05 10:20:23 +01:00
Code Issues Projects Releases Wiki Activity

Fixed accidental moment.js breakage

Browse Source
This commit is contained in:
Rsl1122 2018-07-29 12:11:18 +03:00
parent ca93523f14
commit c44ddac69d
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Plan/src/main/java/com/djrapitops/plan/system/locale/lang/CommandLang.java
View File

@ -26,7 +26,7 @@ public enum CommandLang implements Lang {
CONNECT_SUCCESS("Cmd Setup - Success", "§aConnection successful, Plan may restart in a few seconds.."), CONNECT_SUCCESS("Cmd Setup - Success", "§aConnection successful, Plan may restart in a few seconds.."),
CONNECT_FORBIDDEN("Cmd Setup - Forbidden", "§eConnection succeeded, but Bungee has set-up mode disabled - use '/planbungee setup' to enable it."), CONNECT_FORBIDDEN("Cmd Setup - Forbidden", "§eConnection succeeded, but Bungee has set-up mode disabled - use '/planbungee setup' to enable it."),
CONNECT_BAD_REQUEST("Cmd Setup - Bad Request", "§eConnection succeeded, but Receiving server was a Bukkit server. Use Bungee address instead."), CONNECT_BAD_REQUEST("Cmd Setup - Bad Request", "§eConnection succeeded, but Receiving server was not a Bungee server. Use Bungee address instead."),
CONNECT_UNAUTHORIZED("Cmd Setup - Unauthorized", "§eConnection succeeded, but Receiving server didn't authorize this server. Contact Discord for support"), CONNECT_UNAUTHORIZED("Cmd Setup - Unauthorized", "§eConnection succeeded, but Receiving server didn't authorize this server. Contact Discord for support"),
CONNECT_FAIL("Cmd Setup - Generic Fail", "§eConnection failed: ${0}"), CONNECT_FAIL("Cmd Setup - Generic Fail", "§eConnection failed: ${0}"),
CONNECT_INTERNAL_ERROR("Cmd Setup - Internal Error", "§eConnection succeeded. ${0}, check possible ErrorLog on receiving server's debug page."), CONNECT_INTERNAL_ERROR("Cmd Setup - Internal Error", "§eConnection succeeded. ${0}, check possible ErrorLog on receiving server's debug page."),

6
Plan/src/main/resources/web/plugins/momentjs/moment.js
View File

@ -1757,7 +1757,7 @@
if (!locales[name] && (typeof module !== 'undefined') && if (!locales[name] && (typeof module !== 'undefined') &&
module && module.exports) { module && module.exports) {
try { try {
oldLocale = globallocale._abbr; oldLocale = globalLocale._abbr;
require('./locale/' + name); require('./locale/' + name);
// because defineLocale currently also sets the global locale, we // because defineLocale currently also sets the global locale, we
// want to undo that for lazy loaded locales // want to undo that for lazy loaded locales
@ -1786,7 +1786,7 @@
} }
} }
return globallocale._abbr; return globalLocale._abbr;
} }
function defineLocale (name, config) { function defineLocale (name, config) {
@ -3638,7 +3638,7 @@
return string; return string;
} }
var prototype__proto = locale.prototype; var prototype__proto = Locale.prototype;
prototype__proto.calendar = locale_calendar__calendar; prototype__proto.calendar = locale_calendar__calendar;
prototype__proto.longDateFormat = longDateFormat; prototype__proto.longDateFormat = longDateFormat;