From b81018a04b8a36a2adfe861e547b3fbe7cf717dd Mon Sep 17 00:00:00 2001 From: vendova <85730561+vendova@users.noreply.github.com> Date: Fri, 6 Oct 2023 19:48:44 +0530 Subject: [PATCH 1/5] Create IndonesianEnglish.java --- .../translation/IndonesianEnglish.java | 66 +++++++++++++++++++ 1 file changed, 66 insertions(+) create mode 100644 src/main/java/me/lkp111138/dealbot/translation/IndonesianEnglish.java diff --git a/src/main/java/me/lkp111138/dealbot/translation/IndonesianEnglish.java b/src/main/java/me/lkp111138/dealbot/translation/IndonesianEnglish.java new file mode 100644 index 0000000..c83177d --- /dev/null +++ b/src/main/java/me/lkp111138/dealbot/translation/IndonesianEnglish.java @@ -0,0 +1,66 @@ +package me.lkp111138.dealbot.translation; + +public class IndonesianEnglish extends HongKongEnglish { + + public String PROPERTY_NAME(int index) { + switch (index) { + case 0: + return "The National Monument"; + case 1: + return "Taman Mini (Wonderful Indonesia)"; + case 2: + return "Baluran National Park"; + case 3: + return "Dieng Plateau"; + case 4: + return "The Karimun Jawa Archipelago"; + case 5: + return "Ijen Crater"; + case 6: + return "Borobudur Temple"; + case 7: + return "Sri Baduga Fountain Park"; + case 8: + return "Sanur Beach"; + case 9: + return "Pombo Island Atoll"; + case 10: + return "Ngurbloat Beach"; + case 11: + return "Maratua Island"; + case 12: + return "Pasir Panjang Beach"; + case 13: + return "Kayu Aro Tea Plantation"; + case 14: + return "Selayar Island"; + case 15: + return "Lengkuas Island"; + case 16: + return "Tanjung Kalayang Beach"; + case 17: + return "Trikora Beach"; + case 18: + return "Way Kambas National Park"; + case 19: + return "Raja Ampat Beach"; + case 20: + return "Laboan Bajo"; + case 21: + return "Padar Island"; + case 22: + return "Gambir Train Station"; + case 23: + return "Jakarta Kota Station"; + case 24: + return "Soekarno–Hatta Airport Rail Link"; + case 25: + return "Cepu Forest Railway"; + case 26: + return "Electric Company"; + case 27: + return "Water Works"; + } + return ""; + } +} From d850cc855f332d842a6d2959ae19eb81ee21aa60 Mon Sep 17 00:00:00 2001 From: vendova <85730561+vendova@users.noreply.github.com> Date: Fri, 6 Oct 2023 19:49:44 +0530 Subject: [PATCH 2/5] Update Translation.java --- src/main/java/me/lkp111138/dealbot/translation/Translation.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/me/lkp111138/dealbot/translation/Translation.java b/src/main/java/me/lkp111138/dealbot/translation/Translation.java index 17ff6ce..b0ebb0d 100644 --- a/src/main/java/me/lkp111138/dealbot/translation/Translation.java +++ b/src/main/java/me/lkp111138/dealbot/translation/Translation.java @@ -18,6 +18,7 @@ public static Translation get(String lang) { translations.put("hk", new HongKongChinese()); translations.put("en_us", new UnitedStatesEnglish()); translations.put("en_gb", new UnitedKingdomEnglish()); + translations.put("en_id", new IndonesianEnglish()); } return translations.getOrDefault(lang, fallback); } From 57344645d92f936c4bb3044e32f963d26d0bdb7e Mon Sep 17 00:00:00 2001 From: vendova <85730561+vendova@users.noreply.github.com> Date: Fri, 6 Oct 2023 19:51:04 +0530 Subject: [PATCH 3/5] Update SetLangCommand.java --- src/main/java/me/lkp111138/dealbot/commands/SetLangCommand.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/me/lkp111138/dealbot/commands/SetLangCommand.java b/src/main/java/me/lkp111138/dealbot/commands/SetLangCommand.java index 52a5d90..9b7b0e7 100644 --- a/src/main/java/me/lkp111138/dealbot/commands/SetLangCommand.java +++ b/src/main/java/me/lkp111138/dealbot/commands/SetLangCommand.java @@ -55,6 +55,7 @@ private static void sendResponse(TelegramBot bot, Message msg) { new InlineKeyboardButton[]{new InlineKeyboardButton("English (HK)").callbackData("lang:en:" + uid)}, new InlineKeyboardButton[]{new InlineKeyboardButton("English (US)").callbackData("lang:en_us:" + uid)}, new InlineKeyboardButton[]{new InlineKeyboardButton("English (UK)").callbackData("lang:en_gb:" + uid)}, + new InlineKeyboardButton[]{new InlineKeyboardButton("Indonesia (en)").callbackData("lang:en_id:" + uid)}, new InlineKeyboardButton[]{new InlineKeyboardButton(Translation.get(DealBot.lang(gid)).CLOSE()).callbackData("lang:close:" + uid)} ))); } From cc1bee18e23f58d9f2178eb14295acacebc9e35f Mon Sep 17 00:00:00 2001 From: vendova <85730561+vendova@users.noreply.github.com> Date: Fri, 6 Oct 2023 19:52:05 +0530 Subject: [PATCH 4/5] Update db.sql --- db.sql | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/db.sql b/db.sql index ebcf597..8e06944 100644 --- a/db.sql +++ b/db.sql @@ -65,7 +65,7 @@ CREATE TABLE `groups` ( `say_no_time` int(11) DEFAULT '15', `pay_time` int(11) DEFAULT '30', `current_game` int(11) DEFAULT NULL, - `lang` enum('en','zh','hk','en_us','en_gb') NOT NULL DEFAULT 'en', + `lang` enum('en','zh','hk','en_us','en_gb','en_id') NOT NULL DEFAULT 'en', `protest_mode` bit(1) DEFAULT b'1' ) ENGINE=InnoDB DEFAULT CHARSET=utf8mb4; @@ -155,4 +155,4 @@ ALTER TABLE `bans` -- AUTO_INCREMENT for table `games` -- ALTER TABLE `games` - MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=64463; \ No newline at end of file + MODIFY `id` int(11) NOT NULL AUTO_INCREMENT, AUTO_INCREMENT=64463; From 170b8ea1ebb9622b6922740c5157ff06cbcaf350 Mon Sep 17 00:00:00 2001 From: vendova <85730561+vendova@users.noreply.github.com> Date: Fri, 6 Oct 2023 19:53:36 +0530 Subject: [PATCH 5/5] Update RentActionCard.java --- .../me/lkp111138/dealbot/game/cards/actions/RentActionCard.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/me/lkp111138/dealbot/game/cards/actions/RentActionCard.java b/src/main/java/me/lkp111138/dealbot/game/cards/actions/RentActionCard.java index cae6afd..5d7ea17 100644 --- a/src/main/java/me/lkp111138/dealbot/game/cards/actions/RentActionCard.java +++ b/src/main/java/me/lkp111138/dealbot/game/cards/actions/RentActionCard.java @@ -70,7 +70,7 @@ public void use(GamePlayer player, String[] args) { player.setDoubleRentBuff(false); String victim = players.get(order).getName(); EditMessageText edit = new EditMessageText(player.getTgid(), player.getMessageId(), - translation.COLLECTING_RENT(victim, group, value * doubleRentBuff)); + translation.COLLECTING_RENT(victim, group, value)); player.getGame().execute(edit); String msg = translation.YOU_HAVE_USED_RENT_FOR_AGAINST(getCardFunctionalTitle(), victim, group, value); SendMessage send = new SendMessage(player.getTgid(), msg);