From 682f5da92f7ce03f13931989b1ddabe92bac1182 Mon Sep 17 00:00:00 2001 From: "Rasamoelina, Haja Onjatiana" <26148770+rhahao@users.noreply.github.com> Date: Tue, 25 Feb 2025 16:04:15 +0300 Subject: [PATCH 1/4] fix(meetings): assignment duplicated in treasures part --- .../midweek_editor/brother_assignment/useBrotherAssignment.tsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/features/meetings/midweek_editor/brother_assignment/useBrotherAssignment.tsx b/src/features/meetings/midweek_editor/brother_assignment/useBrotherAssignment.tsx index 45f38aa7a2..215fd797fd 100644 --- a/src/features/meetings/midweek_editor/brother_assignment/useBrotherAssignment.tsx +++ b/src/features/meetings/midweek_editor/brother_assignment/useBrotherAssignment.tsx @@ -56,7 +56,7 @@ const useBrotherAssignment = ({ case 'tgw_talk': return 'MM_TGWTalk'; case 'tgw_gems': - return 'MM_TGWTalk'; + return 'MM_TGWGems'; case 'lc_part1': return 'MM_LCPart1'; case 'lc_part2': From 581add561325409ba1bf1fe76ef81168e4226761 Mon Sep 17 00:00:00 2001 From: sws2apps-admin Date: Tue, 25 Feb 2025 16:05:06 +0300 Subject: [PATCH 2/4] chore(locales): updated translation from Crowdin --- src/locales/et-EE/congregation.json | 12 ++++++------ src/locales/et-EE/general.json | 2 +- src/locales/et-EE/meetings.json | 2 +- src/locales/ru-RU/congregation.json | 2 +- src/locales/ru-RU/general.json | 2 +- src/locales/ru-RU/meetings.json | 2 +- 6 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/locales/et-EE/congregation.json b/src/locales/et-EE/congregation.json index 62773f7d33..b6d7293fb1 100644 --- a/src/locales/et-EE/congregation.json +++ b/src/locales/et-EE/congregation.json @@ -184,7 +184,7 @@ "tr_newLangGroupCreatedSuccessDesc": "{{ LanguageGroupName }} on seadistamiseks valmis ja sellele pääsevad ligi kodulehelt administraatorid ja grupi liikmed", "tr_addNewLangGroup": "Lisa uus keelegrupp", "tr_addNewLangGroupDesc": "Sisesta grupi ametlik nimi jw.org-ist ja vali selle keel. Kui keel puudub Organized'is, palun võta ühendust meie toe meeskonnaga, et seda rakendusse lisada.", - "tr_groupNameLabel": "Group name", + "tr_groupNameLabel": "Grupi nimi", "tr_groupNameOptional": "Grupi nimi (valikuline)", "tr_groupLanguage": "Grupi keel", "tr_addNewLangGroupMembersDesc": "Järgmine samm on lisada kõik grupi liikmed ja määrata vähemalt üks administraator, kes haldab gruppi Organized'is. Sellel vennal peaks juba olema administraatori roll koguduse kasutajate nimekirjas.", @@ -466,9 +466,9 @@ "tr_joinRequests": "Liitumistaotlused", "tr_joinRequestsAccept": "Võta vastu liitumistaotlus {{ user }}", "tr_joinRequestsAcceptDesc": "Seo kasutaja isikuandmetega ja määra talle õiged rollid. Salvestamiseks klõpsa nuppu Jätka.", - "tr_fieldServiceGroup": "Field service group", - "tr_languageGroupDelete": "Delete {{ languageGroup }} language group?", - "tr_languageGroupDeleteDesc": "Are you sure to delete this language group? All publishers assigned to the group will be removed.", - "tr_languageGroupExists": "This language group already exists in your record", - "tr_languageGroupEdit": "Edit language group" + "tr_fieldServiceGroup": "Kuulutustöögrupp", + "tr_languageGroupDelete": "Kas kustutada {{ languageGroup }} keele grupp?", + "tr_languageGroupDeleteDesc": "Kas oled kindel, et soovid selle keelegrupi kustutada? Kõik sellesse gruppi määratud kuulutajad kustutatakse.", + "tr_languageGroupExists": "See keelegrupp juba on koguduse kirjetes", + "tr_languageGroupEdit": "Muuda keelegruppi" } diff --git a/src/locales/et-EE/general.json b/src/locales/et-EE/general.json index ad590f6fb3..d46af5dd83 100644 --- a/src/locales/et-EE/general.json +++ b/src/locales/et-EE/general.json @@ -142,5 +142,5 @@ "tr_consoleWarningDesc": "See terminal on võimas vahend, mis on mõeldud arendajatele. Kui sa ei ole arendaja, siis väldi siia käskude sisestamist või kleepimist - isegi kui keegi seda palub. See tagab, et sinu Organized-rakenduse andmed on alati turvalised.", "tr_manual": "Käsitsi", "tr_alphabetical": "Tähestikuliselt", - "tr_offlineLocked": "You must be connected to make a change" + "tr_offlineLocked": "Sa pead olema internetiühenduses, et teha muudatusi" } diff --git a/src/locales/et-EE/meetings.json b/src/locales/et-EE/meetings.json index 5aeaeb2a43..0c1aeee412 100644 --- a/src/locales/et-EE/meetings.json +++ b/src/locales/et-EE/meetings.json @@ -158,5 +158,5 @@ "tr_pastDates": "Möödunud sündmused", "tr_upcomingDates": "Eesolevad sündmused", "tr_selectAStudentFirst": "Vali esmalt õpilane", - "tr_auxClassroomAssignServiceGroup": "Assign field service group to auxiliary classroom" + "tr_auxClassroomAssignServiceGroup": "Määra kuulutustöögrupp abisaali" } diff --git a/src/locales/ru-RU/congregation.json b/src/locales/ru-RU/congregation.json index bbdb0efb72..a72431f1ba 100644 --- a/src/locales/ru-RU/congregation.json +++ b/src/locales/ru-RU/congregation.json @@ -468,7 +468,7 @@ "tr_joinRequestsAcceptDesc": "Привяжи пользователя к его записи и назначь ему правильные роли. Нажми Продолжить, чтобы сохранить.", "tr_fieldServiceGroup": "Группы для служения", "tr_languageGroupDelete": "Удалить языковую группу {{ languageGroup }}?", - "tr_languageGroupDeleteDesc": "Are you sure to delete this language group? All publishers assigned to the group will be removed.", + "tr_languageGroupDeleteDesc": "Ты уверен, что хочешь удалить эту языковую группу? Все возвещатели, назначенные для этой группы, будут удалены.", "tr_languageGroupExists": "Эта языковая группа уже существует в твоей записи", "tr_languageGroupEdit": "Редактировать языковую группу" } diff --git a/src/locales/ru-RU/general.json b/src/locales/ru-RU/general.json index 733fba8c36..1e6fb9351e 100644 --- a/src/locales/ru-RU/general.json +++ b/src/locales/ru-RU/general.json @@ -142,5 +142,5 @@ "tr_consoleWarningDesc": "Эта консоль является мощным инструментом, предназначенным для разработчиков. Если ты не разработчик, пожалуйста, не вводи или не вставляй команды здесь – даже если кто-то просит вас. Это гарантирует безопасность твоих данных в приложении Organized.", "tr_manual": "Вручную", "tr_alphabetical": "По алфавиту", - "tr_offlineLocked": "You must be connected to make a change" + "tr_offlineLocked": "Ты должен быть подключен к сети, чтобы внести изменения" } diff --git a/src/locales/ru-RU/meetings.json b/src/locales/ru-RU/meetings.json index 1ce6f14249..f044468823 100644 --- a/src/locales/ru-RU/meetings.json +++ b/src/locales/ru-RU/meetings.json @@ -158,5 +158,5 @@ "tr_pastDates": "Прошедшие даты", "tr_upcomingDates": "Предстоящие даты", "tr_selectAStudentFirst": "Сначала выбери ученика", - "tr_auxClassroomAssignServiceGroup": "Assign field service group to auxiliary classroom" + "tr_auxClassroomAssignServiceGroup": "Назначить группу для служения во вспомогательный класс" } From 40b29262efdaa5dc59d7ce54f6d3035a2fdd1167 Mon Sep 17 00:00:00 2001 From: semantic-release-bot Date: Tue, 25 Feb 2025 13:08:33 +0000 Subject: [PATCH 3/4] chore(release): 3.15.1 [skip ci] ## [3.15.1](/~https://github.com/sws2apps/organized-app/compare/v3.15.0...v3.15.1) (2025-02-25) ### Bug Fixes * **meetings:** assignment duplicated in treasures part ([682f5da](/~https://github.com/sws2apps/organized-app/commit/682f5da92f7ce03f13931989b1ddabe92bac1182)) --- CHANGELOG.md | 6 ++++++ package.json | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 89e56d8866..c4ca7f7061 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## [3.15.1](/~https://github.com/sws2apps/organized-app/compare/v3.15.0...v3.15.1) (2025-02-25) + +### Bug Fixes + +* **meetings:** assignment duplicated in treasures part ([682f5da](/~https://github.com/sws2apps/organized-app/commit/682f5da92f7ce03f13931989b1ddabe92bac1182)) + ## [3.15.0](/~https://github.com/sws2apps/organized-app/compare/v3.14.0...v3.15.0) (2025-02-23) ### Bug Fixes diff --git a/package.json b/package.json index c90ebad5b1..2dc8d1c214 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "organized", "private": true, - "version": "3.15.0", + "version": "3.15.1", "license": "MIT", "type": "module", "repository": { From 4258c03dabea6260a8ee1594f426bd778ef543d2 Mon Sep 17 00:00:00 2001 From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com> Date: Tue, 25 Feb 2025 23:36:07 +0000 Subject: [PATCH 4/4] chore(actions): bump cypress-io/github-action from 6.7.12 to 6.7.13 Bumps [cypress-io/github-action](/~https://github.com/cypress-io/github-action) from 6.7.12 to 6.7.13. - [Release notes](/~https://github.com/cypress-io/github-action/releases) - [Changelog](/~https://github.com/cypress-io/github-action/blob/master/CHANGELOG.md) - [Commits](/~https://github.com/cypress-io/github-action/compare/18a6541367f4580a515371905f499a27a44e8dbe...1052aa98bbbe4f55210f844878213c07d9c8c399) --- updated-dependencies: - dependency-name: cypress-io/github-action dependency-type: direct:production update-type: version-update:semver-patch ... Signed-off-by: dependabot[bot] --- .github/workflows/ci.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ci.yml b/.github/workflows/ci.yml index d7eddacf67..41749fed8f 100644 --- a/.github/workflows/ci.yml +++ b/.github/workflows/ci.yml @@ -32,7 +32,7 @@ jobs: run: npm ci && npm i -D @rollup/rollup-linux-x64-gnu - name: Cypress run testing - uses: cypress-io/github-action@18a6541367f4580a515371905f499a27a44e8dbe + uses: cypress-io/github-action@1052aa98bbbe4f55210f844878213c07d9c8c399 with: command-prefix: '--' install: false