From ef079eb033380e704618f95dd32ffb7fc04f5c3b Mon Sep 17 00:00:00 2001 From: A Bunch of Computer Nerds Date: Tue, 17 Dec 2024 13:11:51 -0300 Subject: [PATCH] Fixing language structure --- src/commands/lastfm.js | 2 +- src/locales/english.json | 8 ++++---- src/locales/portuguese.json | 4 ++-- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/src/commands/lastfm.js b/src/commands/lastfm.js index bc164e1..76891bd 100644 --- a/src/commands/lastfm.js +++ b/src/commands/lastfm.js @@ -102,7 +102,7 @@ module.exports = (bot) => { const trackName = track.name; const artistName = track.artist['#text']; - const nowPlaying = track['@attr'] && track['@attr'].nowplaying ? Strings.lastFmListeningNow : Strings.lastFmLastPlayed; + const nowPlaying = track['@attr'] && track['@attr'].nowplaying ? Strings.varIs : Strings.varWas; const imageExtralarge = track.image.find(img => img.size === 'extralarge'); diff --git a/src/locales/english.json b/src/locales/english.json index 5ef3ce4..05ccb74 100644 --- a/src/locales/english.json +++ b/src/locales/english.json @@ -7,7 +7,9 @@ "unKnown": "Unknown", "varYes": "Yes", "varNo": "No", - "varTo": " to", + "varTo": "to", + "varIs": "is", + "varWas": "was", "varNone": "None", "invalidOption": "Whoops! Invalid option!", "kickingMyself": "*Since you don't need me, I'll leave.*", @@ -38,10 +40,8 @@ "lastFmNoUser": "*Please provide a Last.fm username.*\nExample: `/setuser `", "lastFmNoSet": "*You haven't set your Last.fm username yet.*\nUse the command /setuser to set.\n\nExample: `/setuser `", "lastFmNoRecent": "*No recent tracks found for Last.fm user* `{lastfmUser}`*.*", - "lastFmListeningNow": "is", "lastFmUserSet": "*Your Last.fm username has been set to:* `{lastUser}`.", - "lastFmLastPlayed": "was", - "lastFmStatusFor": "{lastfmUser} *{nowPlaying} listening{playCount}*:\n\n{trackName} by {artistName}", + "lastFmStatusFor": "{lastfmUser} *{nowPlaying} listening {playCount}*:\n\n{trackName} by {artistName}", "lastFmPlayCount": " by the {plays}th time", "lastFmErr": "*Error retrieving data for Last.fm user* {lastfmUser}.\n\n`{err}`", "currentCommit": "*Current commit:* `{commitHash}`", diff --git a/src/locales/portuguese.json b/src/locales/portuguese.json index 9137eed..0b2656f 100644 --- a/src/locales/portuguese.json +++ b/src/locales/portuguese.json @@ -8,6 +8,8 @@ "varYes": "Sim", "varNo": "Não", "varTo": "", + "varIs": "está", + "varWas": "estava", "varNone": "Nenhum", "invalidOption": "Ops! Opção inválida!", "kickingMyself": "*Já que você não precisa de mim, vou sair daqui.*", @@ -38,9 +40,7 @@ "lastFmNoUser": "*Por favor, forneça um nome de usuário do Last.fm.*\nExemplo: `/setuser `", "lastFmNoSet": "*Você ainda não definiu seu nome de usuário do Last.fm.*\nUse o comando /setuser para definir.\n\nExemplo: `/setuser `", "lastFmNoRecent": "*Nenhuma faixa recente encontrada para o usuário do Last.fm* `{lastfmUser}`*.*", - "lastFmListeningNow": "está", "lastFmUserSet": "*Seu nome de usuário do Last.fm foi definido como:* `{lastUser}`.", - "lastFmLastPlayed": "estava", "lastFmStatusFor": "{lastfmUser} *{nowPlaying} ouvindo{playCount}*:\n\n{trackName} por {artistName}", "lastFmPlayCount": " pela {plays}ª vez", "lastFmErr": "*Erro ao recuperar dados para o usuário do Last.fm* {lastfmUser}.\n\n`{err}`",