From 302885abfbce10de080ccdfdac7638919eb76a3a Mon Sep 17 00:00:00 2001 From: Yuzu Date: Mon, 27 Jun 2022 20:28:01 +0700 Subject: [PATCH] Localization use placeholder instead --- locales/en.json | 48 +++++++++++++++---------------- locales/jp.json | 48 +++++++++++++++---------------- locales/th.json | 48 +++++++++++++++---------------- src/discord/Help.ts | 13 ++++----- src/discord/Invite.ts | 4 +-- src/discord/MusicPlayer/Loop.ts | 8 ++++-- src/discord/MusicPlayer/Play.ts | 4 ++- src/discord/MusicPlayer/Queue.ts | 4 +-- src/discord/MusicPlayer/Search.ts | 4 ++- src/discord/Say.ts | 5 ++-- src/discord/Settings/Prefix.ts | 2 +- src/discord/Settings/index.ts | 7 +++-- src/discord/Stats.ts | 10 +++---- src/discord/UserInfo.ts | 12 ++++---- 14 files changed, 113 insertions(+), 104 deletions(-) diff --git a/locales/en.json b/locales/en.json index 54445be..e1f77dc 100644 --- a/locales/en.json +++ b/locales/en.json @@ -2,18 +2,18 @@ "common": { "available_args": "Available arguments", "no_permissions": "No permission", - "no_permissions_description": "You need ``%s`` permission on this guild!", + "no_permissions_description": "You need ``{{PERMISSIONS}}`` permission on this guild!", "processing": "Performing actions" }, "stats": { "title": "Stats", "info": "Current stats of the bot", "users": "Users", - "x_servers": "%s servers", - "x_users": "%s users", + "x_servers": "{{COUNT}} servers", + "x_users": "{{COUNT}} users", "uptime_since": "Uptime since", - "server_uptime_x": "Server %s", - "process_uptime_x": "Process %s" + "server_uptime_x": "Server {{{TIME}}}", + "process_uptime_x": "Process {{{TIME}}}" }, "userinfo": { "title": "User Information", @@ -27,14 +27,14 @@ "unknown": "Offline / Unknown", "user_guild_info": "Information on this guild", "join_date_unknown": "Cannot determine join date", - "join_date": "Joined %s", + "join_date": "Joined {{{TIME}}}", "guild_owner": "Owner of this guild", "custom_status": "Custom Status", - "playing_x": "Playing %s", - "streaming_x": "Streaming %s", - "listening_x": "Listening to %s", - "watching_x": "Watching %s", - "competing_x": "Competing %s" + "playing_x": "Playing {{NAME}}", + "streaming_x": "Streaming {{NAME}}", + "listening_x": "Listening to {{NAME}}", + "watching_x": "Watching {{NAME}}", + "competing_x": "Competing {{NAME}}" }, "say": { "title": "Say", @@ -45,13 +45,13 @@ }, "invite": { "title": "Invite", - "info": "[Invite %s to your server!](%s)", - "private": "%s's invite is currently private. Only the developers can add me to another server" + "info": "[Invite {{BOT_NAME}} to your server!]({{{LINK}}})", + "private": "{{BOT_NAME}}'s invite is currently private. Only the developers can add me to another server" }, "help": { - "title": "Help - %s", + "title": "Help - {{BOT_NAME}}", "prefix_title": "Prefix", - "prefix_description": "You can call me using ``%s`` %s or ``/slash command``", + "prefix_description": "You can call me using ``{{{PREFIX}}}``, {{{PREFIX_MENTION}}} or ``/slash command``", "available_commands": "Available commands", "general": "General", "music": "Music", @@ -83,10 +83,10 @@ "success": "Successfully left the voice channel" }, "musicplayer_loop": { - "info": "Current loop mode is %s", + "info": "Current loop mode is {{MODE}}", "valid_args": "Available loop mode: ``None`` ``Current``", "invalid": "Invalid loop mode", - "loop_set": "Loop mode is now set to %s" + "loop_set": "Loop mode is now set to {{MODE}}" }, "musicplayer_pause": { "paused": "Paused", @@ -102,7 +102,7 @@ "valid_args": "``(Search query or Link)``", "queue_added_song": "Song added to queue!", "queue_added_songs": "Songs added to queue!", - "queue_added_songs_description": "Added %s songs to the queue", + "queue_added_songs_description": "Added {{COUNT}} songs to the queue", "error": "Error while looking up the song" }, "musicplayer_queue": { @@ -111,14 +111,14 @@ "now_playing": "Now playing", "upcoming_song": "Upcoming song", "looping_current": "(Looping current)", - "song_x_in_queue": "There are %s song in the queue!" + "song_x_in_queue": "There are {{COUNT}} song in the queue!" }, "musicplayer_search": { "title": "Search", "info": "Search for a song", "valid_args": "``(Search query)``", "title_result": "Search result", - "x_results_found": "%s results found" + "x_results_found": "{{COUNT}} results found" }, "musicplayer_skip": { "skipped": "Skipped", @@ -126,17 +126,17 @@ }, "settings": { "title": "Settings", - "description": "Change how %s behave on **%s**", - "valid_args": "``prefix`` ``EnableServiceAnnouncement`` ``ServiceAnnouncementChannel``" + "description": "Change how {{BOT_NAME}} behave on **{{GUILD_NAME}}**", + "valid_args": "``Prefix`` ``EnableServiceAnnouncement`` ``ServiceAnnouncementChannel``" }, "settings_prefix": { - "info": "Current prefix is %s", + "info": "Current prefix is {{{PREFIX}}}", "info_description": "Provide a new prefix to change", "prefix_too_long": "Prefix too long", "prefix_too_long_description": "Can you even remember that? 😆", "prefix_is_mention": "Prefix cannot be mention of me", "prefix_is_mention_description": "You can already call me by mentioning me. I got that covered, don't worry", "prefix_updated": "Prefix updated", - "prefix_updated_description": "From now onwards, I shall be called by using ``%s``" + "prefix_updated_description": "From now onwards, I shall be called by using ``{{PREFIX}}``" } } \ No newline at end of file diff --git a/locales/jp.json b/locales/jp.json index 4197e22..2a68fbd 100644 --- a/locales/jp.json +++ b/locales/jp.json @@ -2,18 +2,18 @@ "common": { "available_args": "Available arguments", "no_permissions": "許可していない", - "no_permissions_description": "このギルドでは ``%s`` の許可が必要です!", + "no_permissions_description": "このギルドでは ``{{PERMISSIONS}}`` の許可が必要です!", "processing": "アクションの実行" }, "stats": { "title": "統計情報", "info": "現在のボットの統計情報", "users": "ユーザー", - "x_servers": "%s サーヴァーズ", - "x_users": "%s ユーザー", + "x_servers": "{{COUNT}} サーヴァーズ", + "x_users": "{{COUNT}} ユーザー", "uptime_since": "アップタイム", - "server_uptime_x": "サーヴァーズ %s", - "process_uptime_x": "プロセス %s" + "server_uptime_x": "サーヴァーズ {{{TIME}}}", + "process_uptime_x": "プロセス {{{TIME}}}" }, "userinfo": { "title": "ユーザー情報", @@ -27,14 +27,14 @@ "unknown": "オフライン／不明", "user_guild_info": "このギルドの情報", "join_date_unknown": "このギルドの加入日が特定できない", - "join_date": "加入 %s", + "join_date": "加入 {{{TIME}}}", "guild_owner": "このギルドのオーナー", "custom_status": "カスタムステータス", - "playing_x": "%sをプレイ中", - "streaming_x": "%sをストリーミング中", - "listening_x": "%sを再生中", - "watching_x": "%s鑑賞中", - "competing_x": "%sに参戦中です" + "playing_x": "{{NAME}}をプレイ中", + "streaming_x": "{{NAME}}をストリーミング中", + "listening_x": "{{NAME}}を再生中", + "watching_x": "{{NAME}}鑑賞中", + "competing_x": "{{NAME}}に参戦中です" }, "say": { "title": "言うこと", @@ -45,13 +45,13 @@ }, "invite": { "title": "招待状リンク", - "info": "[あなたのサーバに%sを招待してください](%s)", - "private": "%sの招待は現在非公開です。開発者だけが私を別のサーバーに追加することができます" + "info": "[あなたのサーバに{{BOT_NAME}}を招待してください]({{{LINK}}})", + "private": "{{BOT_NAME}}の招待は現在非公開です。開発者だけが私を別のサーバーに追加することができます" }, "help": { - "title": "ヘルプ - %s", + "title": "ヘルプ - {{BOT_NAME}}", "prefix_title": "プリフィクス", - "prefix_description": "%s、%s、``/スラッシュコマンド`` で呼び出すことができます", + "prefix_description": "{{{PREFIX}}}、{{{PREFIX_MENTION}}}、``/スラッシュコマンド`` で呼び出すことができます", "available_commands": "使用可能なコマンド", "general": "一般", "music": "音楽", @@ -83,10 +83,10 @@ "success": "音声チャネルからの離脱に成功" }, "musicplayer_loop": { - "info": "現在のループモードは「%s」です。", + "info": "現在のループモードは「{{MODE}}」です。", "valid_args": "使用可能なループモード: ``None`` ``Current``", "invalid": "ループモードが正しくない", - "loop_set": "ループモードが「%s」になりました。" + "loop_set": "ループモードが「{{MODE}}」になりました。" }, "musicplayer_pause": { "paused": "一時停止", @@ -102,7 +102,7 @@ "valid_args": "``(検索クエリまたはリンク)``", "queue_added_song": "キューに曲を追加しました", "queue_added_songs": "たくさんの曲をキューに追加しました", - "queue_added_songs_description": "キューに%s曲を追加", + "queue_added_songs_description": "キューに{{COUNT}}曲を追加", "error": "曲の検索中にエラーが発生" }, "musicplayer_queue": { @@ -111,14 +111,14 @@ "now_playing": "再生中", "upcoming_song": "次の曲", "looping_current": "(この曲の繰り返し)", - "song_x_in_queue": "%s曲も並んでいますよ。" + "song_x_in_queue": "{{COUNT}}曲も並んでいますよ。" }, "musicplayer_search": { "title": "検索", "info": "楽曲を検索する", "valid_args": "``(検索クエリ)``", "title_result": "検索結果", - "x_results_found": "%s件見つかりました。" + "x_results_found": "{{COUNT}}件見つかりました。" }, "musicplayer_skip": { "skipped": "スキップした", @@ -126,17 +126,17 @@ }, "settings": { "title": "設定", - "description": "**%s**サーバでの%sの動作変更", - "valid_args": "``prefix`` ``EnableServiceAnnouncement`` ``ServiceAnnouncementChannel``" + "description": "**{{GUILD_NAME}}**サーバでの{{BOT_NAME}}の動作変更", + "valid_args": "``Prefix`` ``EnableServiceAnnouncement`` ``ServiceAnnouncementChannel``" }, "settings_prefix": { - "info": "現在の接頭辞は「%s」です。", + "info": "現在の接頭辞は「{{{PREFIX}}}」です。", "info_description": "変更する新しいプレフィックスを提供する", "prefix_too_long": "プリフィックスが長すぎる", "prefix_too_long_description": "そんな情報まで覚えているんですか 😆", "prefix_is_mention": "プレフィックスを@メンションにすることはできません", "prefix_is_mention_description": "それはもう、私を@メンションすることで可能です。心配しないでください", "prefix_updated": "プレフィックスを更新", - "prefix_updated_description": "これ以降、私は 「``%s``」 を使って呼び出されることになります。" + "prefix_updated_description": "これ以降、私は 「``{{PREFIX}}``」 を使って呼び出されることになります。" } } \ No newline at end of file diff --git a/locales/th.json b/locales/th.json index 4f6741c..60076d6 100644 --- a/locales/th.json +++ b/locales/th.json @@ -2,18 +2,18 @@ "common": { "available_args": "อาร์กิวเมนต์ที่มีอยู่", "no_permissions": "ไม่ได้รับอนุญาต", - "no_permissions_description": "คุณต้องได้รับอนุญาต ``%s`` ในกิลด์นี้!", + "no_permissions_description": "คุณต้องได้รับอนุญาต ``{{PERMISSIONS}}`` ในกิลด์นี้!", "processing": "กำลังดำเนินการ" }, "stats": { "title": "สถิติ", "info": "สถิติปัจจุบันของบอท", "users": "ผู้ใช้", - "x_servers": "%s เซิร์ฟเวอร์", - "x_users": "%s ผู้ใช้", + "x_servers": "{{COUNT}} เซิร์ฟเวอร์", + "x_users": "{{COUNT}} ผู้ใช้", "uptime_since": "เวลาทำงานตั้งแต่", - "server_uptime_x": "เซิร์ฟเวอร์ %s", - "process_uptime_x": "กระบวนการ %s" + "server_uptime_x": "เซิร์ฟเวอร์ {{{TIME}}}", + "process_uptime_x": "กระบวนการ {{{TIME}}}" }, "userinfo": { "title": "ข้อมูลผู้ใช้", @@ -27,14 +27,14 @@ "unknown": "ออฟไลน์ / ไม่รู้", "user_guild_info": "ข้อมูลกิลด์นี้", "join_date_unknown": "ไม่สามารถกำหนดวันเข้าร่วมได้", - "join_date": "เข้าร่วม %s", + "join_date": "เข้าร่วม {{{TIME}}}", "guild_owner": "เจ้าของกิลด์นี้", "custom_status": "สถานะที่กำหนดเอง", - "playing_x": "กำลังเล่น %s", - "streaming_x": "สตรีมมิ่ง %s", - "listening_x": "ฟัง %s", - "watching_x": "การรับชม %s", - "competing_x": "การแข่งขัน %s" + "playing_x": "กำลังเล่น {{NAME}}", + "streaming_x": "สตรีมมิ่ง{{NAME}}", + "listening_x": "ฟัง {{NAME}}", + "watching_x": "การรับชม {{NAME}}", + "competing_x": "การแข่งขัน {{NAME}}" }, "say": { "title": "พูด", @@ -45,13 +45,13 @@ }, "invite": { "title": "เชิญชวน", - "info": "[เชิญ %s เข้าสู่เซิร์ฟเวอร์ของคุณ!](%s)", - "private": "ขณะนี้คำเชิญของ %s เป็นแบบส่วนตัว เฉพาะนักพัฒนาเท่านั้นที่สามารถเพิ่มฉันไปยังเซิร์ฟเวอร์อื่นได้" + "info": "[เชิญ {{BOT_NAME}} เข้าสู่เซิร์ฟเวอร์ของคุณ!]({{{LINK}}})", + "private": "ขณะนี้คำเชิญของ {{BOT_NAME}} เป็นแบบส่วนตัว เฉพาะนักพัฒนาเท่านั้นที่สามารถเพิ่มฉันไปยังเซิร์ฟเวอร์อื่นได้" }, "help": { - "title": "ช่วยเหลือ - %s", + "title": "ช่วยเหลือ - {{BOT_NAME}}", "prefix_title": "คำนำหน้า", - "prefix_description": "คุณสามารถโทรหาฉันโดยใช้ ``%s`` %s or ``/สแลชคอมมานด์``", + "prefix_description": "คุณสามารถโทรหาฉันโดยใช้ ``{{{PREFIX}}}``, {{{PREFIX_MENTION}}} or ``/สแลชคอมมานด์``", "available_commands": "คำสั่งที่ใช้ได้", "general": "ทั่วไป", "music": "ดนตรี", @@ -83,10 +83,10 @@ "success": "ออกจากช่องเสียงเรียบร้อยแล้ว" }, "musicplayer_loop": { - "info": "โหมดวนรอบปัจจุบันคือ %s", + "info": "โหมดวนรอบปัจจุบันคือ {{MODE}}", "valid_args": "โหมดวนซ้ำที่ถูกต้อง: ``None`` ``Current``", "invalid": "โหมดวนซ้ำไม่ถูกต้อง", - "loop_set": "ตอนนี้ตั้งค่าโหมดวนรอบเป็น %s" + "loop_set": "ตอนนี้ตั้งค่าโหมดวนรอบเป็น {{MODE}}" }, "musicplayer_pause": { "paused": "หยุดชั่วคราว", @@ -102,7 +102,7 @@ "valid_args": "``(คำค้นหาหรือลิงก์)``", "queue_added_song": "เพลงเข้าคิวแล้ว!", "queue_added_songs": "เพลงเข้าคิวแล้ว!", - "queue_added_songs_description": "เพิ่ม %s เพลงในคิว", + "queue_added_songs_description": "เพิ่ม {{COUNT}} เพลงในคิว", "error": "เกิดข้อผิดพลาดขณะค้นหาเพลง" }, "musicplayer_queue": { @@ -111,14 +111,14 @@ "now_playing": "กำลังเล่น", "upcoming_song": "เพลงที่กำลังจะมา", "looping_current": "(วนรอบปัจจุบัน)", - "song_x_in_queue": "มี %s เพลงอยู่ในคิว!" + "song_x_in_queue": "มี {{COUNT}} เพลงอยู่ในคิว!" }, "musicplayer_search": { "title": "ค้นหา", "info": "ค้นหาเพลง", "valid_args": "``(คำค้นหา)``", "title_result": "ผลการค้นหา", - "x_results_found": "พบผลลัพธ์ %s เพลง" + "x_results_found": "พบผลลัพธ์ {{COUNT}} เพลง" }, "musicplayer_skip": { "skipped": "ข้าม", @@ -126,17 +126,17 @@ }, "settings": { "title": "การตั้งค่า", - "description": "เปลี่ยนพฤติกรรมของ %s ใน **%s**", - "valid_args": "``prefix`` ``EnableServiceAnnouncement`` ``ServiceAnnouncementChannel``" + "description": "เปลี่ยนพฤติกรรมของ {{BOT_NAME}} ใน **{{GUILD_NAME}}**", + "valid_args": "``Prefix`` ``EnableServiceAnnouncement`` ``ServiceAnnouncementChannel``" }, "settings_prefix": { - "info": "คำนำหน้าปัจจุบันคือ %s", + "info": "คำนำหน้าปัจจุบันคือ {{{PREFIX}}}", "info_description": "ระบุคำนำหน้าใหม่เพื่อเปลี่ยน", "prefix_too_long": "คำนำหน้ายาวเกินไป", "prefix_too_long_description": "คุณจำมันได้ไหม 😆", "prefix_is_mention": "คำนำหน้าไม่สามารถพูดถึงฉัน", "prefix_is_mention_description": "คุณสามารถโทรหาฉันด้วยการพูดถึงฉัน ฉันทำได้อยู่แล้ว ไม่ต้องห่วง", "prefix_updated": "อัปเดตคำนำหน้าแล้ว", - "prefix_updated_description": "จากนี้ไปฉันจะถูกเรียกโดยใช้ ``%s``" + "prefix_updated_description": "จากนี้ไปฉันจะถูกเรียกโดยใช้ ``{{PREFIX}}``" } } \ No newline at end of file diff --git a/src/discord/Help.ts b/src/discord/Help.ts index b218c4e..117ea1a 100644 --- a/src/discord/Help.ts +++ b/src/discord/Help.ts @@ -16,11 +16,10 @@ const EMBEDS = { let _e = makeInfoEmbed({ icon: '💌', - title: locale.__('help.title', bot.username), + title: locale.__('help.title', { BOT_NAME: bot.username }), description: `\u200b\n🏷️ **${locale.__('help.prefix_title')}**\n${locale.__( 'help.prefix_description', - prefix.replaceAll('`', '`​'), - `<@${bot.id}>` + {PREFIX: prefix.replaceAll('`', '`​'), PREFIX_MENTION: `<@${bot.id}>`} )}\n\n💻 **${locale.__('help.available_commands')}**`, fields: [ { @@ -29,13 +28,13 @@ const EMBEDS = { inline: true }, { - name: `🎵 ${locale.__('help.music')}`, - value: `play (p), search, skip, pause, resume, queue (q), nowplaying (np), loop, join, leave (disconnect, dc)`, + name: `🎮 ${locale.__('help.games')}`, + value: `osu`, inline: true }, { - name: `🎮 ${locale.__('help.games')}`, - value: `osu`, + name: `🎵 ${locale.__('help.music')}`, + value: `play (p), search, skip, pause, resume, queue (q), nowplaying (np), loop, join, leave (disconnect, dc)`, inline: true }, { diff --git a/src/discord/Invite.ts b/src/discord/Invite.ts index 74a65ee..111edbe 100644 --- a/src/discord/Invite.ts +++ b/src/discord/Invite.ts @@ -14,11 +14,11 @@ const EMBEDS = { const user = data.getUser(); let message; if (!Environment.get().PRIVATE_BOT || user != null && Users.isDeveloper(user.id)) - message = locale.__('invite.info', DiscordProvider.client.user!.username, `https://discord.com/api/oauth2/authorize?client_id=${DiscordProvider.client.user?.id}&permissions=0&scope=bot%20applications.commands`); + message = locale.__('invite.info', { BOT_NAME: DiscordProvider.client.user!.username, LINK: `https://discord.com/api/oauth2/authorize?client_id=${DiscordProvider.client.user?.id}&permissions=0&scope=bot%20applications.commands`}); return makeInfoEmbed({ title: `Invite`, - description: message || locale.__('invite.private', DiscordProvider.client.user!.username), + description: message || locale.__('invite.private', { BOT_NAME: DiscordProvider.client.user!.username}), user }); } diff --git a/src/discord/MusicPlayer/Loop.ts b/src/discord/MusicPlayer/Loop.ts index fbd2eb2..45838e7 100644 --- a/src/discord/MusicPlayer/Loop.ts +++ b/src/discord/MusicPlayer/Loop.ts @@ -15,7 +15,9 @@ const EMBEDS = { }, LOOP_STATUS: (data: HybridInteractionMessage, locale: I18n, loopMode: DiscordMusicPlayerLoopMode) => { let embed = makeInfoEmbed({ - title: locale.__('musicplayer_loop.info', loopMode), + title: locale.__('musicplayer_loop.info', { + MODE: loopMode + }), description: locale.__('musicplayer_loop.valid_args'), user: data.getUser() }); @@ -23,7 +25,9 @@ const EMBEDS = { }, LOOP_SET: (data: HybridInteractionMessage, locale: I18n, loopMode: DiscordMusicPlayerLoopMode) => { let embed = makeSuccessEmbed({ - title: locale.__('musicplayer_loop.loop_set', loopMode), + title: locale.__('musicplayer_loop.loop_set', { + MODE: loopMode + }), user: data.getUser() }); return embed; diff --git a/src/discord/MusicPlayer/Play.ts b/src/discord/MusicPlayer/Play.ts index c7efbe3..36a0475 100644 --- a/src/discord/MusicPlayer/Play.ts +++ b/src/discord/MusicPlayer/Play.ts @@ -56,7 +56,9 @@ const EMBEDS = { ADDED_SONGS_QUEUE: (data: HybridInteractionMessage, locale: I18n, track: ValidTracks[]) => { let embed = makeSuccessEmbed({ title: locale.__('musicplayer_play.queue_added_songs'), - description: locale.__('musicplayer_play.queue_added_songs_description', track.length.toString()), + description: locale.__('musicplayer_play.queue_added_songs_description', { + COUNT: track.length.toString() + }), user: data.getUser() }); return embed; diff --git a/src/discord/MusicPlayer/Queue.ts b/src/discord/MusicPlayer/Queue.ts index 41a4d3f..d818b7f 100644 --- a/src/discord/MusicPlayer/Queue.ts +++ b/src/discord/MusicPlayer/Queue.ts @@ -45,7 +45,7 @@ const EMBEDS = { title: locale.__('musicplayer_queue.title'), description: `${locale.__('musicplayer_queue.now_playing')}${nowPlayingText} ${locale.__('musicplayer_queue.upcoming_song')} ${upcomingText}\n - ${locale.__('musicplayer_queue.song_x_in_queue', queue.track.length.toString())} + ${locale.__('musicplayer_queue.song_x_in_queue', { COUNT: queue.track.length.toString()})} ${queueString}\n${queue.track.length > 10 ? `...${queue.track.length - 10} more songs` : ''}`, user: data.getUser() }); @@ -58,7 +58,7 @@ const EMBEDS = { title: locale.__('musicplayer_queue.title'), description: `${locale.__('musicplayer_queue.now_playing')}${nowPlayingText} ${locale.__('musicplayer_queue.upcoming_song')} ${upcomingText}\n - ${locale.__('musicplayer_queue.song_x_in_queue', queue.track.length.toString())} + ${locale.__('musicplayer_queue.song_x_in_queue', { COUNT: queue.track.length.toString()})} ${queueString}`, user: data.getUser() }); diff --git a/src/discord/MusicPlayer/Search.ts b/src/discord/MusicPlayer/Search.ts index 74ee6de..aacc5ec 100644 --- a/src/discord/MusicPlayer/Search.ts +++ b/src/discord/MusicPlayer/Search.ts @@ -26,7 +26,9 @@ const EMBEDS = { SEARCH_RESULT: (data: HybridInteractionMessage, locale: I18n, result: ValidTracks[]) => { return makeInfoEmbed({ title: locale.__('musicplayer_search.title_result'), - description: `${locale.__('musicplayer_search.x_results_found', result.length.toString())}\n\n${result.map(track => `- [${track.title}](${track.url})`).join('\n')}`, + description: `${locale.__('musicplayer_search.x_results_found', { + COUNT: result.length.toString() + })}\n\n${result.map(track => `- [${track.title}](${track.url})`).join('\n')}`, user: data.getUser() }); }, diff --git a/src/discord/Say.ts b/src/discord/Say.ts index d2ab172..b9de61b 100644 --- a/src/discord/Say.ts +++ b/src/discord/Say.ts @@ -28,8 +28,9 @@ const EMBEDS = { return makeErrorEmbed({ title: locale.__('common.no_permissions'), description: locale.__( - 'common.no_permissions_description', - 'VIEW_CHANNEL, SEND_MESSAGES and MANAGE_CHANNELS' + 'common.no_permissions_description', { + PERMISSIONS: 'VIEW_CHANNEL, SEND_MESSAGES, MANAGE_CHANNELS' + } ), user: data.getUser() }); diff --git a/src/discord/Settings/Prefix.ts b/src/discord/Settings/Prefix.ts index 4387064..5a4b2e3 100644 --- a/src/discord/Settings/Prefix.ts +++ b/src/discord/Settings/Prefix.ts @@ -18,7 +18,7 @@ import { COMMON_EMBEDS } from '.'; const EMBEDS = { PREFIX_INFO: (data: HybridInteractionMessage, locale: I18n, currentPrefix: string) => { return makeInfoEmbed({ - title: locale.__('settings_prefix.info', currentPrefix), + title: locale.__('settings_prefix.info', { PREFIX: currentPrefix}), description: locale.__('settings_prefix.info_description'), user: data.getUser() }); diff --git a/src/discord/Settings/index.ts b/src/discord/Settings/index.ts index 754d340..2ecfd4e 100644 --- a/src/discord/Settings/index.ts +++ b/src/discord/Settings/index.ts @@ -30,7 +30,7 @@ export const COMMON_EMBEDS = { NO_PERMISSION: (data: HybridInteractionMessage, locale: I18n) => { return makeErrorEmbed({ title: locale.__('common.no_permissions'), - description: locale.__('common.no_permissions_description','ADMINISTRATOR'), + description: locale.__('common.no_permissions_description', { PERMISSIONS: 'ADMINISTRATOR'}), user: data.getUser() }); }, @@ -47,7 +47,10 @@ const EMBEDS = { SETTINGS_INFO: (data: HybridInteractionMessage, locale: I18n, guild: Guild) => { return makeInfoEmbed({ title: locale.__('settings.title'), - description: locale.__('settings.description', DiscordProvider.client.user!.username, guild.name), + description: locale.__('settings.description', { + BOT_NAME: DiscordProvider.client.user!.username, + GUILD_NAME: guild.name + }), fields: [ { name: locale.__('common.available_args'), diff --git a/src/discord/Stats.ts b/src/discord/Stats.ts index 81a27bd..4022460 100644 --- a/src/discord/Stats.ts +++ b/src/discord/Stats.ts @@ -22,17 +22,15 @@ const EMBEDS = { fields: [ { name: `🌐 ${locale.__('stats.users')}`, - value: `${locale.__('stats.x_servers', totalServers.toString())}\n${locale.__( - 'stats.x_users', - totalUsers.toString() + value: `${locale.__('stats.x_servers', { COUNT: totalServers.toString() })}\n${locale.__( + 'stats.x_users', { COUNT: totalUsers.toString()} )}`, inline: true }, { name: `🟢 ${locale.__('stats.uptime_since')}`, - value: `${locale.__('stats.server_uptime_x', ``)}\n${locale.__( - 'stats.process_uptime_x', - `` + value: `${locale.__('stats.server_uptime_x', {TIME: ``})}\n${locale.__( + 'stats.process_uptime_x', { TIME: ``} )}`, inline: true } diff --git a/src/discord/UserInfo.ts b/src/discord/UserInfo.ts index b1f7649..1f39ce5 100644 --- a/src/discord/UserInfo.ts +++ b/src/discord/UserInfo.ts @@ -94,19 +94,19 @@ const EMBEDS = { let title = ''; switch (activity.type) { case 'PLAYING': - title = `'🕹 ${locale.__('userinfo.playing_x', activity.name)}`; + title = `'🕹 ${locale.__('userinfo.playing_x', {NAME: activity.name})}`; break; case 'STREAMING': - title = `'🔴 ${locale.__('userinfo.streaming_x', activity.name)}`; + title = `'🔴 ${locale.__('userinfo.streaming_x', {NAME: activity.name})}`; break; case 'LISTENING': - title = `🎵 ${locale.__('userinfo.listening_x', activity.name)}`; + title = `🎵 ${locale.__('userinfo.listening_x', {NAME: activity.name})}`; break; case 'WATCHING': - title = `📺 ${locale.__('userinfo.watching_x', activity.name)}`; + title = `📺 ${locale.__('userinfo.watching_x', {NAME: activity.name})}`; break; case 'COMPETING': - title = `'🌠 ${locale.__('userinfo.competing_x', activity.name)}`; + title = `'🌠 ${locale.__('userinfo.competing_x', {NAME: activity.name})}`; break; } embed.addField( @@ -126,7 +126,7 @@ const EMBEDS = { `${ user.joinedAt === null ? locale.__('userinfo.join_date_unknown') - : locale.__('userinfo.join_date', ``) + : locale.__('userinfo.join_date', {TIME: ``}) } ${user.isGuildOwner ? `${locale.__('userinfo.guild_owner')}` : ''} `