fix language code

cmds/eval.js

@@ -64,7 +64,9 @@ function updateAllSites() {
  */
 function removePatreons(guild, msg) {
 	try {
-		if ( !guild || !msg ) return 'removePatreons(guild, msg) – No guild or message provided!';
+		if ( !( typeof guild === 'string' || msg instanceof Discord.Message ) ) {
+			return 'removePatreons(guild, msg) – No guild or message provided!';
+		}
 		db.get( 'SELECT lang, inline FROM discord WHERE guild = ? AND channel IS NULL', [guild], (dberror, row) => {
 			try {
 				if ( dberror ) {

cmds/patreon.js

@@ -178,7 +178,7 @@ function cmd_patreon(lang, msg, args, line, wiki) {
 			db.each( 'SELECT a.guild, GROUP_CONCAT(DISTINCT a.configid) configids FROM verification a LEFT JOIN verification b ON a.guild = b.guild WHERE a.guild IN (' + guilds.map( guild => '?' ).join(', ') + ') GROUP BY a.guild', guilds, (eacherror, eachrow) => {
 				if ( eacherror ) {
 					console.log( '- Error while getting the verifications: ' + eacherror );
-					return dberror;
+					return eacherror;
 				}
 				var ids = eachrow.configids.split(',').slice(verificationLimit.default);
 				if ( ids.length ) db.run( 'DELETE FROM verification WHERE guild = ? AND configid IN (' + ids.map( configid => '?' ).join(', ') + ')', [eachrow.guild, ...ids], function (uperror) {

cmds/settings.js

@@ -204,7 +204,7 @@ function cmd_settings(lang, msg, args, line, wiki) {
 		}
 		
 		if ( args[0] === 'lang' ) {
-			if ( channel && !( msg.guild.id in patreons ) ) return msg.replyMsg( lang.get('patreon') + ' <' + process.env.patreon + '>', {}, true );
+			if ( channel && !( msg.guild.id in patreons ) ) return msg.replyMsg( lang.get('patreon') + '\n<' + process.env.patreon + '>', {}, true );
 			prelang += 'lang';
 			var langhelp = '\n' + lang.get('settings.langhelp', prefix + 'settings ' + prelang) + ' `' + Object.values(allLangs.names).map( val => val[0] ).join('`, `') + '`';
 			if ( !args[1] ) {
@@ -260,7 +260,7 @@ function cmd_settings(lang, msg, args, line, wiki) {
 		
 		if ( args[0] === 'prefix' && !channel ) {
 			if ( !( msg.guild.id in patreons ) ) {
-				return msg.replyMsg( lang.get('patreon') + ' <' + process.env.patreon + '>', {}, true );
+				return msg.replyMsg( lang.get('patreon') + '\n<' + process.env.patreon + '>', {}, true );
 			}
 			var prefixhelp = '\n' + lang.get('settings.prefixhelp', prefix + 'settings prefix');
 			args[1] = args[1].replace( /(?<!\\)_$/, ' ' ).replace( /\\([_\W])/g, '$1' );
@@ -290,7 +290,7 @@ function cmd_settings(lang, msg, args, line, wiki) {
 		}
 		
 		if ( args[0] === 'inline' ) {
-			if ( channel && !( msg.guild.id in patreons ) ) return msg.replyMsg( lang.get('patreon') + ' <' + process.env.patreon + '>', {}, true );
+			if ( channel && !( msg.guild.id in patreons ) ) return msg.replyMsg( lang.get('patreon') + '\n<' + process.env.patreon + '>', {}, true );
 			prelang += 'inline';
 			var toggle = 'inline ' + ( ( channel || guild ).inline ? 'disabled' : 'enabled' );
 			var inlinehelp = '\n' + lang.get('settings.' + toggle + '.help', prefix + 'settings ' + prelang + ' toggle', inlinepage);

i18n/de.json

@@ -201,7 +201,6 @@
 			"global-discussions-moderator": "Globaler Diskussions-Moderator",
 			"vanguard": "Portabilitäts-Pionier",
 			"voldev": "Volunteer Developer",
-			"council": "Community Council",
 			"bot": "Bot",
 			"checkuser": "Checkuser-Berechtigter",
 			"bureaucrat": "Bürokrat",

i18n/en.json

@@ -195,7 +195,6 @@
 			"global-discussions-moderator": "Global discussions moderator",
 			"vanguard": "Vanguard",
 			"voldev": "Volunteer Developer",
-			"council": "Community Council",
 			"bot": "Bot",
 			"checkuser": "Check user",
 			"bureaucrat": "Bureaucrat",

i18n/fr.json

@@ -104,7 +104,6 @@
 			"global-discussions-moderator": "Modérateur global de discussions",
 			"vanguard": "Vanguard",
 			"voldev": "Développeurs bénévoles",
-			"council": "Community Council",
 			"bot": "Robot",
 			"bureaucrat": "Bureaucrate",
 			"sysop": "Administrateur",

i18n/nl.json

@@ -105,7 +105,6 @@
 			"global-discussions-moderator": "Globaal discussiemoderator",
 			"vanguard": "Vanguard",
 			"voldev": "Vrijwillige ontwikkelaars",
-			"council": "Communityraad",
 			"bot": "Bot",
 			"bureaucrat": "Bureaucraat",
 			"sysop": "Beheerder",

i18n/pl.json

@@ -197,7 +197,6 @@
 			"global-discussions-moderator": "globalny moderator dyskusji",
 			"vanguard": "Vanguard",
 			"voldev": "Volunteer Developer",
-			"council": "Community Council",
 			"bot": "Bot",
 			"bureaucrat": "Biurokrata",
 			"sysop": "Administrator",

i18n/pt.json

@@ -184,7 +184,6 @@
 			"global-discussions-moderator": "Moderador global de discussões",
 			"vanguard": "Vanguarda",
 			"voldev": "Programadores Voluntários",
-			"council": "Conselho da Comunidade",
 			"bot": "Robô",
 			"bureaucrat": "Burocrata",
 			"sysop": "Administrador",

i18n/ru.json

@@ -176,8 +176,6 @@
 			"content-volunteer": "Контент-доброволец",
 			"global-discussions-moderator": "Глобальный модератор дискуссий",
 			"vanguard": "Vanguard",
-			"voldev": "Volunteer Developer",
-			"council": "Community Council",
 			"bot": "Бот",
 			"bureaucrat": "Бюрократ",
 			"sysop": "Администратор",

i18n/tr.json

@@ -105,7 +105,6 @@
 			"global-discussions-moderator": "Global tartışma moderatörü",
 			"vanguard": "Vanguard",
 			"voldev": "Gönüllü Geliştirici",
-			"council": "Topluluk Konseyi",
 			"bot": "Bot",
 			"bureaucrat": "Bürokrat",
 			"sysop": "Yönetici",

i18n/zh.json

@@ -194,7 +194,6 @@
 			"global-discussions-moderator": "全域讨论版主",
 			"vanguard": "Vanguard",
 			"voldev": "志愿开发者",
-			"council": "社区委员会",
 			"bot": "机器人",
 			"bureaucrat": "行政员",
 			"sysop": "管理员",

util/default.json

@@ -48,7 +48,6 @@
 		"global-discussions-moderator",
 		"vanguard",
 		"voldev",
-		"council",
 		"bot",
 		"checkuser",
 		"bureaucrat",

util/i18n.js

@@ -53,14 +53,16 @@ class Lang {
 			if ( text ) {
 				text = text?.[keys[n]];
 			}
-			else if ( fallback < this.fallback.length ) {
-				lang = this.fallback[fallback];
-				fallback++;
-				text = i18n?.[lang];
-				n = 0;
-			}
-			else {
-				n = keys.length;
+			if ( !text ) {
+				if ( fallback < this.fallback.length ) {
+					lang = this.fallback[fallback];
+					fallback++;
+					text = i18n?.[lang];
+					n = -1;
+				}
+				else {
+					n = keys.length;
+				}
 			}
 		}
 		if ( typeof text === 'string' ) {