Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Translation update 0.C #11481

Merged

Conversation

Projects
None yet
4 participants
@kevingranade
Copy link
Member

commented Mar 8, 2015

Several updates to language handling as per http://smf.cataclysmdda.com/index.php?topic=4403.msg225130#msg225130

@BevapDin

View changes

src/newcharacter.cpp Outdated
wrefresh(w_scenario);

werase(w_profession);
mvwprintz(w_profession, 0, 0, COL_HEADER, _("Profession: "));
wprintz (w_profession, c_ltgray, u->prof->gender_appropriate_name(u->male).c_str());
wprintz (w_profession, c_ltgray, _(u->prof->gender_appropriate_name(u->male).c_str()));

This comment has been minimized.

Copy link
@BevapDin

BevapDin Mar 8, 2015

Contributor

Are you sure this is required? It seems the names are already translated via pgettext in profession::load_profession.

This comment has been minimized.

Copy link
@kevingranade

kevingranade Mar 8, 2015

Author Member

You're right, scenario was untranslated, but profession was fine, will revert.

@BevapDin

View changes

src/veh_interact.cpp Outdated
@@ -1826,7 +1826,7 @@ void veh_interact::display_details( const vpart_info *part )
if ( part->fuel_type != "NULL" ) {
fold_and_print(w_details, line+4, col_1, ( vertical_menu ? column_width : details_w ), c_white,
_("Charge: <color_ltgray>%s</color>"),
part->fuel_type.c_str());
_(part->fuel_type.c_str()));

This comment has been minimized.

Copy link
@BevapDin

BevapDin Mar 8, 2015

Contributor

fuel_type is actually an identifier (an ammo type). In veh_interact::do_refill, it's translated like this:

ammo_name( vehicle_part_types[...].fuel_type ).c_str()

Some parts of the code seem to think it's an item type id.

@kevingranade kevingranade force-pushed the kevingranade:translation-update-0.C branch to 79e8916 Mar 8, 2015

@kevingranade

This comment has been minimized.

Copy link
Member Author

commented Mar 8, 2015

Updated based on BevapDin's comments, thanks!

@Rivet-the-Zombie

This comment has been minimized.

Copy link
Member

commented Mar 8, 2015

We're getting so much closer to 0.C, it's wonderful!

I'm looking forward to the end of this freeze.

@Rivet-the-Zombie Rivet-the-Zombie self-assigned this Mar 8, 2015

Rivet-the-Zombie added a commit that referenced this pull request Mar 8, 2015

@Rivet-the-Zombie Rivet-the-Zombie merged commit 6621034 into CleverRaven:master Mar 8, 2015

1 check passed

default
Details
@VlasovVitaly

This comment has been minimized.

Copy link
Contributor

commented on 8d0b2c2 Mar 8, 2015

Italian, Argentinian, Greek on transifex too.
Other without changes.

@kevingranade kevingranade deleted the kevingranade:translation-update-0.C branch Mar 21, 2015

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
You can’t perform that action at this time.