From 828ecc459e3dfc39a1748c6a09a23d56a05edbf0 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 5 Sep 2023 00:21:32 +0000 Subject: [PATCH 1/4] build(deps): bump actions/checkout from 3 to 4 Bumps [actions/checkout](https://github.com/actions/checkout) from 3 to 4. - [Release notes](https://github.com/actions/checkout/releases) - [Changelog](https://github.com/actions/checkout/blob/main/CHANGELOG.md) - [Commits](https://github.com/actions/checkout/compare/v3...v4) --- updated-dependencies: - dependency-name: actions/checkout dependency-type: direct:production update-type: version-update:semver-major ... Signed-off-by: dependabot[bot] --- .github/workflows/crowdin-download.yml | 2 +- .github/workflows/crowdin-upload.yml | 2 +- .github/workflows/lint.yml | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/crowdin-download.yml b/.github/workflows/crowdin-download.yml index 9e52a532..62ac4f7f 100644 --- a/.github/workflows/crowdin-download.yml +++ b/.github/workflows/crowdin-download.yml @@ -24,7 +24,7 @@ jobs: yarn global add i18next-parser - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Change branch to the update branch id: commits diff --git a/.github/workflows/crowdin-upload.yml b/.github/workflows/crowdin-upload.yml index 371d8196..dcb1836d 100644 --- a/.github/workflows/crowdin-upload.yml +++ b/.github/workflows/crowdin-upload.yml @@ -12,7 +12,7 @@ jobs: runs-on: ubuntu-latest steps: - name: Checkout - uses: actions/checkout@v3 + uses: actions/checkout@v4 - uses: dorny/paths-filter@v2.11.1 id: changes diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 199570e8..3b966510 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -14,7 +14,7 @@ jobs: steps: - name: Check out Git repository - uses: actions/checkout@v3 + uses: actions/checkout@v4 - name: Set up Node.js uses: actions/setup-node@v3.8.1 From 2ca742359c02e747ba68c3f7c9d30f58634b2fef Mon Sep 17 00:00:00 2001 From: Geczy Date: Fri, 8 Sep 2023 18:12:55 +0000 Subject: [PATCH 2/4] =?UTF-8?q?=F0=9F=92=85=20i18n=20update=20from=20crowd?= =?UTF-8?q?in?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- packages/dota/locales/af-ZA/translation.json | 10 ++++---- packages/dota/locales/ar-SA/translation.json | 26 ++++++++++---------- packages/dota/locales/ca-ES/translation.json | 10 ++++---- packages/dota/locales/cs-CZ/translation.json | 18 +++++++------- packages/dota/locales/da-DK/translation.json | 10 ++++---- packages/dota/locales/de-DE/translation.json | 10 ++++---- packages/dota/locales/el-GR/translation.json | 10 ++++---- packages/dota/locales/es-ES/translation.json | 10 ++++---- packages/dota/locales/fa-IR/translation.json | 10 ++++---- packages/dota/locales/fi-FI/translation.json | 10 ++++---- packages/dota/locales/fr-FR/translation.json | 10 ++++---- packages/dota/locales/he-IL/translation.json | 18 +++++++------- packages/dota/locales/hu-HU/translation.json | 10 ++++---- packages/dota/locales/it-IT/translation.json | 10 ++++---- packages/dota/locales/ja-JP/translation.json | 6 ++--- packages/dota/locales/ko-KR/translation.json | 6 ++--- packages/dota/locales/nl-NL/translation.json | 10 ++++---- packages/dota/locales/no-NO/translation.json | 10 ++++---- packages/dota/locales/pl-PL/translation.json | 20 +++++++-------- packages/dota/locales/pt-PT/translation.json | 10 ++++---- packages/dota/locales/ro-RO/translation.json | 14 +++++------ packages/dota/locales/ru-RU/translation.json | 18 +++++++------- packages/dota/locales/sr-SP/translation.json | 14 +++++------ packages/dota/locales/sv-SE/translation.json | 10 ++++---- packages/dota/locales/th-TH/translation.json | 8 +++--- packages/dota/locales/tr-TR/translation.json | 10 ++++---- packages/dota/locales/uk-UA/translation.json | 12 ++++----- packages/dota/locales/vi-VN/translation.json | 6 ++--- packages/dota/locales/zh-CN/translation.json | 6 ++--- packages/dota/locales/zh-TW/translation.json | 6 ++--- 30 files changed, 169 insertions(+), 169 deletions(-) diff --git a/packages/dota/locales/af-ZA/translation.json b/packages/dota/locales/af-ZA/translation.json index 2c43a5aa..4e482187 100644 --- a/packages/dota/locales/af-ZA/translation.json +++ b/packages/dota/locales/af-ZA/translation.json @@ -5,8 +5,8 @@ "pickup": "{{- heroName}} picked up the aegis!", "snatched": "{{- heroName}} snatched the aegis {{emote}}" }, - "apm_one": "Live APM: {{count}} {{emote}}", - "apm_other": "Live APM: {{count}} {{emote}}", + "apm_one": "Live APM for {{- heroName}}: {{count}} {{emote}}", + "apm_other": "Live APM for {{- heroName}}: {{count}} {{emote}}", "averageRank": "Average rank this game", "betaFeature": "[beta feature]", "betaTester": "$t(betaTester_on)", @@ -53,8 +53,8 @@ "dotabod": "I'm an open source bot made by {{author}}. More info: {{- url}}", "gameNotFound": "Game was not found", "gpm_zero": "", - "gpm_one": "Live GPM: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", - "gpm_other": "Live GPM: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", + "gpm_one": "Live GPM for {{- heroName}}: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", + "gpm_other": "Live GPM for {{- heroName}}: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", "heroItems": { "empty": "(2m delay) No items found for {{- heroName}}", "list": "(2m delay) {{- heroName}} has: {{- itemNames}}" @@ -191,5 +191,5 @@ "commit": "Server running version {{version}}, here's what's missing compared to the latest version: {{- url}}", "unknown": "Couldn't find the last git commit, here's the repo {{- url}}" }, - "xpm": "Live XPM: {{num}}" + "xpm": "Live XPM for {{- heroName}}: {{num}}" } diff --git a/packages/dota/locales/ar-SA/translation.json b/packages/dota/locales/ar-SA/translation.json index 36763319..06e9e4c4 100644 --- a/packages/dota/locales/ar-SA/translation.json +++ b/packages/dota/locales/ar-SA/translation.json @@ -5,12 +5,12 @@ "pickup": "التقط {{- heroName}} الحماية! اسم البطل\n", "snatched": "{{emote}}{{- heroName}} خطف ايجيس" }, - "apm_zero": "Live APM: {{count}} {{emote}}", - "apm_one": "Live APM: {{count}} {{emote}}", - "apm_two": "Live APM: {{count}} {{emote}}", - "apm_few": "Live APM: {{count}} {{emote}}", - "apm_many": "Live APM: {{count}} {{emote}}", - "apm_other": "Live APM: {{count}} {{emote}}", + "apm_zero": "Live APM for {{- heroName}}: {{count}} {{emote}}", + "apm_one": "Live APM for {{- heroName}}: {{count}} {{emote}}", + "apm_two": "Live APM for {{- heroName}}: {{count}} {{emote}}", + "apm_few": "Live APM for {{- heroName}}: {{count}} {{emote}}", + "apm_many": "Live APM for {{- heroName}}: {{count}} {{emote}}", + "apm_other": "Live APM for {{- heroName}}: {{count}} {{emote}}", "averageRank": "Average rank this game", "betaFeature": "[beta feature]", "betaTester": "$t(betaTester_on)", @@ -56,12 +56,12 @@ "dota2pt": "Need pro build ideas for {{- heroName}}? Check here {{- url}}", "dotabod": "I'm an open source bot made by {{author}}. More info: {{- url}}", "gameNotFound": "Game was not found", - "gpm_zero": "Live GPM: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", - "gpm_one": "Live GPM: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", - "gpm_two": "Live GPM: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", - "gpm_few": "Live GPM: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", - "gpm_many": "Live GPM: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", - "gpm_other": "Live GPM: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", + "gpm_zero": "Live GPM for {{- heroName}}: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", + "gpm_one": "Live GPM for {{- heroName}}: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", + "gpm_two": "Live GPM for {{- heroName}}: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", + "gpm_few": "Live GPM for {{- heroName}}: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", + "gpm_many": "Live GPM for {{- heroName}}: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", + "gpm_other": "Live GPM for {{- heroName}}: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", "heroItems": { "empty": "(2m delay) No items found for {{- heroName}}", "list": "(2m delay) {{- heroName}} has: {{- itemNames}}" @@ -242,5 +242,5 @@ "commit": "Server running version {{version}}, here's what's missing compared to the latest version: {{- url}}", "unknown": "Couldn't find the last git commit, here's the repo {{- url}}" }, - "xpm": "Live XPM: {{num}}" + "xpm": "Live XPM for {{- heroName}}: {{num}}" } diff --git a/packages/dota/locales/ca-ES/translation.json b/packages/dota/locales/ca-ES/translation.json index 9c317ebb..133ca3b3 100644 --- a/packages/dota/locales/ca-ES/translation.json +++ b/packages/dota/locales/ca-ES/translation.json @@ -5,9 +5,9 @@ "pickup": "{{- heroName}} picked up the aegis!", "snatched": "{{- heroName}} snatched the aegis {{emote}}" }, - "apm_one": "Live APM: {{count}} {{emote}}", + "apm_one": "Live APM for {{- heroName}}: {{count}} {{emote}}", "apm_many": "", - "apm_other": "Live APM: {{count}} {{emote}}", + "apm_other": "Live APM for {{- heroName}}: {{count}} {{emote}}", "averageRank": "Average rank this game", "betaFeature": "[beta feature]", "betaTester": "$t(betaTester_on)", @@ -54,8 +54,8 @@ "dotabod": "I'm an open source bot made by {{author}}. More info: {{- url}}", "gameNotFound": "Game was not found", "gpm_zero": "", - "gpm_one": "Live GPM: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", - "gpm_other": "Live GPM: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", + "gpm_one": "Live GPM for {{- heroName}}: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", + "gpm_other": "Live GPM for {{- heroName}}: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", "heroItems": { "empty": "(2m delay) No items found for {{- heroName}}", "list": "(2m delay) {{- heroName}} has: {{- itemNames}}" @@ -200,5 +200,5 @@ "commit": "Server running version {{version}}, here's what's missing compared to the latest version: {{- url}}", "unknown": "Couldn't find the last git commit, here's the repo {{- url}}" }, - "xpm": "Live XPM: {{num}}" + "xpm": "Live XPM for {{- heroName}}: {{num}}" } diff --git a/packages/dota/locales/cs-CZ/translation.json b/packages/dota/locales/cs-CZ/translation.json index 1d1de2b7..db9b4f33 100644 --- a/packages/dota/locales/cs-CZ/translation.json +++ b/packages/dota/locales/cs-CZ/translation.json @@ -5,10 +5,10 @@ "pickup": "{{- heroName}} získal aegis!", "snatched": "{{- heroName}} snatched the aegis {{emote}}" }, - "apm_one": "Live APM: {{count}} {{emote}}", - "apm_few": "Live APM: {{count}} {{emote}}", - "apm_many": "Live APM: {{count}} {{emote}}", - "apm_other": "Live APM: {{count}} {{emote}}", + "apm_one": "Live APM for {{- heroName}}: {{count}} {{emote}}", + "apm_few": "Live APM for {{- heroName}}: {{count}} {{emote}}", + "apm_many": "Live APM for {{- heroName}}: {{count}} {{emote}}", + "apm_other": "Live APM for {{- heroName}}: {{count}} {{emote}}", "averageRank": "Průměrný rank této hry", "betaFeature": "[beta funkce]", "betaTester": "$t(betaTester_on)", @@ -55,10 +55,10 @@ "dotabod": "Jsem open-source bot vytvořený {{author}}. Více info na {{- url}}", "gameNotFound": "Hra nebyla nalezena", "gpm_zero": "", - "gpm_one": "Live GPM: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", - "gpm_few": "Live GPM: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", - "gpm_many": "Live GPM: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", - "gpm_other": "Aktuální GPM: {{num}}. {{heroKills}} ze zabitých hrdinů, {{creepKills}} z creepů.", + "gpm_one": "Live GPM for {{- heroName}}: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", + "gpm_few": "Live GPM for {{- heroName}}: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", + "gpm_many": "Live GPM for {{- heroName}}: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", + "gpm_other": "Live GPM for {{- heroName}}: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", "heroItems": { "empty": "(2m delay) No items found for {{- heroName}}", "list": "(2m delay) {{- heroName}} has: {{- itemNames}}" @@ -217,5 +217,5 @@ "commit": "Server running version {{version}}, here's what's missing compared to the latest version: {{- url}}", "unknown": "Couldn't find the last git commit, here's the repo {{- url}}" }, - "xpm": "Aktuální XPM: {{num}}" + "xpm": "Live XPM for {{- heroName}}: {{num}}" } diff --git a/packages/dota/locales/da-DK/translation.json b/packages/dota/locales/da-DK/translation.json index 78ca6e91..c814c7b7 100644 --- a/packages/dota/locales/da-DK/translation.json +++ b/packages/dota/locales/da-DK/translation.json @@ -5,8 +5,8 @@ "pickup": "{{- heroName}} picked up the aegis!", "snatched": "{{- heroName}} snatched the aegis {{emote}}" }, - "apm_one": "Live APM: {{count}} {{emote}}", - "apm_other": "Live APM: {{count}} {{emote}}", + "apm_one": "Live APM for {{- heroName}}: {{count}} {{emote}}", + "apm_other": "Live APM for {{- heroName}}: {{count}} {{emote}}", "averageRank": "Average rank this game", "betaFeature": "[beta feature]", "betaTester": "$t(betaTester_on)", @@ -53,8 +53,8 @@ "dotabod": "I'm an open source bot made by {{author}}. More info: {{- url}}", "gameNotFound": "Game was not found", "gpm_zero": "", - "gpm_one": "Live GPM: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", - "gpm_other": "Live GPM: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", + "gpm_one": "Live GPM for {{- heroName}}: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", + "gpm_other": "Live GPM for {{- heroName}}: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", "heroItems": { "empty": "(2m delay) No items found for {{- heroName}}", "list": "(2m delay) {{- heroName}} has: {{- itemNames}}" @@ -191,5 +191,5 @@ "commit": "Server running version {{version}}, here's what's missing compared to the latest version: {{- url}}", "unknown": "Couldn't find the last git commit, here's the repo {{- url}}" }, - "xpm": "Live XPM: {{num}}" + "xpm": "Live XPM for {{- heroName}}: {{num}}" } diff --git a/packages/dota/locales/de-DE/translation.json b/packages/dota/locales/de-DE/translation.json index 82bd273a..ce56a995 100644 --- a/packages/dota/locales/de-DE/translation.json +++ b/packages/dota/locales/de-DE/translation.json @@ -5,8 +5,8 @@ "pickup": "{{- heroName}} hat die Aegis aufgehoben!", "snatched": "{{- heroName}} snatched the aegis PepeLaugh" }, - "apm_one": "Live APM: {{count}} Chatting", - "apm_other": "Live APM: {{count}} Chatting", + "apm_one": "Live APM for {{- heroName}}: {{count}} {{emote}}", + "apm_other": "Live APM for {{- heroName}}: {{count}} {{emote}}", "averageRank": "Durchschnittlicher Rang in diesem Spiel", "betaFeature": "[Beta-Funktion]", "betaTester": "$t(betaTester_on)", @@ -53,8 +53,8 @@ "dotabod": "Ich bin ein Open-Source-Bot erstellt von {{author}}. Weitere Infos: {{- url}}", "gameNotFound": "Spiel wurde nicht gefunden", "gpm_zero": "", - "gpm_one": "Live GPM: {{num}}. {{heroKills}} von Helden kills, {{creepKills}} von creep kills.", - "gpm_other": "Live GPM: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", + "gpm_one": "Live GPM for {{- heroName}}: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", + "gpm_other": "Live GPM for {{- heroName}}: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", "heroItems": { "empty": "(2m Verzögerung) Keine Items für {{- heroName}} gefunden", "list": "(2m Verzögerung) {{- heroName}} hat {{- itemNames}}" @@ -191,5 +191,5 @@ "commit": "Server mit Version {{version}}, hier gehts zur neuesten Version: {{- url}}", "unknown": "Couldn't find the last git commit, here's the repo {{- url}}" }, - "xpm": "Live XPM: {{num}}" + "xpm": "Live XPM for {{- heroName}}: {{num}}" } diff --git a/packages/dota/locales/el-GR/translation.json b/packages/dota/locales/el-GR/translation.json index 78ca6e91..c814c7b7 100644 --- a/packages/dota/locales/el-GR/translation.json +++ b/packages/dota/locales/el-GR/translation.json @@ -5,8 +5,8 @@ "pickup": "{{- heroName}} picked up the aegis!", "snatched": "{{- heroName}} snatched the aegis {{emote}}" }, - "apm_one": "Live APM: {{count}} {{emote}}", - "apm_other": "Live APM: {{count}} {{emote}}", + "apm_one": "Live APM for {{- heroName}}: {{count}} {{emote}}", + "apm_other": "Live APM for {{- heroName}}: {{count}} {{emote}}", "averageRank": "Average rank this game", "betaFeature": "[beta feature]", "betaTester": "$t(betaTester_on)", @@ -53,8 +53,8 @@ "dotabod": "I'm an open source bot made by {{author}}. More info: {{- url}}", "gameNotFound": "Game was not found", "gpm_zero": "", - "gpm_one": "Live GPM: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", - "gpm_other": "Live GPM: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", + "gpm_one": "Live GPM for {{- heroName}}: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", + "gpm_other": "Live GPM for {{- heroName}}: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", "heroItems": { "empty": "(2m delay) No items found for {{- heroName}}", "list": "(2m delay) {{- heroName}} has: {{- itemNames}}" @@ -191,5 +191,5 @@ "commit": "Server running version {{version}}, here's what's missing compared to the latest version: {{- url}}", "unknown": "Couldn't find the last git commit, here's the repo {{- url}}" }, - "xpm": "Live XPM: {{num}}" + "xpm": "Live XPM for {{- heroName}}: {{num}}" } diff --git a/packages/dota/locales/es-ES/translation.json b/packages/dota/locales/es-ES/translation.json index b6c3c7b0..fd87749b 100644 --- a/packages/dota/locales/es-ES/translation.json +++ b/packages/dota/locales/es-ES/translation.json @@ -5,9 +5,9 @@ "pickup": "¡{{- heroName}} recogió el aegis!", "snatched": "{{- heroName}} robó el aegis {{emote}}" }, - "apm_one": "APM en vivo: {{count}} {{emote}}", + "apm_one": "Live APM for {{- heroName}}: {{count}} {{emote}}", "apm_many": "", - "apm_other": "APM en vivo: {{count}} {{emote}}", + "apm_other": "Live APM for {{- heroName}}: {{count}} {{emote}}", "averageRank": "La media de este juego es", "betaFeature": "[función beta]", "betaTester": "$t(betaTester_on)", @@ -54,8 +54,8 @@ "dotabod": "Soy un bot hecho por {{author}}. Mas información {{- url}}", "gameNotFound": "Juego no encontrado", "gpm_zero": "", - "gpm_one": "OPM en vivo: {{num}}. {{heroKills}} asesinatos de héroes, {{creepKills}} asesinatos de creeps.", - "gpm_other": "GPM en vivo:{{num}}. {{heroKills}} de matando Héroes. {{creepKills}} de matando grimas.", + "gpm_one": "Live GPM for {{- heroName}}: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", + "gpm_other": "Live GPM for {{- heroName}}: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", "heroItems": { "empty": "(2m de retraso) No se encontraron items para {{- heroName}}", "list": "(2m de retraso) {{- heroName}} tiene: {{- itemNames}}" @@ -200,5 +200,5 @@ "commit": "El servidor esta ejecutando la versión {{version}}, esto es lo que falta en comparación con la última versión: {{- url}}", "unknown": "No se pudo encontrar el último git commit, aquí está el repositorio {{- url}}" }, - "xpm": "XPM en vivo: {{num}}" + "xpm": "Live XPM for {{- heroName}}: {{num}}" } diff --git a/packages/dota/locales/fa-IR/translation.json b/packages/dota/locales/fa-IR/translation.json index af98965a..cd494ce8 100644 --- a/packages/dota/locales/fa-IR/translation.json +++ b/packages/dota/locales/fa-IR/translation.json @@ -5,8 +5,8 @@ "pickup": " میتونه یه غذای رایگان بده {{- heroName}}", "snatched": "{{- heroName}} آنخ رو دزدید {{emote}}" }, - "apm_one": "Live APM: {{count}} {{emote}}", - "apm_other": "Live APM: {{count}} {{emote}}", + "apm_one": "Live APM for {{- heroName}}: {{count}} {{emote}}", + "apm_other": "Live APM for {{- heroName}}: {{count}} {{emote}}", "averageRank": "میانگین اکانت بایرهای این بازی", "betaFeature": "ویژگی\u200cهای بتا", "betaTester": "قابلیت بتا فعال شد $t(betaTester_on)", @@ -53,8 +53,8 @@ "dotabod": "I'm an open source bot made by {{author}}. More info: {{- url}}", "gameNotFound": "بازی پیدا نشد", "gpm_zero": "", - "gpm_one": "Live GPM: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", - "gpm_other": "Live GPM: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", + "gpm_one": "Live GPM for {{- heroName}}: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", + "gpm_other": "Live GPM for {{- heroName}}: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", "heroItems": { "empty": "(2m delay) No items found for {{- heroName}}", "list": "(2m delay) {{- heroName}} has: {{- itemNames}}" @@ -191,5 +191,5 @@ "commit": "Server running version {{version}}, here's what's missing compared to the latest version: {{- url}}", "unknown": "Couldn't find the last git commit, here's the repo {{- url}}" }, - "xpm": "Live XPM: {{num}}" + "xpm": "Live XPM for {{- heroName}}: {{num}}" } diff --git a/packages/dota/locales/fi-FI/translation.json b/packages/dota/locales/fi-FI/translation.json index 8edfe9f0..50f057a5 100644 --- a/packages/dota/locales/fi-FI/translation.json +++ b/packages/dota/locales/fi-FI/translation.json @@ -5,8 +5,8 @@ "pickup": "{{- heroName}} poimi aegiksen!", "snatched": "{{- heroName}} nappasi aegiksen {{emote}}" }, - "apm_one": "Live APM: {{count}} {{emote}}", - "apm_other": "Live APM: {{count}} {{emote}}", + "apm_one": "Live APM for {{- heroName}}: {{count}} {{emote}}", + "apm_other": "Live APM for {{- heroName}}: {{count}} {{emote}}", "averageRank": "Keskimääräinen rankki pelissä", "betaFeature": "[beta-ominaisuus]", "betaTester": "$t(betaTester_on)", @@ -53,8 +53,8 @@ "dotabod": "Olen avoimen lähdekoodin botti jonka on tehnyt {{author}}. Lisätietoja: {{- url}}", "gameNotFound": "Peliä ei löytynyt", "gpm_zero": "", - "gpm_one": "Live GPM: {{num}}. {{heroKills}} sankaritapoista, {{creepKills}} kätyritapoista.", - "gpm_other": "Live GPM: {{num}}. {{heroKills}} sankaritapoista, {{creepKills}} kätyritapoista.", + "gpm_one": "Live GPM for {{- heroName}}: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", + "gpm_other": "Live GPM for {{- heroName}}: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", "heroItems": { "empty": "(2min viive) Esineitä ei löytynyt sankarille {{- heroName}}", "list": "(2min viive) Sankarilla {{- heroName}} on: {{- itemNames}}" @@ -191,5 +191,5 @@ "commit": "Palvelin käyttää versiota {{version}}, tässä mitä puuttuu viimeisimpään versioon verrattuna: {{- url}}", "unknown": "Viimeistä git committia ei löytynyt, tässä osoitteessa repo {{- url}}" }, - "xpm": "Live XPM: {{num}}" + "xpm": "Live XPM for {{- heroName}}: {{num}}" } diff --git a/packages/dota/locales/fr-FR/translation.json b/packages/dota/locales/fr-FR/translation.json index 5f707a6e..0bc1b905 100644 --- a/packages/dota/locales/fr-FR/translation.json +++ b/packages/dota/locales/fr-FR/translation.json @@ -5,9 +5,9 @@ "pickup": "{{- heroName}} a ramassé l'Aegis of the Immortal !", "snatched": "{{- heroName}} a dérobé l'Aegis of the Immortal ! {{emote}}" }, - "apm_one": "Live APM: {{count}} {{emote}}", + "apm_one": "Live APM for {{- heroName}}: {{count}} {{emote}}", "apm_many": "", - "apm_other": "Live APM: {{count}} {{emote}}", + "apm_other": "Live APM for {{- heroName}}: {{count}} {{emote}}", "averageRank": "Rang moyen de ce match", "betaFeature": "[beta feature]", "betaTester": "$t(betaTester_on)", @@ -54,8 +54,8 @@ "dotabod": "Je suis un bot open source crée par {{author}}. Plus d'infos: {{- url}}", "gameNotFound": "La partie est introuvable", "gpm_zero": "", - "gpm_one": "OPM actuel : {{num}}. {{heroKills}} provenant de héros tués, {{creepKills}} provenant de creeps.", - "gpm_other": "OPM actuel : {{num}}. {{heroKills}} provenant de héros tués, {{creepKills}} provenant de creeps.", + "gpm_one": "Live GPM for {{- heroName}}: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", + "gpm_other": "Live GPM for {{- heroName}}: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", "heroItems": { "empty": "(2m délai) Pas d'items trouvé pour {{- heroName}}", "list": "(2m délai) {{- heroName}} possède : {{- itemNames}}" @@ -200,5 +200,5 @@ "commit": "Server running version {{version}}, here's what's missing compared to the latest version: {{- url}}", "unknown": "Couldn't find the last git commit, here's the repo {{- url}}" }, - "xpm": "Live XPM: {{num}}" + "xpm": "Live XPM for {{- heroName}}: {{num}}" } diff --git a/packages/dota/locales/he-IL/translation.json b/packages/dota/locales/he-IL/translation.json index d0b36ede..2a08e534 100644 --- a/packages/dota/locales/he-IL/translation.json +++ b/packages/dota/locales/he-IL/translation.json @@ -5,10 +5,10 @@ "pickup": "{{- heroName}} picked up the aegis!", "snatched": "{{- heroName}} snatched the aegis {{emote}}" }, - "apm_one": "Live APM: {{count}} {{emote}}", - "apm_two": "Live APM: {{count}} {{emote}}", - "apm_many": "Live APM: {{count}} {{emote}}", - "apm_other": "Live APM: {{count}} {{emote}}", + "apm_one": "Live APM for {{- heroName}}: {{count}} {{emote}}", + "apm_two": "Live APM for {{- heroName}}: {{count}} {{emote}}", + "apm_many": "Live APM for {{- heroName}}: {{count}} {{emote}}", + "apm_other": "Live APM for {{- heroName}}: {{count}} {{emote}}", "averageRank": "Average rank this game", "betaFeature": "[beta feature]", "betaTester": "$t(betaTester_on)", @@ -55,10 +55,10 @@ "dotabod": "I'm an open source bot made by {{author}}. More info: {{- url}}", "gameNotFound": "Game was not found", "gpm_zero": "", - "gpm_one": "Live GPM: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", - "gpm_two": "Live GPM: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", - "gpm_many": "Live GPM: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", - "gpm_other": "Live GPM: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", + "gpm_one": "Live GPM for {{- heroName}}: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", + "gpm_two": "Live GPM for {{- heroName}}: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", + "gpm_many": "Live GPM for {{- heroName}}: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", + "gpm_other": "Live GPM for {{- heroName}}: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", "heroItems": { "empty": "(2m delay) No items found for {{- heroName}}", "list": "(2m delay) {{- heroName}} has: {{- itemNames}}" @@ -217,5 +217,5 @@ "commit": "Server running version {{version}}, here's what's missing compared to the latest version: {{- url}}", "unknown": "Couldn't find the last git commit, here's the repo {{- url}}" }, - "xpm": "Live XPM: {{num}}" + "xpm": "Live XPM for {{- heroName}}: {{num}}" } diff --git a/packages/dota/locales/hu-HU/translation.json b/packages/dota/locales/hu-HU/translation.json index 0a5ad0d1..8c6d9503 100644 --- a/packages/dota/locales/hu-HU/translation.json +++ b/packages/dota/locales/hu-HU/translation.json @@ -5,8 +5,8 @@ "pickup": "{{- heroName}} felvette az aegist!", "snatched": "{{- heroName}} ellopta az aegis-t {{emote}}" }, - "apm_one": "Élő APM: {{count}} {{emote}}", - "apm_other": "Élő APM: {{count}} {{emote}}", + "apm_one": "Live APM for {{- heroName}}: {{count}} {{emote}}", + "apm_other": "Live APM for {{- heroName}}: {{count}} {{emote}}", "averageRank": "Átlagos rank ezen a meccsen", "betaFeature": "[beta funkció]", "betaTester": "$t(betaTester_on)", @@ -53,8 +53,8 @@ "dotabod": "Nyílt forráskódú bot vagyok, {{author}} tervezett. Több információért {{- url}}", "gameNotFound": "Meccs nem található", "gpm_zero": "", - "gpm_one": "Élő GPM: {{num}}. Amiből {{heroKills}} killekből, {{creepKills}} creepekből származó gold.", - "gpm_other": "Élő GPM: {{num}}. Amiből {{heroKills}} killekből, {{creepKills}} creepekből származó gold.", + "gpm_one": "Live GPM for {{- heroName}}: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", + "gpm_other": "Live GPM for {{- heroName}}: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", "heroItems": { "empty": "(2p delay) Itemek nem találhatóak {{- heroName}}-hez.", "list": "(2p delay) {{- heroName}} itemjei: {{- itemNames}}" @@ -191,5 +191,5 @@ "commit": "Szerveren futó verzió: {{version}}, itt megtalálod mi változott az előző verzióhoz képest: {{- url}}", "unknown": "Nem találom az utolsó git commitot, a repot itt éred el: {{- url}}" }, - "xpm": "Élő XPM: {{num}}" + "xpm": "Live XPM for {{- heroName}}: {{num}}" } diff --git a/packages/dota/locales/it-IT/translation.json b/packages/dota/locales/it-IT/translation.json index ed9e8882..32b0b136 100644 --- a/packages/dota/locales/it-IT/translation.json +++ b/packages/dota/locales/it-IT/translation.json @@ -5,9 +5,9 @@ "pickup": "{{- heroName}} ha preso l'egida", "snatched": "{{- heroName}} ha rubato l'egida {{emote}}" }, - "apm_one": "APM live: {{count}} {{emote}}", + "apm_one": "Live APM for {{- heroName}}: {{count}} {{emote}}", "apm_many": "", - "apm_other": "APM live: {{count}} {{emote}}", + "apm_other": "Live APM for {{- heroName}}: {{count}} {{emote}}", "averageRank": "Rank medio in questa partita", "betaFeature": "[funzione beta]", "betaTester": "$t(betaTester_on)", @@ -54,8 +54,8 @@ "dotabod": "Sono un bot open source creato da {{author}}. Più info: {{- url}}", "gameNotFound": "La partita non è stata trovata", "gpm_zero": "", - "gpm_one": "GPM Live: {{num}}. {{heroKills}} da kill, {{creepKills}} da creep.", - "gpm_other": "GPM Live: {{num}}. {{heroKills}} da kill, {{creepKills}} da creep.", + "gpm_one": "Live GPM for {{- heroName}}: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", + "gpm_other": "Live GPM for {{- heroName}}: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", "heroItems": { "empty": "(Delay di 2m) Nessun oggetto trovato per {{- heroName}}", "list": "(Delay di 2m) {{- heroName}} ha: {{- itemNames}}" @@ -200,5 +200,5 @@ "commit": "La versione corrente del server è {{version}}, ecco cosa manca rispetto all'ultima versione: {{- url}}", "unknown": "Impossibile trovare l'ultimo git commit, ecco il repo {{- url}}" }, - "xpm": "XPM Live: {{num}}" + "xpm": "Live XPM for {{- heroName}}: {{num}}" } diff --git a/packages/dota/locales/ja-JP/translation.json b/packages/dota/locales/ja-JP/translation.json index 00a81ecf..af297d13 100644 --- a/packages/dota/locales/ja-JP/translation.json +++ b/packages/dota/locales/ja-JP/translation.json @@ -5,7 +5,7 @@ "pickup": "{{- heroName}} picked up the aegis!", "snatched": "{{- heroName}} snatched the aegis {{emote}}" }, - "apm_other": "Live APM: {{count}} {{emote}}", + "apm_other": "Live APM for {{- heroName}}: {{count}} {{emote}}", "averageRank": "Average rank this game", "betaFeature": "[beta feature]", "betaTester": "$t(betaTester_on)", @@ -52,7 +52,7 @@ "dotabod": "I'm an open source bot made by {{author}}. More info: {{- url}}", "gameNotFound": "Game was not found", "gpm_zero": "", - "gpm_other": "Live GPM: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", + "gpm_other": "Live GPM for {{- heroName}}: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", "heroItems": { "empty": "(2m delay) No items found for {{- heroName}}", "list": "(2m delay) {{- heroName}} has: {{- itemNames}}" @@ -178,5 +178,5 @@ "commit": "Server running version {{version}}, here's what's missing compared to the latest version: {{- url}}", "unknown": "Couldn't find the last git commit, here's the repo {{- url}}" }, - "xpm": "Live XPM: {{num}}" + "xpm": "Live XPM for {{- heroName}}: {{num}}" } diff --git a/packages/dota/locales/ko-KR/translation.json b/packages/dota/locales/ko-KR/translation.json index 00a81ecf..af297d13 100644 --- a/packages/dota/locales/ko-KR/translation.json +++ b/packages/dota/locales/ko-KR/translation.json @@ -5,7 +5,7 @@ "pickup": "{{- heroName}} picked up the aegis!", "snatched": "{{- heroName}} snatched the aegis {{emote}}" }, - "apm_other": "Live APM: {{count}} {{emote}}", + "apm_other": "Live APM for {{- heroName}}: {{count}} {{emote}}", "averageRank": "Average rank this game", "betaFeature": "[beta feature]", "betaTester": "$t(betaTester_on)", @@ -52,7 +52,7 @@ "dotabod": "I'm an open source bot made by {{author}}. More info: {{- url}}", "gameNotFound": "Game was not found", "gpm_zero": "", - "gpm_other": "Live GPM: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", + "gpm_other": "Live GPM for {{- heroName}}: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", "heroItems": { "empty": "(2m delay) No items found for {{- heroName}}", "list": "(2m delay) {{- heroName}} has: {{- itemNames}}" @@ -178,5 +178,5 @@ "commit": "Server running version {{version}}, here's what's missing compared to the latest version: {{- url}}", "unknown": "Couldn't find the last git commit, here's the repo {{- url}}" }, - "xpm": "Live XPM: {{num}}" + "xpm": "Live XPM for {{- heroName}}: {{num}}" } diff --git a/packages/dota/locales/nl-NL/translation.json b/packages/dota/locales/nl-NL/translation.json index 78ca6e91..c814c7b7 100644 --- a/packages/dota/locales/nl-NL/translation.json +++ b/packages/dota/locales/nl-NL/translation.json @@ -5,8 +5,8 @@ "pickup": "{{- heroName}} picked up the aegis!", "snatched": "{{- heroName}} snatched the aegis {{emote}}" }, - "apm_one": "Live APM: {{count}} {{emote}}", - "apm_other": "Live APM: {{count}} {{emote}}", + "apm_one": "Live APM for {{- heroName}}: {{count}} {{emote}}", + "apm_other": "Live APM for {{- heroName}}: {{count}} {{emote}}", "averageRank": "Average rank this game", "betaFeature": "[beta feature]", "betaTester": "$t(betaTester_on)", @@ -53,8 +53,8 @@ "dotabod": "I'm an open source bot made by {{author}}. More info: {{- url}}", "gameNotFound": "Game was not found", "gpm_zero": "", - "gpm_one": "Live GPM: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", - "gpm_other": "Live GPM: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", + "gpm_one": "Live GPM for {{- heroName}}: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", + "gpm_other": "Live GPM for {{- heroName}}: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", "heroItems": { "empty": "(2m delay) No items found for {{- heroName}}", "list": "(2m delay) {{- heroName}} has: {{- itemNames}}" @@ -191,5 +191,5 @@ "commit": "Server running version {{version}}, here's what's missing compared to the latest version: {{- url}}", "unknown": "Couldn't find the last git commit, here's the repo {{- url}}" }, - "xpm": "Live XPM: {{num}}" + "xpm": "Live XPM for {{- heroName}}: {{num}}" } diff --git a/packages/dota/locales/no-NO/translation.json b/packages/dota/locales/no-NO/translation.json index 78ca6e91..c814c7b7 100644 --- a/packages/dota/locales/no-NO/translation.json +++ b/packages/dota/locales/no-NO/translation.json @@ -5,8 +5,8 @@ "pickup": "{{- heroName}} picked up the aegis!", "snatched": "{{- heroName}} snatched the aegis {{emote}}" }, - "apm_one": "Live APM: {{count}} {{emote}}", - "apm_other": "Live APM: {{count}} {{emote}}", + "apm_one": "Live APM for {{- heroName}}: {{count}} {{emote}}", + "apm_other": "Live APM for {{- heroName}}: {{count}} {{emote}}", "averageRank": "Average rank this game", "betaFeature": "[beta feature]", "betaTester": "$t(betaTester_on)", @@ -53,8 +53,8 @@ "dotabod": "I'm an open source bot made by {{author}}. More info: {{- url}}", "gameNotFound": "Game was not found", "gpm_zero": "", - "gpm_one": "Live GPM: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", - "gpm_other": "Live GPM: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", + "gpm_one": "Live GPM for {{- heroName}}: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", + "gpm_other": "Live GPM for {{- heroName}}: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", "heroItems": { "empty": "(2m delay) No items found for {{- heroName}}", "list": "(2m delay) {{- heroName}} has: {{- itemNames}}" @@ -191,5 +191,5 @@ "commit": "Server running version {{version}}, here's what's missing compared to the latest version: {{- url}}", "unknown": "Couldn't find the last git commit, here's the repo {{- url}}" }, - "xpm": "Live XPM: {{num}}" + "xpm": "Live XPM for {{- heroName}}: {{num}}" } diff --git a/packages/dota/locales/pl-PL/translation.json b/packages/dota/locales/pl-PL/translation.json index 2b5f83ef..4771f60f 100644 --- a/packages/dota/locales/pl-PL/translation.json +++ b/packages/dota/locales/pl-PL/translation.json @@ -5,10 +5,10 @@ "pickup": "{{- heroName}} podniósł aegisa!", "snatched": "{{- heroName}} podwędził aegisa {{emote}}" }, - "apm_one": "Aktualny APM: {{count}} {{emote}}", - "apm_few": "Aktualny APM: {{count}} {{emote}}", - "apm_many": "Aktualny APM: {{count}} {{emote}}", - "apm_other": "Aktualny APM: {{count}} {{emote}}", + "apm_one": "Aktualny APM dla {{- heroName}}: {{count}} {{emote}}", + "apm_few": "Aktualny APM dla {{- heroName}}: {{count}} {{emote}}", + "apm_many": "Aktualny APM dla {{- heroName}}: {{count}} {{emote}}", + "apm_other": "Aktualny APM dla {{- heroName}}: {{count}} {{emote}}", "averageRank": "Średni ranking w tej grze", "betaFeature": "[funkcje beta]", "betaTester": "$t(betaTester_on)", @@ -55,10 +55,10 @@ "dotabod": "Jestem otwartoźródłowym botem stworzonym przez {{author}}. Więcej informacji: {{- url}}", "gameNotFound": "Gra nie została znaleziona", "gpm_zero": "", - "gpm_one": "Złoto na minutę (GPM): {{num}}. {{heroKills}} z zabójstw bohaterów, {{creepKills}} z dobić creepów.", - "gpm_few": "Złoto na minutę (GPM): {{num}}. {{heroKills}} z zabójstw bohaterów, {{creepKills}} z dobić creepów.", - "gpm_many": "Złoto na minutę (GPM): {{num}}. {{heroKills}} z zabójstw bohaterów, {{creepKills}} z dobić creepów.", - "gpm_other": "Złoto na minutę (GPM): {{num}}. {{heroKills}} z zabójstw bohaterów, {{creepKills}} z dobić creepów.", + "gpm_one": "Aktualne złoto na minutę (GPM) dla {{- heroName}}: {{num}}. Z {{heroKills}} zabójstwa bohatera, z {{creepKills}} zabójstw creepów.", + "gpm_few": "Aktualne złoto na minutę (GPM) dla {{- heroName}}: {{num}}. Z {{heroKills}} zabójstw bohaterów, z {{creepKills}} zabójstw creepów.", + "gpm_many": "Aktualne złoto na minutę (GPM) dla {{- heroName}}: {{num}}. Z {{heroKills}} zabójstw bohaterów, z {{creepKills}} zabójstw creepów.", + "gpm_other": "Aktualne złoto na minutę (GPM) dla {{- heroName}}: {{num}}. Z {{heroKills}} zabójstw bohaterów, z {{creepKills}} zabójstw creepów.", "heroItems": { "empty": "(2min opóźnienia) Nie znaleziono przedmiotów dla {{- heroName}}", "list": "(2min opóźnienia) {{- heroName}} posiada: {{- itemNames}}" @@ -212,10 +212,10 @@ "updateMmr_auto": "Zaktualizowano MMR do {{mmr}}", "updateMmr_manual": "Zaktualizowano MMR na {{mmr}}", "updateMmrMulti": "Wiele kont Steam, aktualizuję to, z którego jesteś aktualnie zalogowany ({{steamId}})", - "updateMmrNoChange": "MMR already {{mmr}}, no change was made", + "updateMmrNoChange": "MMR jest już ustawiony na {{mmr}}, nie wprowadzono żadnych zmian", "version": { "commit": "Serwer działa w wersji {{version}}, tutaj co się zmieniło w najnowszej wersji: {{- url}}", "unknown": "Nie można znaleźć ostatniego commitu git tutaj, oto repozytorium {{- url}}" }, - "xpm": "Aktualny XPM: {{num}}" + "xpm": "Aktualny XPM dla {{- heroName}}: {{num}}" } diff --git a/packages/dota/locales/pt-PT/translation.json b/packages/dota/locales/pt-PT/translation.json index fd764e14..6361b70a 100644 --- a/packages/dota/locales/pt-PT/translation.json +++ b/packages/dota/locales/pt-PT/translation.json @@ -5,9 +5,9 @@ "pickup": "{{- heroName}} pegou o aegis", "snatched": "{{- heroName}} Negou a égide {{emote}}" }, - "apm_one": "Live APM: {{count}} {{emote}}", + "apm_one": "Live APM for {{- heroName}}: {{count}} {{emote}}", "apm_many": "", - "apm_other": "Live APM: {{count}} {{emote}}", + "apm_other": "Live APM for {{- heroName}}: {{count}} {{emote}}", "averageRank": "Média de rank este jogo", "betaFeature": "[recurso beta]", "betaTester": "$t(betaTester_on)", @@ -54,8 +54,8 @@ "dotabod": "Eu sou um bot open source feito por {{author}}. Mais informações: {{- url}}", "gameNotFound": "Partida não encontrada", "gpm_zero": "", - "gpm_one": "Live GPM: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", - "gpm_other": "GPM ao vivo: {{num}}. {{heroKills}} de hérois, {{creepKills}} de creeps.", + "gpm_one": "Live GPM for {{- heroName}}: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", + "gpm_other": "Live GPM for {{- heroName}}: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", "heroItems": { "empty": "(2m delay) Nenhum item encontrado para o herói {{- heroName}}", "list": "(2m delay) {{- heroName}} has: {{- itemNames}}" @@ -200,5 +200,5 @@ "commit": "Server running version {{version}}, here's what's missing compared to the latest version: {{- url}}", "unknown": "Não foi possível encontrar o último git commit, aqui está o repositório {{- url}}" }, - "xpm": "XPM ao vivo: {{num}}" + "xpm": "Live XPM for {{- heroName}}: {{num}}" } diff --git a/packages/dota/locales/ro-RO/translation.json b/packages/dota/locales/ro-RO/translation.json index 3662e149..aa08efae 100644 --- a/packages/dota/locales/ro-RO/translation.json +++ b/packages/dota/locales/ro-RO/translation.json @@ -5,9 +5,9 @@ "pickup": "{{- heroName}} picked up the aegis!", "snatched": "{{- heroName}} snatched the aegis {{emote}}" }, - "apm_one": "Live APM: {{count}} {{emote}}", - "apm_few": "Live APM: {{count}} {{emote}}", - "apm_other": "Live APM: {{count}} {{emote}}", + "apm_one": "Live APM for {{- heroName}}: {{count}} {{emote}}", + "apm_few": "Live APM for {{- heroName}}: {{count}} {{emote}}", + "apm_other": "Live APM for {{- heroName}}: {{count}} {{emote}}", "averageRank": "Average rank this game", "betaFeature": "[beta feature]", "betaTester": "$t(betaTester_on)", @@ -54,9 +54,9 @@ "dotabod": "I'm an open source bot made by {{author}}. More info: {{- url}}", "gameNotFound": "Game was not found", "gpm_zero": "", - "gpm_one": "Live GPM: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", - "gpm_few": "Live GPM: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", - "gpm_other": "Live GPM: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", + "gpm_one": "Live GPM for {{- heroName}}: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", + "gpm_few": "Live GPM for {{- heroName}}: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", + "gpm_other": "Live GPM for {{- heroName}}: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", "heroItems": { "empty": "(2m delay) No items found for {{- heroName}}", "list": "(2m delay) {{- heroName}} has: {{- itemNames}}" @@ -204,5 +204,5 @@ "commit": "Server running version {{version}}, here's what's missing compared to the latest version: {{- url}}", "unknown": "Couldn't find the last git commit, here's the repo {{- url}}" }, - "xpm": "Live XPM: {{num}}" + "xpm": "Live XPM for {{- heroName}}: {{num}}" } diff --git a/packages/dota/locales/ru-RU/translation.json b/packages/dota/locales/ru-RU/translation.json index 6948cd2e..c5e729b7 100644 --- a/packages/dota/locales/ru-RU/translation.json +++ b/packages/dota/locales/ru-RU/translation.json @@ -5,10 +5,10 @@ "pickup": "{{- heroName}} подбирает аегис!", "snatched": "{{- heroName}} крадёт аегис {{emote}}" }, - "apm_one": "Текущий APM: {{count}} {{emote}}", - "apm_few": "Текущий APM: {{count}} {{emote}}", - "apm_many": "Текущий APM: {{count}} {{emote}}", - "apm_other": "Текущий APM: {{count}} {{emote}}", + "apm_one": "Live APM for {{- heroName}}: {{count}} {{emote}}", + "apm_few": "Live APM for {{- heroName}}: {{count}} {{emote}}", + "apm_many": "Live APM for {{- heroName}}: {{count}} {{emote}}", + "apm_other": "Live APM for {{- heroName}}: {{count}} {{emote}}", "averageRank": "Средний ранг этой игры", "betaFeature": "[бета-функция]", "betaTester": "$t(betaTester_on)", @@ -55,10 +55,10 @@ "dotabod": "Я - бот с открытым исходным кодом, созданный {{author}}. Дополнительная информация: {{- url}}", "gameNotFound": "Игра не найдена", "gpm_zero": "", - "gpm_one": "Текущий GPM: {{num}}. {{heroKills}} от убийства героев, {{creepKills}} от убийства крипов.", - "gpm_few": "Текущий GPM: {{num}}. {{heroKills}} от убийства героев, {{creepKills}} от убийства крипов.", - "gpm_many": "Текущий GPM: {{num}}. {{heroKills}} от убийства героев, {{creepKills}} от убийства крипов.", - "gpm_other": "Текущий GPM: {{num}}. {{heroKills}} от убийств героев, {{creepKills}} от убийств крипов.", + "gpm_one": "Live GPM for {{- heroName}}: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", + "gpm_few": "Live GPM for {{- heroName}}: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", + "gpm_many": "Live GPM for {{- heroName}}: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", + "gpm_other": "Live GPM for {{- heroName}}: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", "heroItems": { "empty": "(2 мин. задержка) Не найдено предметов у {{- heroName}}", "list": "(2 мин. задержка) {{- heroName}} имеет: {{- itemNames}}" @@ -217,5 +217,5 @@ "commit": "Сервер работает на версии {{version}}, вот что отсутствует по сравнению с последней версией: {{- url}}", "unknown": "Не удалось найти последний коммит git, репозиторий находится здесь {{- url}}" }, - "xpm": "Текущий XPM: {{num}}" + "xpm": "Live XPM for {{- heroName}}: {{num}}" } diff --git a/packages/dota/locales/sr-SP/translation.json b/packages/dota/locales/sr-SP/translation.json index 3662e149..aa08efae 100644 --- a/packages/dota/locales/sr-SP/translation.json +++ b/packages/dota/locales/sr-SP/translation.json @@ -5,9 +5,9 @@ "pickup": "{{- heroName}} picked up the aegis!", "snatched": "{{- heroName}} snatched the aegis {{emote}}" }, - "apm_one": "Live APM: {{count}} {{emote}}", - "apm_few": "Live APM: {{count}} {{emote}}", - "apm_other": "Live APM: {{count}} {{emote}}", + "apm_one": "Live APM for {{- heroName}}: {{count}} {{emote}}", + "apm_few": "Live APM for {{- heroName}}: {{count}} {{emote}}", + "apm_other": "Live APM for {{- heroName}}: {{count}} {{emote}}", "averageRank": "Average rank this game", "betaFeature": "[beta feature]", "betaTester": "$t(betaTester_on)", @@ -54,9 +54,9 @@ "dotabod": "I'm an open source bot made by {{author}}. More info: {{- url}}", "gameNotFound": "Game was not found", "gpm_zero": "", - "gpm_one": "Live GPM: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", - "gpm_few": "Live GPM: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", - "gpm_other": "Live GPM: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", + "gpm_one": "Live GPM for {{- heroName}}: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", + "gpm_few": "Live GPM for {{- heroName}}: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", + "gpm_other": "Live GPM for {{- heroName}}: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", "heroItems": { "empty": "(2m delay) No items found for {{- heroName}}", "list": "(2m delay) {{- heroName}} has: {{- itemNames}}" @@ -204,5 +204,5 @@ "commit": "Server running version {{version}}, here's what's missing compared to the latest version: {{- url}}", "unknown": "Couldn't find the last git commit, here's the repo {{- url}}" }, - "xpm": "Live XPM: {{num}}" + "xpm": "Live XPM for {{- heroName}}: {{num}}" } diff --git a/packages/dota/locales/sv-SE/translation.json b/packages/dota/locales/sv-SE/translation.json index d55b0d7d..635c9f9c 100644 --- a/packages/dota/locales/sv-SE/translation.json +++ b/packages/dota/locales/sv-SE/translation.json @@ -5,8 +5,8 @@ "pickup": "{{- heroName}} plockade upp aegisen!", "snatched": "{{- heroName}} snodde åt sig aegisen {{emote}}" }, - "apm_one": "Live APM: {{count}} {{emote}}", - "apm_other": "Live APM: {{count}} {{emote}}", + "apm_one": "Live APM for {{- heroName}}: {{count}} {{emote}}", + "apm_other": "Live APM for {{- heroName}}: {{count}} {{emote}}", "averageRank": "Genomsnittlig rank i denna match", "betaFeature": "[beta-funktion]", "betaTester": "$t(betaTester_on)", @@ -53,8 +53,8 @@ "dotabod": "Jag är en bot med öppen källkod skapad av {{author}}. Mer info: {{- url}}", "gameNotFound": "Matchen hittades inte", "gpm_zero": "", - "gpm_one": "Live GPM: {{num}}. {{heroKills}} från hero kills, {{creepKills}} från creep kills.", - "gpm_other": "Live GPM: {{num}}. {{heroKills}} från hero kills, {{creepKills}} från creep kills.", + "gpm_one": "Live GPM for {{- heroName}}: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", + "gpm_other": "Live GPM for {{- heroName}}: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", "heroItems": { "empty": "(2min fördröjning) Inga föremål hittades för {{- heroName}}", "list": "(2min fördröjning) {{- heroName}} har: {{- itemNames}}" @@ -191,5 +191,5 @@ "commit": "Servern kör version {{version}}, här är vad som saknas jämfört med den senaste versionen: {{- url}}", "unknown": "Kunde inte hitta den senaste git-commiten, här är repot {{- url}}" }, - "xpm": "Live XPM: {{num}}" + "xpm": "Live XPM for {{- heroName}}: {{num}}" } diff --git a/packages/dota/locales/th-TH/translation.json b/packages/dota/locales/th-TH/translation.json index 30dc5c0c..6a7631c3 100644 --- a/packages/dota/locales/th-TH/translation.json +++ b/packages/dota/locales/th-TH/translation.json @@ -167,15 +167,15 @@ "updateMmr": "$t(updateMmr_manual)", "updateMmr_auto": "Updated MMR to {{mmr}}", "updateMmr_manual": "Updated MMR to {{mmr}}", - "updateMmrNoChange": "MMR already {{mmr}}, no change was made", "updateMmrMulti": "Multiple steam accounts, updating the one you are currently logged in with ({{steamId}})", + "updateMmrNoChange": "MMR already {{mmr}}, no change was made", "version": { "commit": "Server running version {{version}}, here's what's missing compared to the latest version: {{- url}}", "unknown": "Couldn't find the last git commit, here's the repo {{- url}}" }, - "xpm": "Live XPM: {{num}}", - "apm_other": "Live APM: {{count}} {{emote}}", - "gpm_other": "Live GPM: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", + "xpm": "Live XPM for {{- heroName}}: {{num}}", + "apm_other": "Live APM for {{- heroName}}: {{count}} {{emote}}", + "gpm_other": "Live GPM for {{- heroName}}: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", "seconds_other": "{{count}} seconds", "treadToggle_other": "We toggled treads {{count}} times to save a total {{manaCount}} mana this match." } \ No newline at end of file diff --git a/packages/dota/locales/tr-TR/translation.json b/packages/dota/locales/tr-TR/translation.json index 15ee8eea..e57acfcb 100644 --- a/packages/dota/locales/tr-TR/translation.json +++ b/packages/dota/locales/tr-TR/translation.json @@ -5,8 +5,8 @@ "pickup": "{{- heroName}} Aegis'i aldı!", "snatched": "{{- heroName}} Aegis'i çaldı {{emote}}" }, - "apm_one": "Anlık APM: {{count}} {{emote}}", - "apm_other": "Anlık APM: {{count}} {{emote}}", + "apm_one": "Live APM for {{- heroName}}: {{count}} {{emote}}", + "apm_other": "Live APM for {{- heroName}}: {{count}} {{emote}}", "averageRank": "Oyunun ortalama sıralaması", "betaFeature": "Beta özellikleri", "betaTester": "$t(betaTester_on)", @@ -53,8 +53,8 @@ "dotabod": "Ben {{author}} tarafından yaratılan açık kaynaklı bir botum. Daha detaylı bilgi için {{- url}}", "gameNotFound": "Oyun bulunamadı", "gpm_zero": "", - "gpm_one": "Anlık GPM:{{num}} {{heroKills}} kahraman ölümlerinden, {{creepKills}} creep ölümlerinden.", - "gpm_other": "Anlık GPM:{{num}} {{heroKills}} kahraman ölümlerinden, {{creepKills}} creep ölümlerinden.", + "gpm_one": "Live GPM for {{- heroName}}: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", + "gpm_other": "Live GPM for {{- heroName}}: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", "heroItems": { "empty": "(2 dakika gecikme) {{- heroName}} için item bulunamadı", "list": "(2 dakika gecikme) {{- heroName}} {{- itemNames}} var" @@ -191,5 +191,5 @@ "commit": "Mevcut sunucu versiyonu {{version}}, işte en son sürüme kıyasla eksik olan şeyler: {{- url}}", "unknown": "Son git bulunamadı, raporlar burada {{- url}}" }, - "xpm": "Anlık XPM: {{num}}" + "xpm": "Live XPM for {{- heroName}}: {{num}}" } diff --git a/packages/dota/locales/uk-UA/translation.json b/packages/dota/locales/uk-UA/translation.json index 20db52ef..fb24232c 100644 --- a/packages/dota/locales/uk-UA/translation.json +++ b/packages/dota/locales/uk-UA/translation.json @@ -5,10 +5,10 @@ "pickup": "{{- heroName}} підібрав Аєгіс!", "snatched": "{{- heroName}} викрав Аєгіс {{emote}}" }, - "apm_one": "Поточний APM: {{count}} {{emote}}", - "apm_few": "Поточний APM: {{count}} {{emote}}", - "apm_many": "Поточний APM: {{count}} {{emote}}", - "apm_other": "Поточний APM: {{count}} {{emote}}", + "apm_one": "Поточний APM для {{- heroName}}: {{count}} {{emote}}", + "apm_few": "Поточний APM для {{- heroName}}: {{count}} {{emote}}", + "apm_many": "Поточний APM для {{- heroName}}: {{count}} {{emote}}", + "apm_other": "Поточний APM для {{- heroName}}: {{count}} {{emote}}", "averageRank": "Середній рейтинг цієї гри", "betaFeature": "[бета-функція]", "betaTester": "$t(betaTester_on)", @@ -212,10 +212,10 @@ "updateMmr_auto": "Рейтинг змінено до {{mmr}} MMR", "updateMmr_manual": "Рейтинг змінено до {{mmr}} MMR", "updateMmrMulti": "Кілька облікових записів Steam. Оновлення акаунту, з якого ви увійшли наразі ({{steamId}})", - "updateMmrNoChange": "MMR already {{mmr}}, no change was made", + "updateMmrNoChange": "MMR вже {{mmr}}, змін не було здійснено", "version": { "commit": "Версія запущеного серверу {{version}}, ось що пропущено порівняно з останньою версією: {{- url}}", "unknown": "Не вдалося знайти останній коміт, тому посилання на репозиторій {{- url}}" }, - "xpm": "Поточний XPM: {{num}}" + "xpm": "Поточний XPM для {{- heroName}}: {{num}}" } diff --git a/packages/dota/locales/vi-VN/translation.json b/packages/dota/locales/vi-VN/translation.json index 00a81ecf..af297d13 100644 --- a/packages/dota/locales/vi-VN/translation.json +++ b/packages/dota/locales/vi-VN/translation.json @@ -5,7 +5,7 @@ "pickup": "{{- heroName}} picked up the aegis!", "snatched": "{{- heroName}} snatched the aegis {{emote}}" }, - "apm_other": "Live APM: {{count}} {{emote}}", + "apm_other": "Live APM for {{- heroName}}: {{count}} {{emote}}", "averageRank": "Average rank this game", "betaFeature": "[beta feature]", "betaTester": "$t(betaTester_on)", @@ -52,7 +52,7 @@ "dotabod": "I'm an open source bot made by {{author}}. More info: {{- url}}", "gameNotFound": "Game was not found", "gpm_zero": "", - "gpm_other": "Live GPM: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", + "gpm_other": "Live GPM for {{- heroName}}: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", "heroItems": { "empty": "(2m delay) No items found for {{- heroName}}", "list": "(2m delay) {{- heroName}} has: {{- itemNames}}" @@ -178,5 +178,5 @@ "commit": "Server running version {{version}}, here's what's missing compared to the latest version: {{- url}}", "unknown": "Couldn't find the last git commit, here's the repo {{- url}}" }, - "xpm": "Live XPM: {{num}}" + "xpm": "Live XPM for {{- heroName}}: {{num}}" } diff --git a/packages/dota/locales/zh-CN/translation.json b/packages/dota/locales/zh-CN/translation.json index 00a81ecf..af297d13 100644 --- a/packages/dota/locales/zh-CN/translation.json +++ b/packages/dota/locales/zh-CN/translation.json @@ -5,7 +5,7 @@ "pickup": "{{- heroName}} picked up the aegis!", "snatched": "{{- heroName}} snatched the aegis {{emote}}" }, - "apm_other": "Live APM: {{count}} {{emote}}", + "apm_other": "Live APM for {{- heroName}}: {{count}} {{emote}}", "averageRank": "Average rank this game", "betaFeature": "[beta feature]", "betaTester": "$t(betaTester_on)", @@ -52,7 +52,7 @@ "dotabod": "I'm an open source bot made by {{author}}. More info: {{- url}}", "gameNotFound": "Game was not found", "gpm_zero": "", - "gpm_other": "Live GPM: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", + "gpm_other": "Live GPM for {{- heroName}}: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", "heroItems": { "empty": "(2m delay) No items found for {{- heroName}}", "list": "(2m delay) {{- heroName}} has: {{- itemNames}}" @@ -178,5 +178,5 @@ "commit": "Server running version {{version}}, here's what's missing compared to the latest version: {{- url}}", "unknown": "Couldn't find the last git commit, here's the repo {{- url}}" }, - "xpm": "Live XPM: {{num}}" + "xpm": "Live XPM for {{- heroName}}: {{num}}" } diff --git a/packages/dota/locales/zh-TW/translation.json b/packages/dota/locales/zh-TW/translation.json index 00a81ecf..af297d13 100644 --- a/packages/dota/locales/zh-TW/translation.json +++ b/packages/dota/locales/zh-TW/translation.json @@ -5,7 +5,7 @@ "pickup": "{{- heroName}} picked up the aegis!", "snatched": "{{- heroName}} snatched the aegis {{emote}}" }, - "apm_other": "Live APM: {{count}} {{emote}}", + "apm_other": "Live APM for {{- heroName}}: {{count}} {{emote}}", "averageRank": "Average rank this game", "betaFeature": "[beta feature]", "betaTester": "$t(betaTester_on)", @@ -52,7 +52,7 @@ "dotabod": "I'm an open source bot made by {{author}}. More info: {{- url}}", "gameNotFound": "Game was not found", "gpm_zero": "", - "gpm_other": "Live GPM: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", + "gpm_other": "Live GPM for {{- heroName}}: {{num}}. {{heroKills}} from hero kills, {{creepKills}} from creep kills.", "heroItems": { "empty": "(2m delay) No items found for {{- heroName}}", "list": "(2m delay) {{- heroName}} has: {{- itemNames}}" @@ -178,5 +178,5 @@ "commit": "Server running version {{version}}, here's what's missing compared to the latest version: {{- url}}", "unknown": "Couldn't find the last git commit, here's the repo {{- url}}" }, - "xpm": "Live XPM: {{num}}" + "xpm": "Live XPM for {{- heroName}}: {{num}}" } From 0bb324652f8e7599eda2ada752982694baf93216 Mon Sep 17 00:00:00 2001 From: Matt Date: Sat, 9 Sep 2023 12:34:53 -0500 Subject: [PATCH 3/4] refactor: say() to check chatters so its not checked manually elsewhere --- docker-compose-dev.yml | 3 -- packages/dota/src/dota/GSIHandler.ts | 48 ++++++++----------- .../events/gsi-events/event.aegis_denied.ts | 16 ++----- .../gsi-events/event.aegis_picked_up.ts | 12 ++--- .../gsi-events/event.bounty_rune_pickup.ts | 8 +--- .../events/gsi-events/event.roshan_killed.ts | 12 ++--- .../src/dota/events/gsi-events/event.tip.ts | 10 +--- .../src/dota/events/gsi-events/hero.name.ts | 3 +- .../src/dota/events/gsi-events/hero.smoked.ts | 8 +--- .../src/dota/events/gsi-events/map.paused.ts | 8 +--- .../src/dota/events/gsi-events/newdata.ts | 18 ++++--- .../dota/events/gsi-events/player.deaths.ts | 20 +++----- .../events/gsi-events/player.killstreak.ts | 9 +--- packages/dota/src/dota/lib/checkMidas.ts | 14 ++---- packages/dota/src/dota/lib/checkPassiveTp.ts | 13 ++--- packages/dota/src/dota/say.ts | 28 ++++++++++- 16 files changed, 88 insertions(+), 142 deletions(-) diff --git a/docker-compose-dev.yml b/docker-compose-dev.yml index 080f6aec..20f6e4cc 100644 --- a/docker-compose-dev.yml +++ b/docker-compose-dev.yml @@ -1,18 +1,15 @@ services: twitch-chat: - platform: linux/arm64 image: "ghcr.io/dotabod/twitch-chat:v2.0" volumes: - ./packages/twitch/chat/src:/app/packages/twitch/chat/src twitch-events: - platform: linux/arm64 image: "ghcr.io/dotabod/twitch-events:v2.0" volumes: - ./packages/twitch/events/src:/app/packages/twitch/events/src dota: - platform: linux/arm64 image: "ghcr.io/dotabod/dota:v2.0" volumes: - ./packages/dota/src:/app/packages/dota/src diff --git a/packages/dota/src/dota/GSIHandler.ts b/packages/dota/src/dota/GSIHandler.ts index cf024372..85f1ddba 100644 --- a/packages/dota/src/dota/GSIHandler.ts +++ b/packages/dota/src/dota/GSIHandler.ts @@ -199,7 +199,7 @@ export class GSIHandler { .then(({ record }) => { server.io.to(this.client.token).emit('update-wl', record) }) - .catch((e) => { + .catch(() => { // Stream not live // console.error('[MMR] emitWLUpdate Error getting WL', {e: e?.message || e}) }) @@ -230,7 +230,7 @@ export class GSIHandler { }, 60 * 2000) } }) - .catch((e) => { + .catch(() => { // stream not live }) } @@ -544,14 +544,10 @@ export class GSIHandler { return } - const tellChatBets = getValueOrDefault(DBSettings.tellChatBets, client.settings) - const chattersEnabled = getValueOrDefault(DBSettings.chatter, client.settings) - - if (chattersEnabled && tellChatBets) { - say(client, t('bets.open', { emote: 'peepoGamble', lng: client.locale }), { - delay: false, - }) - } + say(client, t('bets.open', { emote: 'peepoGamble', lng: client.locale }), { + delay: false, + key: DBSettings.tellChatBets, + }) this.openingBets = false logger.info('[BETS] open bets', { event: 'open_bets', @@ -642,11 +638,15 @@ export class GSIHandler { }) if (this.client.stream_online) { - const tellChatBets = getValueOrDefault(DBSettings.tellChatBets, this.client.settings) - const chattersEnabled = getValueOrDefault(DBSettings.chatter, this.client.settings) - if (chattersEnabled && tellChatBets) { - say(this.client, t('bets.notScored', { emote: 'D:', lng: this.client.locale, matchId })) - } + say( + this.client, + t('bets.notScored', { + emote: 'D:', + lng: this.client.locale, + matchId, + key: DBSettings.tellChatBets, + }), + ) await refundTwitchBet(this.getChannelId()) } await this.resetClientState() @@ -707,10 +707,12 @@ export class GSIHandler { ? t('bets.won', { lng: this.client.locale, emote: 'Happi' }) : t('bets.lost', { lng: this.client.locale, emote: 'Happi' }) - say(this.client, message, { delay: false }) + say(this.client, message, { delay: false, chattersKey: 'matchOutcome' }) if (!betsEnabled) { - logger.info('Bets are not enabled, stopping here', { name: this.client.name }) + logger.info('Bets are not enabled, stopping here', { + name: this.client.name, + }) this.resetClientState().catch(() => { // }) @@ -739,15 +741,6 @@ export class GSIHandler { this.resetClientState().catch((e) => { logger.error('Error resetting client state', { e }) }) - - const chattersEnabled = getValueOrDefault(DBSettings.chatter, this.client.settings) - const { - matchOutcome: { enabled: chatterEnabled }, - } = getValueOrDefault(DBSettings.chatters, this.client.settings) - - if (!chattersEnabled || !chatterEnabled) { - return - } }) }, getStreamDelay(this.client.settings)) } @@ -780,8 +773,7 @@ export class GSIHandler { if (this.client.stream_online) { const tellChatBets = getValueOrDefault(DBSettings.tellChatBets, this.client.settings) - const chattersEnabled = getValueOrDefault(DBSettings.chatter, this.client.settings) - if (chattersEnabled && tellChatBets) { + if (tellChatBets) { say( this.client, t('bets.notScored', { emote: 'D:', lng: this.client.locale, matchId }), diff --git a/packages/dota/src/dota/events/gsi-events/event.aegis_denied.ts b/packages/dota/src/dota/events/gsi-events/event.aegis_denied.ts index 994c4467..2cb54bd8 100644 --- a/packages/dota/src/dota/events/gsi-events/event.aegis_denied.ts +++ b/packages/dota/src/dota/events/gsi-events/event.aegis_denied.ts @@ -1,4 +1,3 @@ -import { DBSettings, getValueOrDefault } from '@dotabod/settings' import { t } from 'i18next' import { DotaEvent, DotaEventTypes } from '../../../types.js' @@ -18,15 +17,10 @@ eventHandler.registerEvent(`event:${DotaEventTypes.AegisDenied}`, { const heroName = getHeroNameOrColor(matchPlayers[event.player_id]?.heroid ?? 0, event.player_id) - const chattersEnabled = getValueOrDefault(DBSettings.chatter, dotaClient.client.settings) - const { - roshDeny: { enabled: chatterEnabled }, - } = getValueOrDefault(DBSettings.chatters, dotaClient.client.settings) - - if (chattersEnabled && chatterEnabled) - say( - dotaClient.client, - t('aegis.denied', { lng: dotaClient.client.locale, heroName, emote: 'ICANT' }), - ) + say( + dotaClient.client, + t('aegis.denied', { lng: dotaClient.client.locale, heroName, emote: 'ICANT' }), + { chattersKey: 'roshDeny' }, + ) }, }) diff --git a/packages/dota/src/dota/events/gsi-events/event.aegis_picked_up.ts b/packages/dota/src/dota/events/gsi-events/event.aegis_picked_up.ts index 1807f865..bf412a54 100644 --- a/packages/dota/src/dota/events/gsi-events/event.aegis_picked_up.ts +++ b/packages/dota/src/dota/events/gsi-events/event.aegis_picked_up.ts @@ -1,4 +1,3 @@ -import { DBSettings, getValueOrDefault } from '@dotabod/settings' import { t } from 'i18next' import RedisClient from '../../../db/RedisClient.js' @@ -82,14 +81,9 @@ eventHandler.registerEvent(`event:${DotaEventTypes.AegisPickedUp}`, { const redisClient = RedisClient.getInstance() await redisClient.client.json.set(`${dotaClient.getToken()}:aegis`, '$', res) - const chattersEnabled = getValueOrDefault(DBSettings.chatter, dotaClient.client.settings) - const { - roshPickup: { enabled: chatterEnabled }, - } = getValueOrDefault(DBSettings.chatters, dotaClient.client.settings) - - if (chattersEnabled && chatterEnabled) { - say(dotaClient.client, generateAegisMessage(res, dotaClient.client.locale)) - } + say(dotaClient.client, generateAegisMessage(res, dotaClient.client.locale), { + chattersKey: 'roshPickup', + }) emitAegisEvent(res, dotaClient.getToken()) }, diff --git a/packages/dota/src/dota/events/gsi-events/event.bounty_rune_pickup.ts b/packages/dota/src/dota/events/gsi-events/event.bounty_rune_pickup.ts index a05efce9..a1dd7aa0 100644 --- a/packages/dota/src/dota/events/gsi-events/event.bounty_rune_pickup.ts +++ b/packages/dota/src/dota/events/gsi-events/event.bounty_rune_pickup.ts @@ -1,4 +1,3 @@ -import { DBSettings, getValueOrDefault } from '@dotabod/settings' import { t } from 'i18next' import { DotaEvent, DotaEventTypes } from '../../../types.js' @@ -15,12 +14,6 @@ eventHandler.registerEvent(`event:${DotaEventTypes.BountyPickup}`, { if (!dotaClient.client.stream_online) return if (Number(dotaClient.client.gsi?.map?.clock_time) > 120) return - const chattersEnabled = getValueOrDefault(DBSettings.chatter, dotaClient.client.settings) - const { - bounties: { enabled: chatterEnabled }, - } = getValueOrDefault(DBSettings.chatters, dotaClient.client.settings) - if (!chattersEnabled || !chatterEnabled) return - const playingTeam = (await redisClient.client.get(`${dotaClient.client.token}:playingTeam`)) ?? dotaClient.client.gsi?.player?.team_name @@ -80,6 +73,7 @@ eventHandler.registerEvent(`event:${DotaEventTypes.BountyPickup}`, { totalBounties: dotaClient.bountyHeroNames.length, heroNames: bountyHeroNamesString, }), + { chattersKey: 'bounties' }, ) dotaClient.bountyHeroNames = [] }, 15000) diff --git a/packages/dota/src/dota/events/gsi-events/event.roshan_killed.ts b/packages/dota/src/dota/events/gsi-events/event.roshan_killed.ts index f9166605..5006573d 100644 --- a/packages/dota/src/dota/events/gsi-events/event.roshan_killed.ts +++ b/packages/dota/src/dota/events/gsi-events/event.roshan_killed.ts @@ -1,4 +1,3 @@ -import { DBSettings, getValueOrDefault } from '@dotabod/settings' import { t } from 'i18next' import RedisClient from '../../../db/RedisClient.js' @@ -100,11 +99,6 @@ eventHandler.registerEvent(`event:${DotaEventTypes.RoshanKilled}`, { const minDate = dotaClient.addSecondsToNow(minS) const maxDate = dotaClient.addSecondsToNow(maxS) - const chattersEnabled = getValueOrDefault(DBSettings.chatter, dotaClient.client.settings) - const { - roshanKilled: { enabled: chatterEnabled }, - } = getValueOrDefault(DBSettings.chatters, dotaClient.client.settings) - const redisClient = RedisClient.getInstance() // TODO: move this to a redis handler const redisJson = (await redisClient.client.json.get( @@ -123,9 +117,9 @@ eventHandler.registerEvent(`event:${DotaEventTypes.RoshanKilled}`, { await redisClient.client.json.set(`${dotaClient.getToken()}:roshan`, '$', res) - if (chattersEnabled && chatterEnabled) { - say(dotaClient.client, generateRoshanMessage(res, dotaClient.client.locale)) - } + say(dotaClient.client, generateRoshanMessage(res, dotaClient.client.locale), { + chattersKey: 'roshanKilled', + }) emitRoshEvent(res, dotaClient.getToken()) }, diff --git a/packages/dota/src/dota/events/gsi-events/event.tip.ts b/packages/dota/src/dota/events/gsi-events/event.tip.ts index 9f665635..95e5d3d3 100644 --- a/packages/dota/src/dota/events/gsi-events/event.tip.ts +++ b/packages/dota/src/dota/events/gsi-events/event.tip.ts @@ -1,4 +1,3 @@ -import { DBSettings, getValueOrDefault } from '@dotabod/settings' import { t } from 'i18next' import { DotaEvent, DotaEventTypes } from '../../../types.js' @@ -14,13 +13,6 @@ eventHandler.registerEvent(`event:${DotaEventTypes.Tip}`, { if (!dotaClient.client.stream_online) return if (!isPlayingMatch(dotaClient.client.gsi)) return - const chattersEnabled = getValueOrDefault(DBSettings.chatter, dotaClient.client.settings) - const { - tip: { enabled: chatterEnabled }, - } = getValueOrDefault(DBSettings.chatters, dotaClient.client.settings) - - if (!chattersEnabled || !chatterEnabled) return - const { matchPlayers } = await getAccountsFromMatch({ gsi: dotaClient.client.gsi }) const heroName = getHeroNameOrColor( @@ -35,6 +27,7 @@ eventHandler.registerEvent(`event:${DotaEventTypes.Tip}`, { say( dotaClient.client, t('tip.from', { emote: 'ICANT', lng: dotaClient.client.locale, heroName }), + { chattersKey: 'tip' }, ) } @@ -47,6 +40,7 @@ eventHandler.registerEvent(`event:${DotaEventTypes.Tip}`, { say( dotaClient.client, t('tip.to', { emote: 'PepeLaugh', lng: dotaClient.client.locale, heroName: toHero }), + { chattersKey: 'tip' }, ) } }, diff --git a/packages/dota/src/dota/events/gsi-events/hero.name.ts b/packages/dota/src/dota/events/gsi-events/hero.name.ts index f6ce48ea..abad9dfc 100644 --- a/packages/dota/src/dota/events/gsi-events/hero.name.ts +++ b/packages/dota/src/dota/events/gsi-events/hero.name.ts @@ -32,8 +32,7 @@ eventHandler.registerEvent(`hero:name`, { } const tellChatBets = getValueOrDefault(DBSettings.tellChatBets, dotaClient.client.settings) - const chattersEnabled = getValueOrDefault(DBSettings.chatter, dotaClient.client.settings) - if (tellChatBets && chattersEnabled) + if (tellChatBets) say( dotaClient.client, t('bets.remade', { diff --git a/packages/dota/src/dota/events/gsi-events/hero.smoked.ts b/packages/dota/src/dota/events/gsi-events/hero.smoked.ts index ff726e62..db37cfb7 100644 --- a/packages/dota/src/dota/events/gsi-events/hero.smoked.ts +++ b/packages/dota/src/dota/events/gsi-events/hero.smoked.ts @@ -1,4 +1,3 @@ -import { DBSettings, getValueOrDefault } from '@dotabod/settings' import { t } from 'i18next' import { GSIHandler, redisClient } from '../../GSIHandler.js' @@ -11,12 +10,6 @@ eventHandler.registerEvent(`hero:smoked`, { handler: async (dotaClient: GSIHandler, isSmoked: boolean) => { if (!dotaClient.client.stream_online) return if (!isPlayingMatch(dotaClient.client.gsi)) return - const chatterEnabled = getValueOrDefault(DBSettings.chatter, dotaClient.client.settings) - if (!chatterEnabled) return - - const chatters = getValueOrDefault(DBSettings.chatters, dotaClient.client.settings) - - if (!chatters.smoke.enabled) return if (isSmoked) { const playingHero = (await redisClient.client.get( @@ -29,6 +22,7 @@ eventHandler.registerEvent(`hero:smoked`, { say( dotaClient.client, t('chatters.smoked', { emote: 'Shush', heroName, lng: dotaClient.client.locale }), + { chattersKey: 'smoke' }, ) } }, diff --git a/packages/dota/src/dota/events/gsi-events/map.paused.ts b/packages/dota/src/dota/events/gsi-events/map.paused.ts index d6a754c2..2e3d6507 100644 --- a/packages/dota/src/dota/events/gsi-events/map.paused.ts +++ b/packages/dota/src/dota/events/gsi-events/map.paused.ts @@ -1,4 +1,3 @@ -import { DBSettings, getValueOrDefault } from '@dotabod/settings' import { t } from 'i18next' import { GSIHandler } from '../../GSIHandler.js' @@ -12,18 +11,15 @@ eventHandler.registerEvent(`map:paused`, { if (!dotaClient.client.stream_online) return if (!isPlayingMatch(dotaClient.client.gsi)) return - const chattersEnabled = getValueOrDefault(DBSettings.chatter, dotaClient.client.settings) - const { - pause: { enabled: chatterEnabled }, - } = getValueOrDefault(DBSettings.chatters, dotaClient.client.settings) // Necessary to let the frontend know, so we can pause any rosh / aegis / etc timers server.io.to(dotaClient.getToken()).emit('paused', isPaused) - if (isPaused && chattersEnabled && chatterEnabled) { + if (isPaused) { say( dotaClient.client, t('chatters.pause', { emote: 'PauseChamp', lng: dotaClient.client.locale }), + { chattersKey: 'pause' }, ) } }, diff --git a/packages/dota/src/dota/events/gsi-events/newdata.ts b/packages/dota/src/dota/events/gsi-events/newdata.ts index bbb6907d..42853082 100644 --- a/packages/dota/src/dota/events/gsi-events/newdata.ts +++ b/packages/dota/src/dota/events/gsi-events/newdata.ts @@ -20,12 +20,7 @@ function chatterMatchFound(client: SocketClient) { const commands = DelayedCommands.filter((cmd) => getValueOrDefault(cmd.key, client.settings)) - const chattersEnabled = getValueOrDefault(DBSettings.chatter, client.settings) - const { - commandsReady: { enabled: chatterEnabled }, - } = getValueOrDefault(DBSettings.chatters, client.settings) - - if (commands.length && chattersEnabled && chatterEnabled) { + if (commands.length) { say( client, t('matchFound', { @@ -33,6 +28,7 @@ function chatterMatchFound(client: SocketClient) { lng: client.locale, }), { + chattersKey: 'commandsReady', delay: false, }, ) @@ -53,12 +49,15 @@ async function saveMatchData(client: SocketClient) { if (!client.steam32Id) return // did we already come here before? - let [steamServerId, lobbyType] = await redisClient.client + const res = await redisClient.client .multi() .get(`${matchId}:steamServerId`) .get(`${matchId}:lobbyType`) .exec() + let [steamServerId] = res + const [, lobbyType] = res + if (steamServerId && lobbyType) return if (!steamServerId && !lobbyType) { @@ -134,13 +133,12 @@ eventHandler.registerEvent(`newdata`, { return } - const chattersEnabled = getValueOrDefault(DBSettings.chatter, dotaClient.client.settings) const { powerTreads: { enabled: treadsChatterEnabled }, } = getValueOrDefault(DBSettings.chatters, dotaClient.client.settings) - if (chattersEnabled && treadsChatterEnabled) { + if (treadsChatterEnabled) { try { - void calculateManaSaved(dotaClient) + await calculateManaSaved(dotaClient) } catch (e) { logger.error('err calculateManaSaved', { e }) } diff --git a/packages/dota/src/dota/events/gsi-events/player.deaths.ts b/packages/dota/src/dota/events/gsi-events/player.deaths.ts index 5683293e..af373cdb 100644 --- a/packages/dota/src/dota/events/gsi-events/player.deaths.ts +++ b/packages/dota/src/dota/events/gsi-events/player.deaths.ts @@ -1,4 +1,3 @@ -import { DBSettings, getValueOrDefault } from '@dotabod/settings' import { t } from 'i18next' import { Item } from '../../../types.js' @@ -26,11 +25,6 @@ eventHandler.registerEvent(`player:deaths`, { if (!isPlayingMatch(dotaClient.client.gsi)) return if (!deaths) return - const chatterEnabled = getValueOrDefault(DBSettings.chatter, dotaClient.client.settings) - if (!chatterEnabled) return - - const chatters = getValueOrDefault(DBSettings.chatters, dotaClient.client.settings) - const playingHero = (await redisClient.client.get( `${dotaClient.getToken()}:playingHero`, )) as HeroNames | null @@ -38,14 +32,12 @@ eventHandler.registerEvent(`player:deaths`, { const heroName = handleGetHero(playingHero ?? dotaClient.client.gsi?.hero?.name)?.localized_name ?? '' - await firstBloodChat(chatters, dotaClient, heroName) - passiveDeathChat(chatters, dotaClient, heroName) + await firstBloodChat(dotaClient, heroName) + passiveDeathChat(dotaClient, heroName) }, }) -async function firstBloodChat(chatters: any, dotaClient: GSIHandler, heroName: string) { - if (!chatters.firstBloodDeath.enabled) return - +async function firstBloodChat(dotaClient: GSIHandler, heroName: string) { const playingTeam = (await redisClient.client.get(`${dotaClient.client.token}:playingTeam`)) ?? dotaClient.client.gsi?.player?.team_name @@ -61,6 +53,7 @@ async function firstBloodChat(chatters: any, dotaClient: GSIHandler, heroName: s say( dotaClient.client, t('chatters.firstBloodDeath', { emote: 'PepeLaugh', heroName, lng: dotaClient.client.locale }), + { chattersKey: 'firstBloodDeath' }, ) } @@ -74,9 +67,7 @@ function cantCastItem(item: Item, dotaClient: GSIHandler) { ) } -function passiveDeathChat(chatters: any, dotaClient: GSIHandler, heroName: string) { - if (!chatters.passiveDeath.enabled) return - +function passiveDeathChat(dotaClient: GSIHandler, heroName: string) { const couldHaveLivedWith = findItem({ itemName: passiveItemNames.map((i) => i.name), searchStashAlso: false, @@ -110,5 +101,6 @@ function passiveDeathChat(chatters: any, dotaClient: GSIHandler, heroName: strin say( dotaClient.client, t('chatters.died', { emote: 'ICANT', heroName, itemNames, lng: dotaClient.client.locale }), + { chattersKey: 'passiveDeath' }, ) } diff --git a/packages/dota/src/dota/events/gsi-events/player.killstreak.ts b/packages/dota/src/dota/events/gsi-events/player.killstreak.ts index 00f742d2..5744e34f 100644 --- a/packages/dota/src/dota/events/gsi-events/player.killstreak.ts +++ b/packages/dota/src/dota/events/gsi-events/player.killstreak.ts @@ -1,4 +1,3 @@ -import { DBSettings, getValueOrDefault } from '@dotabod/settings' import { t } from 'i18next' import { GSIHandler, redisClient } from '../../GSIHandler.js' @@ -12,13 +11,6 @@ eventHandler.registerEvent(`player:kill_streak`, { if (!isPlayingMatch(dotaClient.client.gsi)) return if (!dotaClient.client.stream_online) return - const chattersEnabled = getValueOrDefault(DBSettings.chatter, dotaClient.client.settings) - const { - killstreak: { enabled: chatterEnabled }, - } = getValueOrDefault(DBSettings.chatters, dotaClient.client.settings) - - if (!chattersEnabled || !chatterEnabled) return - const playingHero = (await redisClient.client.get( `${dotaClient.getToken()}:playingHero`, )) as HeroNames | null @@ -38,6 +30,7 @@ eventHandler.registerEvent(`player:kill_streak`, { heroName, lng: dotaClient.client.locale, }), + { chattersKey: 'killstreak' }, ) return } diff --git a/packages/dota/src/dota/lib/checkMidas.ts b/packages/dota/src/dota/lib/checkMidas.ts index b6019ae0..0e56845e 100644 --- a/packages/dota/src/dota/lib/checkMidas.ts +++ b/packages/dota/src/dota/lib/checkMidas.ts @@ -1,4 +1,3 @@ -import { DBSettings, getValueOrDefault } from '@dotabod/settings' import { t } from 'i18next' import { SocketClient } from '../../types.js' @@ -12,13 +11,7 @@ import { findItem } from './findItem.js' * @param token - The token used for Redis operations */ export async function checkPassiveMidas(client: SocketClient) { - const { - midas: { enabled: midasChatterEnabled }, - } = getValueOrDefault(DBSettings.chatters, client.settings) - - const chattersEnabled = getValueOrDefault(DBSettings.chatter, client.settings) - - if (chattersEnabled && midasChatterEnabled && client.stream_online) { + if (client.stream_online) { const isMidasPassive = await checkMidasIterator(client) if (typeof isMidasPassive === 'number') { say( @@ -28,9 +21,12 @@ export async function checkPassiveMidas(client: SocketClient) { lng: client.locale, seconds: isMidasPassive, }), + { chattersKey: 'midas' }, ) } else if (isMidasPassive) { - say(client, t('chatters.midas', { emote: 'massivePIDAS', lng: client.locale })) + say(client, t('chatters.midas', { emote: 'massivePIDAS', lng: client.locale }), { + chattersKey: 'midas', + }) } } } diff --git a/packages/dota/src/dota/lib/checkPassiveTp.ts b/packages/dota/src/dota/lib/checkPassiveTp.ts index c425ee9a..d7421308 100644 --- a/packages/dota/src/dota/lib/checkPassiveTp.ts +++ b/packages/dota/src/dota/lib/checkPassiveTp.ts @@ -1,4 +1,3 @@ -import { DBSettings, getValueOrDefault } from '@dotabod/settings' import { t } from 'i18next' import { SocketClient } from '../../types.js' @@ -22,15 +21,6 @@ export async function checkPassiveTp(client: SocketClient) { told: 0, } - const chattersEnabled = getValueOrDefault(DBSettings.chatter, client.settings) - const { - noTp: { enabled: chatterEnabled }, - } = getValueOrDefault(DBSettings.chatters, client.settings) - - if (!chattersEnabled || !chatterEnabled) { - return - } - const tp = client.gsi?.items?.teleport0 const hasTp = tp && tp.name !== 'empty' const deadge = client.gsi?.hero?.alive === false @@ -55,6 +45,7 @@ export async function checkPassiveTp(client: SocketClient) { channel: `@${client.name}`, lng: client.locale, }), + { chattersKey: 'noTp' }, ) return resetPassiveTime(client.token) } @@ -67,6 +58,7 @@ export async function checkPassiveTp(client: SocketClient) { channel: `@${client.name}`, lng: client.locale, }), + { chattersKey: 'noTp' }, ) return resetPassiveTime(client.token) @@ -97,6 +89,7 @@ export async function checkPassiveTp(client: SocketClient) { lng: client.locale, emote: 'HECANT', }), + { chattersKey: 'noTp' }, ) return true } diff --git a/packages/dota/src/dota/say.ts b/packages/dota/src/dota/say.ts index 2f3e4f3c..f183a6d5 100644 --- a/packages/dota/src/dota/say.ts +++ b/packages/dota/src/dota/say.ts @@ -1,3 +1,4 @@ +import { DBSettings, defaultSettings, getValueOrDefault, SettingKeys } from '@dotabod/settings' import { t } from 'i18next' import { chatClient } from '../twitch/chatClient.js' @@ -7,10 +8,35 @@ import { getStreamDelay } from './GSIHandler.js' export function say( client: SocketClient, message: string, - { delay = true, beta = false }: { delay?: boolean; beta?: boolean } = {}, + { + delay = true, + key, + chattersKey, + beta = false, + }: { + key?: SettingKeys + chattersKey?: keyof (typeof defaultSettings)['chatters'] + delay?: boolean + beta?: boolean + } = {}, ) { if (beta && !client.beta_tester) return + // global + const chattersEnabled = getValueOrDefault(DBSettings.chatter, client.settings) + if (!chattersEnabled) return + + // specific 1 + const chatter = key && getValueOrDefault(key, client.settings) + if (key && !chatter) return + + // specific 2 + const chatterSpecific = getValueOrDefault( + DBSettings.chatters, + client.settings, + ) as (typeof defaultSettings)['chatters'] + if (chattersKey && !chatterSpecific[chattersKey].enabled) return + const msg = beta ? `${message} ${t('betaFeature', { lng: client.locale })}` : message if (!delay) { chatClient.say(client.name, msg) From ca657753ab8bd2d9f156ee713602d92db67bb4c8 Mon Sep 17 00:00:00 2001 From: Matt Date: Sat, 9 Sep 2023 12:39:12 -0500 Subject: [PATCH 4/4] Configure line endings in .gitattributes --- .gitattributes | 1 + 1 file changed, 1 insertion(+) create mode 100644 .gitattributes diff --git a/.gitattributes b/.gitattributes new file mode 100644 index 00000000..6313b56c --- /dev/null +++ b/.gitattributes @@ -0,0 +1 @@ +* text=auto eol=lf