Browse Source

use translation widgets

Markus-Rost 4 năm trước cách đây
mục cha
commit
ddbe5dcdb0

+ 1 - 1
.github/workflows/translations.yml

@@ -13,7 +13,7 @@ jobs:
         for language in i18n/[a-z-]*.json
         for language in i18n/[a-z-]*.json
         do
         do
           wget https://weblate.frisk.space/widgets/wiki-bot/$(basename $language .json)/discord/svg-badge.svg
           wget https://weblate.frisk.space/widgets/wiki-bot/$(basename $language .json)/discord/svg-badge.svg
-          convert svg-badge.svg i18n/widgets/$(basename $language .json).png
+          convert -background none svg-badge.svg i18n/widgets/$(basename $language .json).png
           rm svg-badge.svg
           rm svg-badge.svg
         done
         done
     - name: Commit changes
     - name: Commit changes

+ 1 - 1
RcGcDb

@@ -1 +1 @@
-Subproject commit d2155eaa6bb6f18f6e0bd1f0e7036695666bec3f
+Subproject commit 0a0531000940ee4f7811ce0d2ef4c283b388375e

+ 3 - 3
cmds/rcscript.js

@@ -321,14 +321,14 @@ function cmd_rcscript(lang, msg, args, line, wiki) {
 			}
 			}
 			if ( args[0] === 'lang' ) {
 			if ( args[0] === 'lang' ) {
 				if ( !args[1] ) {
 				if ( !args[1] ) {
-					return msg.replyMsg( lang.get('rcscript.current_lang') + ' `' + allLangs.names[selected_row.lang] + '`\n`' + cmd + ' lang ' + lang.get('rcscript.new_lang') + '`\n' + lang.get('rcscript.help_lang') + ' `' + Object.values(allLangs.names).join('`, `') + '`', {}, true );
+					return msg.replyMsg( lang.get('rcscript.current_lang') + ' `' + allLangs.names[selected_row.lang] + '`\n`' + cmd + ' lang ' + lang.get('rcscript.new_lang') + '`\n' + lang.get('rcscript.help_lang') + ' `' + Object.values(allLangs.names).join('`, `') + '`', {files:[`./RcGcDb/locale/widgets/${selected_row.lang}.png`]}, true );
 				}
 				}
 				if ( !( args[1] in allLangs.map ) ) {
 				if ( !( args[1] in allLangs.map ) ) {
 					return msg.replyMsg( lang.get('settings.langinvalid') + '\n`' + cmd + ' lang ' + lang.get('rcscript.new_lang') + '`\n' + lang.get('rcscript.help_lang') + ' `' + Object.values(allLangs.names).join('`, `') + '`', {}, true );
 					return msg.replyMsg( lang.get('settings.langinvalid') + '\n`' + cmd + ' lang ' + lang.get('rcscript.new_lang') + '`\n' + lang.get('rcscript.help_lang') + ' `' + Object.values(allLangs.names).join('`, `') + '`', {}, true );
 				}
 				}
 
 
 				msg.client.fetchWebhook(...selected_row.webhook.split('/')).then( webhook => {
 				msg.client.fetchWebhook(...selected_row.webhook.split('/')).then( webhook => {
-					webhook.send( new Lang(allLangs.map[args[1]]).get('rcscript.webhook.updated_lang', allLangs.names[allLangs.map[args[1]]]) ).catch(log_error);
+					webhook.send( new Lang(allLangs.map[args[1]]).get('rcscript.webhook.updated_lang', allLangs.names[allLangs.map[args[1]]]), {files:[`./RcGcDb/locale/widgets/${args[1]}.png`]} ).catch(log_error);
 				}, log_error );
 				}, log_error );
 				return db.run( 'UPDATE rcgcdw SET lang = ? WHERE webhook = ?', [allLangs.map[args[1]], selected_row.webhook], function (error) {
 				return db.run( 'UPDATE rcgcdw SET lang = ? WHERE webhook = ?', [allLangs.map[args[1]], selected_row.webhook], function (error) {
 					if ( error ) {
 					if ( error ) {
@@ -337,7 +337,7 @@ function cmd_rcscript(lang, msg, args, line, wiki) {
 						return error;
 						return error;
 					}
 					}
 					console.log( '- RcGcDw successfully updated.' );
 					console.log( '- RcGcDw successfully updated.' );
-					msg.replyMsg( lang.get('rcscript.updated_lang') + ' `' + allLangs.names[allLangs.map[args[1]]] + '`\n`' + cmd + '`', {}, true );
+					msg.replyMsg( lang.get('rcscript.updated_lang') + ' `' + allLangs.names[allLangs.map[args[1]]] + '`\n`' + cmd + '`', {files:[`./RcGcDb/locale/widgets/${args[1]}.png`]}, true );
 				} );
 				} );
 			}
 			}
 			if ( args[0] === 'display' ) {
 			if ( args[0] === 'display' ) {

+ 2 - 2
cmds/settings.js

@@ -208,7 +208,7 @@ function cmd_settings(lang, msg, args, line, wiki) {
 			prelang += 'lang';
 			prelang += 'lang';
 			var langhelp = '\n' + lang.get('settings.langhelp', prefix + 'settings ' + prelang) + ' `' + Object.values(allLangs.names).join('`, `') + '`';
 			var langhelp = '\n' + lang.get('settings.langhelp', prefix + 'settings ' + prelang) + ' `' + Object.values(allLangs.names).join('`, `') + '`';
 			if ( !args[1] ) {
 			if ( !args[1] ) {
-				return msg.replyMsg( lang.get('settings.' + prelang) + ' `' + allLangs.names[( channel || guild ).lang] + '`' + langhelp, {}, true );
+				return msg.replyMsg( lang.get('settings.' + prelang) + ' `' + allLangs.names[( channel || guild ).lang] + '`' + langhelp, {files:[`./i18n/widgets/${( channel || guild ).lang}.png`]}, true );
 			}
 			}
 			if ( !( args[1] in allLangs.map ) ) {
 			if ( !( args[1] in allLangs.map ) ) {
 				return msg.replyMsg( lang.get('settings.langinvalid') + langhelp, {}, true );
 				return msg.replyMsg( lang.get('settings.langinvalid') + langhelp, {}, true );
@@ -246,7 +246,7 @@ function cmd_settings(lang, msg, args, line, wiki) {
 					if ( msg.guild.id in voice ) voice[msg.guild.id] = guild.lang;
 					if ( msg.guild.id in voice ) voice[msg.guild.id] = guild.lang;
 				}
 				}
 				if ( channel || !( msg.guild.id in patreons ) || !rows.some( row => row.channel === msg.channel.id ) ) lang = new Lang(allLangs.map[args[1]]);
 				if ( channel || !( msg.guild.id in patreons ) || !rows.some( row => row.channel === msg.channel.id ) ) lang = new Lang(allLangs.map[args[1]]);
-				msg.replyMsg( lang.get('settings.' + prelang + 'changed') + ' `' + allLangs.names[allLangs.map[args[1]]] + '`\n' + lang.get('settings.langhelp', prefix + 'settings ' + prelang) + ' `' + Object.values(allLangs.names).join('`, `') + '`', {}, true );
+				msg.replyMsg( lang.get('settings.' + prelang + 'changed') + ' `' + allLangs.names[allLangs.map[args[1]]] + '`\n' + lang.get('settings.langhelp', prefix + 'settings ' + prelang) + ' `' + Object.values(allLangs.names).join('`, `') + '`', {files:[`./i18n/widgets/${args[1]}.png`]}, true );
 				var channels = rows.filter( row => row.channel && row.lang === guild.lang && row.wiki === guild.wiki && row.prefix === guild.prefix && row.inline === guild.inline ).map( row => row.channel );
 				var channels = rows.filter( row => row.channel && row.lang === guild.lang && row.wiki === guild.wiki && row.prefix === guild.prefix && row.inline === guild.inline ).map( row => row.channel );
 				if ( channels.length ) db.run( 'DELETE FROM discord WHERE channel IN (' + channels.map( row => '?' ).join(', ') + ')', channels, function (delerror) {
 				if ( channels.length ) db.run( 'DELETE FROM discord WHERE channel IN (' + channels.map( row => '?' ).join(', ') + ')', channels, function (delerror) {
 					if ( delerror ) {
 					if ( delerror ) {