• R/O
  • HTTP
  • SSH
  • HTTPS

hengband: Commit

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


Commit MetaInfo

Revision509a8a023fe19fed70189d46d27a835cceaaeda9 (tree)
Time2019-02-07 23:19:37
AuthorDeskull <deskull@user...>
CommiterDeskull

Log Message

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

Change Summary

Incremental Difference

--- a/src/store.c
+++ b/src/store.c
@@ -4150,21 +4150,11 @@ static bool purchase_haggle(object_type *o_ptr, s32b *price)
41504150 s32b min_per, max_per;
41514151 int flag, loop_flag, noneed;
41524152 int annoyed = 0, final = FALSE;
4153-
41544153 bool cancel = FALSE;
4155-
4156-#ifdef JP
4157- concptr pmt = "提示価格";
4158-#else
4159- concptr pmt = "Asking";
4160-#endif
4161-
4162-
41634154 char out_val[160];
4164-
4165-
41664155 *price = 0;
41674156
4157+ concptr pmt = _("提示価格", "Asking");
41684158
41694159 /* Extract the starting offer and the final offer */
41704160 cur_ask = price_item(o_ptr, ot_ptr->max_inflate, FALSE);
@@ -4180,12 +4170,7 @@ static bool purchase_haggle(object_type *o_ptr, s32b *price)
41804170 if (noneed)
41814171 {
41824172 /* Message summary */
4183-#ifdef JP
4184- msg_print("結局この金額にまとまった。");
4185-#else
4186- msg_print("You eventually agree upon the price.");
4187-#endif
4188-
4173+ msg_print(_("結局この金額にまとまった。", "You eventually agree upon the price."));
41894174 msg_print(NULL);
41904175 }
41914176
@@ -4193,12 +4178,7 @@ static bool purchase_haggle(object_type *o_ptr, s32b *price)
41934178 else
41944179 {
41954180 /* Message summary */
4196-#ifdef JP
4197- msg_print("すんなりとこの金額にまとまった。");
4198-#else
4199- msg_print("You quickly agree upon the price.");
4200-#endif
4201-
4181+ msg_print(_("すんなりとこの金額にまとまった。", "You quickly agree upon the price."));
42024182 msg_print(NULL);
42034183
42044184 /* Apply Sales Tax */
@@ -4209,12 +4189,7 @@ static bool purchase_haggle(object_type *o_ptr, s32b *price)
42094189 cur_ask = final_ask;
42104190
42114191 /* Go to final offer */
4212-#ifdef JP
4213- pmt = "最終提示価格";
4214-#else
4215- pmt = "Final Offer";
4216-#endif
4217-
4192+ pmt = _("最終提示価格", "Final Offer");
42184193 final = TRUE;
42194194 }
42204195
@@ -4248,14 +4223,7 @@ static bool purchase_haggle(object_type *o_ptr, s32b *price)
42484223 {
42494224 (void)sprintf(out_val, "%s : %ld", pmt, (long)cur_ask);
42504225 put_str(out_val, 1, 0);
4251-#ifdef JP
4252- cancel = receive_offer("提示する金額? ",
4253-#else
4254- cancel = receive_offer("What do you offer? ",
4255-#endif
4256-
4257- &offer, last_offer, 1, cur_ask, final);
4258-
4226+ cancel = receive_offer(_("提示する金額? ", "What do you offer? "), &offer, last_offer, 1, cur_ask, final);
42594227 if (cancel)
42604228 {
42614229 flag = TRUE;
@@ -4303,12 +4271,7 @@ static bool purchase_haggle(object_type *o_ptr, s32b *price)
43034271 {
43044272 final = TRUE;
43054273 cur_ask = final_ask;
4306-#ifdef JP
4307- pmt = "最終提示価格";
4308-#else
4309- pmt = "Final Offer";
4310-#endif
4311-
4274+ pmt = _("最終提示価格", "What do you offer? ");
43124275 annoyed++;
43134276 if (annoyed > 3)
43144277 {
@@ -4328,13 +4291,7 @@ static bool purchase_haggle(object_type *o_ptr, s32b *price)
43284291 last_offer = offer;
43294292 allow_inc = TRUE;
43304293 prt("", 1, 0);
4331-#ifdef JP
4332-(void)sprintf(out_val, "前回の提示金額: $%ld",
4333-#else
4334- (void)sprintf(out_val, "Your last offer: %ld",
4335-#endif
4336-
4337- (long)last_offer);
4294+ (void)sprintf(out_val, _("前回の提示金額: $%ld", "Your last offer: %ld"), (long)last_offer);
43384295 put_str(out_val, 1, 39);
43394296 say_comment_2(cur_ask, annoyed);
43404297 }
Show on old repository browser