From 1d17f7280608e6b4bcfbb7f81759a005800c0476 Mon Sep 17 00:00:00 2001 From: Lula Villalobos Date: Fri, 27 Oct 2017 14:29:07 -0700 Subject: [PATCH 1/2] added new confirmation message for begin quest alert dialog --- Habitica/res/values/strings.xml | 2 ++ .../habitica/ui/fragments/social/QuestDetailFragment.java | 4 +++- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml index 641ebee8e..5fe06345a 100644 --- a/Habitica/res/values/strings.xml +++ b/Habitica/res/values/strings.xml @@ -300,6 +300,8 @@ Are you sure you want to cancel this quest? All invitation acceptances will be lost. The quest owner will retain possession of the quest scroll. Quest Invitation Are you sure you want to begin the quest? Once it is active, no additional party members can join the quest. + + Are you sure? Only %1$d of your %2$d party members have joined this quest! Quests start automatically when all players have joined or rejected the invitation. You have been invited to participate in a quest! 1 day ago %d days ago diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/QuestDetailFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/QuestDetailFragment.java index bab2f1926..e37dfefe3 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/QuestDetailFragment.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/QuestDetailFragment.java @@ -81,6 +81,7 @@ public class QuestDetailFragment extends BaseMainFragment { public String questKey; private Group party; private Quest quest; + private String begin_quest_message; @Nullable @@ -205,6 +206,7 @@ public class QuestDetailFragment extends BaseMainFragment { } else { participantHeader.setText(R.string.invitations); participantHeaderCount.setText(participantCount + "/" + quest.participants.size()); + begin_quest_message = getString(R.string.quest_begin_message_2, participantCount, quest.participants.size()); } } @@ -230,7 +232,7 @@ public class QuestDetailFragment extends BaseMainFragment { @OnClick(R.id.quest_begin_button) public void onQuestBegin() { AlertDialog.Builder builder = new AlertDialog.Builder(getActivity()) - .setMessage(R.string.quest_begin_message) + .setMessage(begin_quest_message) .setPositiveButton(R.string.yes, (dialog, which) -> socialRepository.forceStartQuest(party) .subscribe(quest -> {}, RxErrorHandler.handleEmptyError())) .setNegativeButton(R.string.no, (dialog, which) -> {}); From 0202635b5d21755384259c457c658e0d74ab2817 Mon Sep 17 00:00:00 2001 From: Lula Villalobos Date: Fri, 27 Oct 2017 16:08:14 -0700 Subject: [PATCH 2/2] deleted translations from quest_begin_message for the change on format string --- Habitica/res/values-bg/strings.xml | 1 - Habitica/res/values-de/strings.xml | 3 +-- Habitica/res/values-en-rGB/strings.xml | 2 +- Habitica/res/values-es/strings.xml | 2 +- Habitica/res/values-fr/strings.xml | 1 - Habitica/res/values-hr-rHR/strings.xml | 3 +-- Habitica/res/values-in/strings.xml | 3 +-- Habitica/res/values-it/strings.xml | 3 +-- Habitica/res/values-iw/strings.xml | 3 +-- Habitica/res/values-ja/strings.xml | 3 +-- Habitica/res/values-ko/strings.xml | 3 +-- Habitica/res/values-lt/strings.xml | 3 +-- Habitica/res/values-nl/strings.xml | 3 +-- Habitica/res/values-pl/strings.xml | 3 +-- Habitica/res/values-pt-rBR/strings.xml | 3 +-- Habitica/res/values-pt-rPT/strings.xml | 3 +-- Habitica/res/values-ru/strings.xml | 3 +-- Habitica/res/values-tr/strings.xml | 3 +-- Habitica/res/values-zh-rTW/strings.xml | 3 +-- Habitica/res/values-zh/strings.xml | 3 +-- Habitica/res/values/strings.xml | 4 +--- .../habitica/ui/fragments/social/QuestDetailFragment.java | 2 +- 22 files changed, 20 insertions(+), 40 deletions(-) diff --git a/Habitica/res/values-bg/strings.xml b/Habitica/res/values-bg/strings.xml index ed2f3737d..728c2be2a 100644 --- a/Habitica/res/values-bg/strings.xml +++ b/Habitica/res/values-bg/strings.xml @@ -272,7 +272,6 @@ Екипирано Наистина ли искате да прекратите мисията? Всички приети покани ще бъдат загубени. Притежателят на мисията ще си запази свитъка ѝ. Покана за мисия - Наистина ли искате да започнете мисията? След като мисията започне, никой повече няма да може да се присъедини към нея. Получихте покана за участие в мисия! Преди 1 ден Преди %d дни diff --git a/Habitica/res/values-de/strings.xml b/Habitica/res/values-de/strings.xml index ce2600c1f..29b319e9b 100644 --- a/Habitica/res/values-de/strings.xml +++ b/Habitica/res/values-de/strings.xml @@ -272,8 +272,7 @@ Ausgerüstet Bist Du sicher, dass Du diese Quest abbrechen willst? Alle angenommenen Einladungen gehen verloren. Der Questbesitzer erhält die Questschriftrolle zurück. Questeinladung - Bist Du sicher, dass Du die Quest beginnen willst? Sobald sie aktiv ist, können keine zusätzlichen Gruppenmitglieder beitreten. - Du wurdest eingeladen, an einer Quest teilzunehmen! + Du wurdest eingeladen, an einer Quest teilzunehmen! Vor einem Tag Vor %d Tagen Vor einer Minute diff --git a/Habitica/res/values-en-rGB/strings.xml b/Habitica/res/values-en-rGB/strings.xml index 688e7f949..7b1c38518 100644 --- a/Habitica/res/values-en-rGB/strings.xml +++ b/Habitica/res/values-en-rGB/strings.xml @@ -272,7 +272,7 @@ Equipped Are you sure you want to cancel this quest? All invitation acceptances will be lost. The quest owner will retain possession of the quest scroll. Quest Invitation - Are you sure you want to begin the quest? Once it is active, no additional party members can join the quest. + Are you sure? Only %1$d of your %2$d party members have joined this quest! Quests start automatically when all players have joined or rejected the invitation. You have been invited to participate in a quest! 1 day ago %d days ago diff --git a/Habitica/res/values-es/strings.xml b/Habitica/res/values-es/strings.xml index 0ed18ef14..ed66fb3e1 100644 --- a/Habitica/res/values-es/strings.xml +++ b/Habitica/res/values-es/strings.xml @@ -243,7 +243,7 @@ Equipado ¿Seguro que quieres cancelar esta misión? Se perderán todas las invitaciones que se hayan aceptado y el propietario de la misión recuperará el pergamino. Invitación a misión - ¿Seguro que quieres comenzar la misión? Una vez comenzada, no podrán unirse a esta misión más miembros del grupo. + ¿Estás seguro? Solamente %1$d de %2$d miembros de tu grupo se han unido a la misión! Las misiones comienzan automaticamente cuando todos los jugadores se han unido o han rechazado la invitación. Te han invitado a participar en una misión. Hace 1 día Hace %d días diff --git a/Habitica/res/values-fr/strings.xml b/Habitica/res/values-fr/strings.xml index 2e02b7cef..0d008a0e0 100644 --- a/Habitica/res/values-fr/strings.xml +++ b/Habitica/res/values-fr/strings.xml @@ -272,7 +272,6 @@ Équipé Êtes-vous sûr·e de vouloir annuler cette quête ? Toutes les invitations ayant été acceptées seront perdues. Le lanceur de la quête gardera le parchemin de la quête en sa possession. Invitation à une quête - Êtes-vous sûr·e de vouloir commencer la quête ? Une fois lancée, aucun autre membre de l\'équipe ne peut rejoindre la quête. Vous avez été invité·e à participer à une quête ! il y a 1 jour il y a %d jours diff --git a/Habitica/res/values-hr-rHR/strings.xml b/Habitica/res/values-hr-rHR/strings.xml index 39089adaa..f1ad02c29 100644 --- a/Habitica/res/values-hr-rHR/strings.xml +++ b/Habitica/res/values-hr-rHR/strings.xml @@ -218,8 +218,7 @@ Opremljeno Jesi li siguran da želiš otkazati ovaj pothvat? Svi prihvati pozivnica će biti izgubljeni. Vlasnik pothvata će dobiti natrag svitak Pothvata Pozivnica za Pothvat - Jesi li siguran da želiš započeti pothvat? Jednom kad je aktivan, članovi grupe se ne mogu pridružiti. - Pozvani ste na sudjelovanje u pothvatu! + Pozvani ste na sudjelovanje u pothvatu! Prije 1 dan Prije %d dana Prije 1 minute diff --git a/Habitica/res/values-in/strings.xml b/Habitica/res/values-in/strings.xml index 8ca3a0589..efcf6a621 100644 --- a/Habitica/res/values-in/strings.xml +++ b/Habitica/res/values-in/strings.xml @@ -243,8 +243,7 @@ Digunakan Apakah kamu yakin kamu ingin membatalkan misi ini? Semua undangan yang disetujui akan hilang. Pemilik misi akan mendapatkan gulungan misi kembali. Undangan Misi - Apakah kamu yakin kamu ingin memulai misi? Setelah aktif, tidak ada anggota kelompok lain yang dapat bergabung. - Kamu telah diundang untuk berpartisipasi dalam misi! + Kamu telah diundang untuk berpartisipasi dalam misi! 1 hari yang lalu %d hari yang lalu 1 menit yang lalu diff --git a/Habitica/res/values-it/strings.xml b/Habitica/res/values-it/strings.xml index eeecad993..a8fa528d4 100644 --- a/Habitica/res/values-it/strings.xml +++ b/Habitica/res/values-it/strings.xml @@ -272,8 +272,7 @@ Equipaggiato Vuoi davvero annullare questa missione? Tutti gli inviti accettati andranno persi. Il proprietario della missione tornerà in possesso della Pergamena. Invito Missione - Vuoi davvero iniziare la missione? Una volta attiva, nessun altro membro della squadra potrà unirsi alla missione. - Sei stato invitato a partecipare ad una missione! + Sei stato invitato a partecipare ad una missione! 1 giorno fa %d giorni fa 1 minuto fa diff --git a/Habitica/res/values-iw/strings.xml b/Habitica/res/values-iw/strings.xml index 7fa971dc1..63508f540 100644 --- a/Habitica/res/values-iw/strings.xml +++ b/Habitica/res/values-iw/strings.xml @@ -235,8 +235,7 @@ מצוייד האם אתם בטוחים שאתם מעוניינים להפסיק את ההרפתקאה הזו? כל אישורי ההזמנות יאבדו. הבעלים של ההרפתקאה ימשיכו להחזיק במגילת ההרפתקאה. הזמנה להרפתקאה - האם אתם בטוחים שאתם מעוניינים להתחיל בהרפתקאה? ברגע שהיא מתחילה, חברי חבורה נוספים לא יכולים להצטרף אליה. - הוזמנתם להשתתף בהרפתקאה! + הוזמנתם להשתתף בהרפתקאה! לפני יום לפני %d ימים לפני דקה diff --git a/Habitica/res/values-ja/strings.xml b/Habitica/res/values-ja/strings.xml index 068bbb703..451f1b176 100644 --- a/Habitica/res/values-ja/strings.xml +++ b/Habitica/res/values-ja/strings.xml @@ -272,8 +272,7 @@ 装備済み このクエストを中止します。よろしいですか? 招待を受けたすべての参加者を失うことになります。クエストの所有者の元にクエストの巻物が戻ってきます。 クエストへの招待 - クエストをはじめます。よろしいですか? クエストを開始すると、新たにメンバーがクエストに参加することはできません。 - クエストへの招待状が届いた! + クエストへの招待状が届いた! 1日前 %d日前 1分前 diff --git a/Habitica/res/values-ko/strings.xml b/Habitica/res/values-ko/strings.xml index 8151e9242..5d51fd27d 100644 --- a/Habitica/res/values-ko/strings.xml +++ b/Habitica/res/values-ko/strings.xml @@ -275,8 +275,7 @@ 착용됨 정말 이 퀘스트를 취소하시겠습니까? 모든 초대장과 승인들을 잃을 것입니다. 퀘스트 스크롤은 주인에게 돌아갑니다. 퀘스트 초대장 - 정말 이 퀘스트를 시작하시겠습니까? 시작 후 더이상 새로운 파티 멤버가 참여할 수 없습니다. - 퀘스트에 초대받았습니다! + 퀘스트에 초대받았습니다! 하루 전 %d 일 전 1분 전 diff --git a/Habitica/res/values-lt/strings.xml b/Habitica/res/values-lt/strings.xml index 211847db5..5e0383a7c 100644 --- a/Habitica/res/values-lt/strings.xml +++ b/Habitica/res/values-lt/strings.xml @@ -242,8 +242,7 @@ Užsidėta Ar tikrai nori atšaukti misiją? Visi pakvietimai bus nutraukti. Misijos savininkas atgaus misijos rankraštį. Misijos Pakvietimas - Ar tikrai nori pradėti misiją? Kai ji prasidės, kiti grupės nariai nebegalės prisijungti. - Tave pakvietė dalyvauti misijoje! + Tave pakvietė dalyvauti misijoje! Liko 1 diena prieš %d dieną(as) prieš 1 minutę diff --git a/Habitica/res/values-nl/strings.xml b/Habitica/res/values-nl/strings.xml index e49230ddd..4e5a206b3 100644 --- a/Habitica/res/values-nl/strings.xml +++ b/Habitica/res/values-nl/strings.xml @@ -272,8 +272,7 @@ In gebruik Ben je zeker dat je deze queeste wilt beëindigen? Alle aangenomen uitnodigingen zullen verloren gaan. De eigenaar van de queeste zal de queesterol terug krijgen. Queeste uitnodiging - Ben je zeker dat je de queeste wilt beginnen? Zodra het actief is, kunnen er geen andere spelers zich bij de queeste aansluiten. - Je bent uitgenodigd om deel te nemen aan een queeste! + Je bent uitgenodigd om deel te nemen aan een queeste! 1 dag geleden %d dagen geleden 1 minuut geleden diff --git a/Habitica/res/values-pl/strings.xml b/Habitica/res/values-pl/strings.xml index 18d1b2921..5245328c6 100644 --- a/Habitica/res/values-pl/strings.xml +++ b/Habitica/res/values-pl/strings.xml @@ -269,8 +269,7 @@ W użyciu Jesteś pewien że chcesz przerwać quest? Quest zostanie przerwany dla wszystkich uczestników. Zwołujący quest odzyska skrypt (quest scroll). Zaproszenie do questa. - Czy jesteś pewien, ze chcesz zacząć misję? Gdy zostanie aktywowana, żaden dodatkowy członek drużyny nie będzie mógł do niej dołączyc. - Zostałeś zaproszony do udziału w misji! + Zostałeś zaproszony do udziału w misji! 1 dzień temu %d dni temu 1 minutę temu diff --git a/Habitica/res/values-pt-rBR/strings.xml b/Habitica/res/values-pt-rBR/strings.xml index 6c368d9f0..b61a383b9 100644 --- a/Habitica/res/values-pt-rBR/strings.xml +++ b/Habitica/res/values-pt-rBR/strings.xml @@ -272,8 +272,7 @@ Equipado Tem certeza que deseja cancelar esta missão? Todas os convites aceitos serão perdidos. O proprietário da missão manterá posse do pergaminho da missão. Convite para Missão - Tem certeza que deseja começar a missão? Uma vez ativa, outros membros do grupo não poderão juntar-se à missão. - Você foi convidado a participar de uma missão! + Você foi convidado a participar de uma missão! 1 dia atrás %d dias atrás 1 minuto atrás diff --git a/Habitica/res/values-pt-rPT/strings.xml b/Habitica/res/values-pt-rPT/strings.xml index f5e10a26a..2ec1a47aa 100644 --- a/Habitica/res/values-pt-rPT/strings.xml +++ b/Habitica/res/values-pt-rPT/strings.xml @@ -255,8 +255,7 @@ Equipado Tem a certeza que deseja cancelar esta missão? Todos os convites aceites serão perdidos. O dono da missão manterá a posse do pergaminho da missão. Convite de Missão - Tem a certeza que pretende iniciar a missão? Assim que esta seja iniciada, nenhum membro da equipa adicional pode juntar-se à missão. - Foi convidado para participar numa missão! + Foi convidado para participar numa missão! Há 1 dia Há %d dias Há 1 minuto diff --git a/Habitica/res/values-ru/strings.xml b/Habitica/res/values-ru/strings.xml index e62078068..a0c98c0c6 100644 --- a/Habitica/res/values-ru/strings.xml +++ b/Habitica/res/values-ru/strings.xml @@ -272,8 +272,7 @@ Надето Вы уверены, что хотите отменить квест? Все принятые приглашения будут отменены. Квестовый свиток останется у владельца. Приглашение в квест - Вы уверены, что хотите начать квест? Никто больше не сможет присоединиться к нему. - Вас пригласили в квест! + Вас пригласили в квест! 1 день назад %d дней назад 1 минуту назад diff --git a/Habitica/res/values-tr/strings.xml b/Habitica/res/values-tr/strings.xml index f87d077a1..ecc207f0a 100644 --- a/Habitica/res/values-tr/strings.xml +++ b/Habitica/res/values-tr/strings.xml @@ -272,8 +272,7 @@ Giyilmiş Bu görevi iptal etmek istediğinize emin misiniz? Tüm davet kabulleri kaybolacak. Görev sahibi görev parşömeni sahipliğini sürdürecektir. Görev Daveti - Göreve başlamak istediğinize emin misiniz? Bir görev aktif ederseniz, ilave takım üyesi göreve katılamayacaktır. - Göreve katılmak için davet edildin! + Göreve katılmak için davet edildin! 1 gün önce %d gün önce 1 dakika önce diff --git a/Habitica/res/values-zh-rTW/strings.xml b/Habitica/res/values-zh-rTW/strings.xml index 7e210bba3..c8cb239cb 100644 --- a/Habitica/res/values-zh-rTW/strings.xml +++ b/Habitica/res/values-zh-rTW/strings.xml @@ -246,8 +246,7 @@ 裝備 你確定要取消任務? 所有邀請將會消失,任務擁有者會收到退還的任務卷軸 任務邀請 - 準備好開始任務了嗎?開始後就無法加入新成員了 - 你已經被邀請加入任務! + 你已經被邀請加入任務! 1 天前 %d 天前 1 分鐘之前 diff --git a/Habitica/res/values-zh/strings.xml b/Habitica/res/values-zh/strings.xml index 78ff0e6b8..22d52abdc 100644 --- a/Habitica/res/values-zh/strings.xml +++ b/Habitica/res/values-zh/strings.xml @@ -254,8 +254,7 @@ 装备 你是否确定要放弃这个探索任务?这将会失去所有已接受的邀请。探索任务拥有者将拿回探索任务卷轴。 任务邀请 - 你是否确定要直接开始这个探索任务?一旦开始,其他队伍成员就不能加入这个探索任务。 - 你被邀请参加一个探索任务! + 你被邀请参加一个探索任务! 1天前 %d天前 1分钟前 diff --git a/Habitica/res/values/strings.xml b/Habitica/res/values/strings.xml index 5fe06345a..e230770b0 100644 --- a/Habitica/res/values/strings.xml +++ b/Habitica/res/values/strings.xml @@ -299,9 +299,7 @@ Equipped Are you sure you want to cancel this quest? All invitation acceptances will be lost. The quest owner will retain possession of the quest scroll. Quest Invitation - Are you sure you want to begin the quest? Once it is active, no additional party members can join the quest. - - Are you sure? Only %1$d of your %2$d party members have joined this quest! Quests start automatically when all players have joined or rejected the invitation. + Are you sure? Only %1$d of your %2$d party members have joined this quest! Quests start automatically when all players have joined or rejected the invitation. You have been invited to participate in a quest! 1 day ago %d days ago diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/QuestDetailFragment.java b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/QuestDetailFragment.java index e37dfefe3..9d1387dfa 100644 --- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/QuestDetailFragment.java +++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/fragments/social/QuestDetailFragment.java @@ -206,7 +206,7 @@ public class QuestDetailFragment extends BaseMainFragment { } else { participantHeader.setText(R.string.invitations); participantHeaderCount.setText(participantCount + "/" + quest.participants.size()); - begin_quest_message = getString(R.string.quest_begin_message_2, participantCount, quest.participants.size()); + begin_quest_message = getString(R.string.quest_begin_message, participantCount, quest.participants.size()); } }