update strings & fix the different between plugin / theme (#397)

This commit is contained in:
Strencher 2020-07-26 08:19:07 +02:00 committed by GitHub
parent 9cc70e0272
commit 9ba23c5648
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 20 additions and 10 deletions

4
dist/index.js vendored

File diff suppressed because one or more lines are too long

2
dist/index.min.js vendored

File diff suppressed because one or more lines are too long

View File

@ -217,7 +217,18 @@ export default {
couldNotStop: "{{name}} could not be stopped.",
methodError: "{{method}} could not be fired.",
unknownAuthor: "Unknown Author",
noDescription: "Description not provided."
noDescription: "Description not provided.",
alreadyExists: "There is already a {{type}} with name {{name}}",
alreadWatching: "Already watching addons.",
metaError: "META could not be parsed.",
missingNameData: "META missing name data.",
metaNotFound: "META was not found.",
compileError: "Could not be compiled.",
wasUnloaded: "{{name}} was unloaded.",
alreadyWatching: "Already watching {{prefix}} addons.",
startingWatch: "Starting to watch {{prefix}} addons.",
wasNotWatching: "Was not watching {{prefix}} addons.",
noLongerWatching: "No longer watching {{prefix}} addons."
},
CustomCSS: {
confirmationText: "You have unsaved changes to your Custom CSS. Closing this window will lose all those changes.",

View File

@ -8,7 +8,6 @@ import MetaError from "../structs/metaerror";
import Toasts from "../ui/toasts";
import DiscordModules from "./discordmodules";
import Strings from "./strings";
import AddonEditor from "../ui/misc/addoneditor";
import FloatingWindows from "../ui/floatingwindows";
@ -114,15 +113,15 @@ export default class AddonManager {
if (hasOldMeta) return this.parseOldMeta(fileContent);
const hasNewMeta = firstLine.includes("/**");
if (hasNewMeta) return this.parseNewMeta(fileContent);
throw new MetaError("META was not found.");
throw new MetaError(Strings.Addons.metaNotFound);
}
parseOldMeta(fileContent) {
const meta = fileContent.split("\n")[0];
const metaData = meta.substring(meta.lastIndexOf("//META") + 6, meta.lastIndexOf("*//"));
const parsed = Utilities.testJSON(metaData);
if (!parsed) throw new MetaError("META could not be parsed.");
if (!parsed.name) throw new MetaError("META missing name data.");
if (!parsed) throw new MetaError(Strings.Addons.metaError);
if (!parsed.name) throw new MetaError(Strings.Addons.missingNameData);
parsed.format = "json";
return parsed;
}
@ -178,9 +177,9 @@ export default class AddonManager {
loadAddon(filename, shouldToast = false) {
if (typeof(filename) === "undefined") return;
try {__non_webpack_require__(path.resolve(this.addonFolder, filename));}
catch (error) {return new AddonError(filename, filename, "Could not be compiled.", {message: error.message, stack: error.stack});}
catch (error) {return new AddonError(filename, filename, Strings.Addons.compileError, {message: error.message, stack: error.stack});}
const addon = __non_webpack_require__(path.resolve(this.addonFolder, filename));
if (this.addonList.find(c => c.id == addon.id)) return new AddonError(addon.name, filename, `There is already a plugin with name ${addon.name}`);
if (this.addonList.find(c => c.id == addon.id)) return new AddonError(addon.name, filename, Strings.Addons.alreadyExists.format({type: this.prefix, name: addon.name}));
const error = this.initializeAddon(addon);
if (error) return error;
this.addonList.push(addon);