• R/O
  • HTTP
  • SSH
  • HTTPS

hengband: Commit

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


Commit MetaInfo

Revision6be1cb1b055db84c94c321aba2c1617f7b0ac65f (tree)
Time2019-02-16 18:58:25
AuthorDeskull <deskull@user...>
CommiterDeskull

Log Message

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

Change Summary

Incremental Difference

--- a/src/store.c
+++ b/src/store.c
@@ -4324,18 +4324,12 @@ static bool sell_haggle(object_type *o_ptr, s32b *price)
43244324 int flag, loop_flag, noneed;
43254325 int annoyed = 0, final = FALSE;
43264326 bool cancel = FALSE;
4327-#ifdef JP
4328- concptr pmt = "提示金額";
4329-#else
4330- concptr pmt = "Offer";
4331-#endif
4327+ concptr pmt = _("提示金額", "Offer");
43324328
43334329 char out_val[160];
43344330
4335-
43364331 *price = 0;
43374332
4338-
43394333 /* Obtain the starting offer and the final offer */
43404334 cur_ask = price_item(o_ptr, ot_ptr->max_inflate, TRUE);
43414335 final_ask = price_item(o_ptr, ot_ptr->min_inflate, TRUE);
@@ -4358,12 +4352,7 @@ static bool sell_haggle(object_type *o_ptr, s32b *price)
43584352 /* No reason to haggle */
43594353 if (final_ask >= purse)
43604354 {
4361-#ifdef JP
4362- msg_print("即座にこの金額にまとまった。");
4363-#else
4364- msg_print("You instantly agree upon the price.");
4365-#endif
4366-
4355+ msg_print(_("即座にこの金額にまとまった。", "You instantly agree upon the price."));
43674356 msg_print(NULL);
43684357
43694358 /* Offer full purse */
@@ -4373,12 +4362,7 @@ static bool sell_haggle(object_type *o_ptr, s32b *price)
43734362 /* No need to haggle */
43744363 else if (noneed)
43754364 {
4376-#ifdef JP
4377- msg_print("結局この金額にまとまった。");
4378-#else
4379- msg_print("You eventually agree upon the price.");
4380-#endif
4381-
4365+ msg_print(_("結局この金額にまとまった。", "You eventually agree upon the price."));
43824366 msg_print(NULL);
43834367 }
43844368
@@ -4386,12 +4370,7 @@ static bool sell_haggle(object_type *o_ptr, s32b *price)
43864370 else
43874371 {
43884372 /* Message summary */
4389-#ifdef JP
4390- msg_print("すんなりとこの金額にまとまった。");
4391-#else
4392- msg_print("You quickly agree upon the price.");
4393-#endif
4394-
4373+ msg_print(_("すんなりとこの金額にまとまった。", "You quickly agree upon the price."));
43954374 msg_print(NULL);
43964375 }
43974376
@@ -4400,12 +4379,7 @@ static bool sell_haggle(object_type *o_ptr, s32b *price)
44004379
44014380 /* Final offer */
44024381 final = TRUE;
4403-#ifdef JP
4404- pmt = "最終提示金額";
4405-#else
4406- pmt = "Final Offer";
4407-#endif
4408-
4382+ pmt = _("最終提示金額", "Final Offer");
44094383 }
44104384
44114385 /* Haggle for the whole pile */
@@ -4438,12 +4412,7 @@ static bool sell_haggle(object_type *o_ptr, s32b *price)
44384412
44394413 (void)sprintf(out_val, "%s : %ld", pmt, (long)cur_ask);
44404414 put_str(out_val, 1, 0);
4441-#ifdef JP
4442- cancel = receive_offer("提示する価格? ",
4443-#else
4444- cancel = receive_offer("What price do you ask? ",
4445-#endif
4446-
4415+ cancel = receive_offer(_("提示する価格? ", "What price do you ask? "),
44474416 &offer, last_offer, -1, cur_ask, final);
44484417
44494418 if (cancel)
@@ -4496,11 +4465,7 @@ static bool sell_haggle(object_type *o_ptr, s32b *price)
44964465 {
44974466 cur_ask = final_ask;
44984467 final = TRUE;
4499-#ifdef JP
4500- pmt = "最終提示金額";
4501-#else
4502- pmt = "Final Offer";
4503-#endif
4468+ pmt = _("最終提示金額", "Final Offer");
45044469
45054470 annoyed++;
45064471 if (annoyed > 3)
@@ -4525,12 +4490,7 @@ static bool sell_haggle(object_type *o_ptr, s32b *price)
45254490 allow_inc = TRUE;
45264491 prt("", 1, 0);
45274492 (void)sprintf(out_val,
4528-#ifdef JP
4529- "前回の提示価格 $%ld", (long)last_offer);
4530-#else
4531- "Your last bid %ld", (long)last_offer);
4532-#endif
4533-
4493+ _("前回の提示価格 $%ld", "Your last bid %ld"), (long)last_offer);
45344494 put_str(out_val, 1, 39);
45354495 say_comment_3(cur_ask, annoyed);
45364496 }
@@ -4571,11 +4531,7 @@ static void store_purchase(void)
45714531
45724532 if (cur_store_num == STORE_MUSEUM)
45734533 {
4574-#ifdef JP
4575- msg_print("博物館から取り出すことはできません。");
4576-#else
4577- msg_print("Museum.");
4578-#endif
4534+ msg_print(_("博物館から取り出すことはできません。", "Museum."));
45794535 return;
45804536 }
45814537
@@ -4583,23 +4539,12 @@ static void store_purchase(void)
45834539 if (st_ptr->stock_num <= 0)
45844540 {
45854541 if (cur_store_num == STORE_HOME)
4586-#ifdef JP
4587- msg_print("我が家には何も置いてありません。");
4588-#else
4589- msg_print("Your home is empty.");
4590-#endif
4591-
4542+ msg_print(_("我が家には何も置いてありません。", "Your home is empty."));
45924543 else
4593-#ifdef JP
4594- msg_print("現在商品の在庫を切らしています。");
4595-#else
4596- msg_print("I am currently out of stock.");
4597-#endif
4598-
4544+ msg_print(_("現在商品の在庫を切らしています。", "I am currently out of stock."));
45994545 return;
46004546 }
46014547
4602-
46034548 /* Find the number of objects on this and following pages */
46044549 i = (st_ptr->stock_num - store_top);
46054550
Show on old repository browser