thirdparty/scummvm
2
0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

XEEN: RU Translated all constants.h strings for Clouds. Ready for test.

Browse source
This commit is contained in:
Maxim Kovalenko 2021-07-19 18:56:59 +03:00 • committed by Eugene Sandulenko
parent 325eb338fe
commit 9f80f452e4
11 changed files with 51 additions and 38 deletions
Download patch file Download diff file Expand all files Collapse all files

2
devtools/create_xeen/en_constants.h
View file

@ -1359,7 +1359,7 @@ public:
}
const char *FIX_IDENTIFY_GOLD() {
return "\x3l\v000\t000%s %s\fd for %u gold?";
return "\x3l\v000\t000%s %s\fd for %u %s?";
}
const char *IDENTIFY_ITEM_MSG() {

33
devtools/create_xeen/ru_constants.h
View file

@ -804,28 +804,17 @@ public:
}
const char *CHARACTER_DETAILS() {
return "\x3"
"l\v041\t196%s\t000\v002%s : %s %s %s"
"\x3"
"r\t053\v028\f%02u%u\fd\t103\f%02u%u\fd"
"\x3"
"l\t131\f%02u%d\fd\t196\f15%lu\fd\x3"
"r"
return "\x3""l\v041\t196%s\t000\v002%s : %s %s %s"
"\x3""r\t053\v028\f%02u%u\fd\t103\f%02u%u\fd"
"\x3""l\t131\f%02u%d\fd\t196\f15%lu\fd\x3""r"
"\t053\v051\f%02u%u\fd\t103\f%02u%u\fd"
"\x3"
"l\t131\f%02u%u\fd\t196\f15%lu\fd"
"\x3"
"r\t053\v074\f%02u%u\fd\t103\f%02u%u\fd"
"\x3"
"l\t131\f15%u\fd\t196\f15%lu\fd"
"\x3"
"r\t053\v097\f%02u%u\fd\t103\f%02u%u\fd"
"\x3"
"l\t131\f15%u\fd\t196\f15%u %s\fd"
"\x3"
"r\t053\v120\f%02u%u\fd\t103\f%02u%u\fd"
"\x3"
"l\t131\f15%u\fd\t196\f%02u%s\fd"
"\x3""l\t131\f%02u%u\fd\t196\f15%lu\fd"
"\x3""r\t053\v074\f%02u%u\fd\t103\f%02u%u\fd"
"\x3""l\t131\f15%u\fd\t196\f15%lu\fd"
"\x3""r\t053\v097\f%02u%u\fd\t103\f%02u%u\fd"
"\x3""l\t131\f15%u\fd\t196\f15%u %s\fd"
"\x3""r\t053\v120\f%02u%u\fd\t103\f%02u%u\fd"
"\x3""l\t131\f15%u\fd\t196\f%02u%s\fd"
"\t245%s%s%s%s\fd";
}
@ -1418,7 +1407,7 @@ public:
}
const char *FIX_IDENTIFY_GOLD() {
return "\x3""l\v000\t000%s %s\fd \xA7\xA0 %lu \xA7\xAE\xAB\xAE\xE2%s?"; // "\x3""l\v000\t000%s %s\fd за %lu золот%s?"
return "\x3""l\v000\t000%s %s\fd \xA7\xA0 %lu %s?"; // "\x3""l\v000\t000%s %s\fd за %lu %s?"
}
const char *IDENTIFY_ITEM_MSG() {

BIN
dists/engine-data/xeen.ccs
View file

Binary file not shown.

2
engines/xeen/dialogs/dialogs_char_info.cpp
View file

@ -278,7 +278,7 @@ void CharacterInfo::addButtons() {
addPartyButtons(_vm);
}
const char* CharacterInfo::getDaysPlurals(int val) {
const char *CharacterInfo::getDaysPlurals(int val) {
if (Common::RU_RUS == Common::parseLanguage(ConfMan.get("language"))) {
int i = val % 100;
if (i < 5 || i > 20)

2
engines/xeen/dialogs/dialogs_char_info.h
View file

@ -52,7 +52,7 @@ private:
/**
* Get plural day/days form
*/
const char* getDaysPlurals(int val);
const char *getDaysPlurals(int val);
/**
* Return a string containing the details of the character

6
engines/xeen/dialogs/dialogs_items.cpp
View file

@ -752,7 +752,7 @@ int ItemsDialog::calcItemCost(Character *c, int itemIndex, ItemsMode mode,
return (mode == ITEMMODE_CHAR_INFO) ? 0 : result;
}
const char* ItemsDialog::getGoldPlurals(int cost) {
const char *ItemsDialog::getGoldPlurals(int cost) {
if (Common::RU_RUS == Common::parseLanguage(ConfMan.get("language")))
return Res.GOLDS[cost % 10 == 1 ? 0 : 1];
return Res.GOLDS[0];
@ -933,7 +933,7 @@ int ItemsDialog::doItemOptions(Character &c, int actionIndex, int itemIndex, Ite
Common::String msg = Common::String::format(Res.FIX_IDENTIFY_GOLD,
Res.FIX_IDENTIFY[0],
c._items[category].getFullDescription(itemIndex).c_str(),
cost);
cost, getGoldPlurals(cost));
if (Confirm::show(_vm, msg) && party.subtract(CONS_GOLD, cost, WHERE_PARTY)) {
item._state._broken = false;
@ -946,7 +946,7 @@ int ItemsDialog::doItemOptions(Character &c, int actionIndex, int itemIndex, Ite
Common::String msg = Common::String::format(Res.FIX_IDENTIFY_GOLD,
Res.FIX_IDENTIFY[1],
c._items[category].getFullDescription(itemIndex).c_str(),
cost);
cost, getGoldPlurals(cost));
if (Confirm::show(_vm, msg) && party.subtract(CONS_GOLD, cost, WHERE_PARTY)) {
Common::String details = c._items[category].getIdentifiedDetails(itemIndex);

2
engines/xeen/dialogs/dialogs_items.h
View file

@ -67,7 +67,7 @@ private:
/**
* Get plural gold form
*/
const char* getGoldPlurals(int val);
const char *getGoldPlurals(int val);
int doItemOptions(Character &c, int actionIndex, int itemIndex,
ItemCategory category, ItemsMode mode);

21
engines/xeen/dialogs/dialogs_quick_ref.cpp
View file

@ -20,6 +20,7 @@
*
*/
#include "common/config-manager.h"
#include "xeen/dialogs/dialogs_quick_ref.h"
#include "xeen/resources.h"
#include "xeen/xeen.h"
@ -32,6 +33,24 @@ void QuickReferenceDialog::show(XeenEngine *vm) {
delete dlg;
}
const char *QuickReferenceDialog::getDaysPlurals(int val) {
if (Common::RU_RUS == Common::parseLanguage(ConfMan.get("language"))) {
int i = val % 100;
if (i < 5 || i > 20)
switch (val % 10) {
case 1:
return Res.DAYS[0];
case 2:
case 3:
case 4:
return Res.DAYS[1];
}
return Res.DAYS[2];
} else {
return Res.DAYS[val == 1 ? 0 : 1];
}
}
void QuickReferenceDialog::execute() {
Combat &combat = *_vm->_combat;
EventsManager &events = *_vm->_events;
@ -65,7 +84,7 @@ void QuickReferenceDialog::execute() {
lines[3].c_str(), lines[4].c_str(), lines[5].c_str(),
lines[6].c_str(), lines[7].c_str(),
party._gold, party._gems,
food, food == 1 ? "" : "s"
food, getDaysPlurals(food)
);
Window &w = windows[24];

5
engines/xeen/dialogs/dialogs_quick_ref.h
View file

@ -31,6 +31,11 @@ class QuickReferenceDialog : public ButtonContainer {
private:
QuickReferenceDialog(XeenEngine *vm) : ButtonContainer(vm) {}
/**
* Get plural day/days form
*/
const char *getDaysPlurals(int val);
void execute();
public:
static void show(XeenEngine *vm);

8
engines/xeen/party.cpp
View file

@ -662,7 +662,7 @@ int Party::subtract(ConsumableType consumableId, uint amount, PartyBank whereId,
return true;
}
const char* Party::getConsumableForm(ConsumableType consumableId) {
const char *Party::getConsumableForm(ConsumableType consumableId) {
switch (consumableId) {
case CONS_GOLD: return Res.CONSUMABLE_GOLD_FORMS[0];
case CONS_GEMS: return Res.CONSUMABLE_GEM_FORMS[0];
@ -821,7 +821,7 @@ bool Party::arePacksFull() const {
return total == (_activeParty.size() * NUM_ITEM_CATEGORIES);
}
const char* Party::getFoundForm(const Character& c) {
const char *Party::getFoundForm(const Character &c) {
if (Common::RU_RUS == Common::parseLanguage(ConfMan.get("language"))) {
switch (c._sex) {
case MALE:
@ -1483,7 +1483,7 @@ bool Party::giveTake(int takeMode, uint takeVal, int giveMode, uint giveVal, int
return false;
}
const char* Party::getPickLockForm(const Character &c) {
const char *Party::getPickLockForm(const Character &c) {
if (Common::RU_RUS == Common::parseLanguage(ConfMan.get("language"))) {
switch (c._sex) {
case MALE:
@ -1495,7 +1495,7 @@ const char* Party::getPickLockForm(const Character &c) {
return Res.PICK_FORM[0];
}
const char* Party::getUnablePickLockForm(const Character &c) {
const char *Party::getUnablePickLockForm(const Character &c) {
if (Common::RU_RUS == Common::parseLanguage(ConfMan.get("language"))) {
switch (c._sex) {
case MALE:

8
engines/xeen/party.h
View file

@ -160,7 +160,7 @@ private:
/**
* Get gender form 'found'
*/
const char* getFoundForm(const Character &c);
const char *getFoundForm(const Character &c);
/**
* Give a treasure item to the given character's inventory
@ -274,7 +274,7 @@ public:
int subtract(ConsumableType consumableId, uint amount, PartyBank whereId, MessageWaitType wait = WT_FREEZE_WAIT);
const char* getConsumableForm(ConsumableType consumableId);
const char *getConsumableForm(ConsumableType consumableId);
void notEnough(ConsumableType consumableId, PartyBank whereId, bool mode, MessageWaitType wait);
@ -305,12 +305,12 @@ public:
/*
* Get gender form 'picks'
*/
const char* getPickLockForm(const Character &c);
const char *getPickLockForm(const Character &c);
/*
* Get gender form 'unable to pick'
*/
const char* getUnablePickLockForm(const Character &c);
const char *getUnablePickLockForm(const Character &c);
/**
* Gives up to three different item/amounts to various character and/or party properties