• R/O
  • HTTP
  • SSH
  • HTTPS

hengband: Commit

変愚蛮怒のメインリポジトリです


Commit MetaInfo

Revision694f5a824983bf9788bb56d226aae03321114083 (tree)
Time2018-12-06 23:45:27
AuthorDeskull <deskull@user...>
CommiterDeskull

Log Message

[Refactor] #37353 メッセージ整理。 / Refactor messages.

Change Summary

Incremental Difference

--- a/src/store.c
+++ b/src/store.c
@@ -4297,12 +4297,7 @@ static void museum_remove_object(void)
42974297 /* Empty? */
42984298 if (st_ptr->stock_num <= 0)
42994299 {
4300-#ifdef JP
4301- msg_print("博物館には何も置いてありません。");
4302-#else
4303- msg_print("Museum is empty.");
4304-#endif
4305-
4300+ msg_print(_("博物館には何も置いてありません。", "Museum is empty."));
43064301 return;
43074302 }
43084303
@@ -4313,11 +4308,7 @@ static void museum_remove_object(void)
43134308 if (i > store_bottom) i = store_bottom;
43144309
43154310 /* Prompt */
4316-#ifdef JP
4317- sprintf(out_val, "どのアイテムの展示をやめさせますか?");
4318-#else
4319- sprintf(out_val, "Which item do you want to order to remove? ");
4320-#endif
4311+ sprintf(out_val, _("どのアイテムの展示をやめさせますか?", "Which item do you want to order to remove? "));
43214312
43224313 /* Get the item number to be removed */
43234314 if (!get_stock(&item, out_val, 0, i - 1)) return;
@@ -4328,22 +4319,12 @@ static void museum_remove_object(void)
43284319 /* Get the actual item */
43294320 o_ptr = &st_ptr->stock[item];
43304321
4331- /* Description */
43324322 object_desc(o_name, o_ptr, 0);
43334323
4334-#ifdef JP
4335- msg_print("展示をやめさせたアイテムは二度と見ることはできません!");
4336- if (!get_check(format("本当に%sの展示をやめさせますか?", o_name))) return;
4337-#else
4338- msg_print("You cannot see items which is removed from the Museum!");
4339- if (!get_check(format("Really order to remove %s from the Museum? ", o_name))) return;
4340-#endif
4324+ msg_print(_("展示をやめさせたアイテムは二度と見ることはできません!", "You cannot see items which is removed from the Museum!"));
4325+ if (!get_check(format(_("本当に%sの展示をやめさせますか?", "Really order to remove %s from the Museum? "), o_name))) return;
43414326
4342-#ifdef JP
4343- msg_format("%sの展示をやめさせた。", o_name);
4344-#else
4345- msg_format("You ordered to remove %s.", o_name);
4346-#endif
4327+ msg_format(_("%sの展示をやめさせた。", "You ordered to remove %s."), o_name);
43474328
43484329 /* Remove the items from the home */
43494330 store_item_increase(item, -o_ptr->number);
@@ -4409,11 +4390,7 @@ static void store_process_command(void)
44094390 case '-':
44104391 {
44114392 if (st_ptr->stock_num <= store_bottom) {
4412-#ifdef JP
4413- msg_print("これで全部です。");
4414-#else
4415- msg_print("Entire inventory is shown.");
4416-#endif
4393+ msg_print(_("これで全部です。", "Entire inventory is shown."));
44174394 }
44184395 else{
44194396 store_top -= store_bottom;
@@ -4431,12 +4408,7 @@ static void store_process_command(void)
44314408 {
44324409 if (st_ptr->stock_num <= store_bottom)
44334410 {
4434-#ifdef JP
4435- msg_print("これで全部です。");
4436-#else
4437- msg_print("Entire inventory is shown.");
4438-#endif
4439-
4411+ msg_print(_("これで全部です。", "Entire inventory is shown."));
44404412 }
44414413 else
44424414 {
@@ -4552,8 +4524,6 @@ static void store_process_command(void)
45524524 break;
45534525 }
45544526
4555-
4556-
45574527 /*** Use various objects ***/
45584528
45594529 /* Browse a book */
@@ -4745,13 +4715,8 @@ static void store_process_command(void)
47454715 }
47464716 else
47474717 {
4748-#ifdef JP
4749- msg_print("そのコマンドは店の中では使えません。");
4750-#else
4751- msg_print("That command does not work in stores.");
4752-#endif
4718+ msg_print(_("そのコマンドは店の中では使えません。", "That command does not work in stores."));
47534719 }
4754-
47554720 break;
47564721 }
47574722 }
@@ -4794,12 +4759,7 @@ void do_cmd_store(void)
47944759 /* Verify a store */
47954760 if (!cave_have_flag_grid(c_ptr, FF_STORE))
47964761 {
4797-#ifdef JP
4798- msg_print("ここには店がありません。");
4799-#else
4800- msg_print("You see no store here.");
4801-#endif
4802-
4762+ msg_print(_("ここには店がありません。", "You see no store here."));
48034763 return;
48044764 }
48054765
@@ -4815,12 +4775,7 @@ void do_cmd_store(void)
48154775 if ((town[p_ptr->town_num].store[which].store_open >= turn) ||
48164776 (ironman_shops))
48174777 {
4818-#ifdef JP
4819- msg_print("ドアに鍵がかかっている。");
4820-#else
4821- msg_print("The doors are locked.");
4822-#endif
4823-
4778+ msg_print(_("ドアに鍵がかかっている。", "The doors are locked."));
48244779 p_ptr->town_num = old_town_num;
48254780 return;
48264781 }
Show on old repository browser