Let the "owner" be translated (#32740)

* Let the "owner" be translated * Let the "owner" be translated * Let the "owner" be translated * Recover accidentally deleted rows
CleverRaven · Jul 30, 2019 · ed290b3 · ed290b3
1 parent 3e20987
commit ed290b3
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 6 deletions.
diff --git a/lang/extract_json_strings.py b/lang/extract_json_strings.py
@@ -205,6 +205,7 @@ def extract_harvest(item):
 
 def extract_bodypart(item):
     outfile = get_outfile("bodypart")
+    writestr(outfile, item["name"])
     writestr(outfile, item["name"], context="bodypart_accusative")
     writestr(outfile, item["encumbrance_text"])
     writestr(outfile, item["heading_singular"], item["heading_plural"])

diff --git a/src/item.cpp b/src/item.cpp
@@ -1155,7 +1155,7 @@ std::string item::info( std::vector<iteminfo> &info, const iteminfo_query *parts
             info.push_back( iteminfo( "BASE", string_format( _( "Material: %s" ), material_list ) ) );
         }
         if( has_owner() ) {
-            info.push_back( iteminfo( "BASE", string_format( _( "Owner: %s" ), get_owner()->name ) ) );
+            info.push_back( iteminfo( "BASE", string_format( _( "Owner: %s" ), _( get_owner()->name ) ) ) );
         }
         if( has_var( "contained_name" ) && parts->test( iteminfo_parts::BASE_CONTENTS ) ) {
             info.push_back( iteminfo( "BASE", string_format( _( "Contains: %s" ),

diff --git a/src/veh_interact.cpp b/src/veh_interact.cpp
@@ -363,7 +363,7 @@ void veh_interact::do_main_loop()
             if( owned_by_player ) {
                 redraw = do_rename( msg );
             } else {
-                popup( _( "You cannot rename this vehicle as it is owned by: %s." ), veh->get_owner()->name );
+                popup( _( "You cannot rename this vehicle as it is owned by: %s." ), _( veh->get_owner()->name) );
                 redraw = true;
             }
         } else if( action == "SIPHON" ) {
@@ -397,14 +397,14 @@ void veh_interact::do_main_loop()
                 redraw = do_assign_crew( msg );
             } else {
                 popup( _( "You cannot assign crew on this vehicle as it is owned by: %s." ),
-                       veh->get_owner()->name );
+                       _( veh->get_owner()->name ) );
                 redraw = true;
             }
         } else if( action == "RELABEL" ) {
             if( owned_by_player ) {
                 redraw = do_relabel( msg );
             } else {
-                popup( _( "You cannot relabel this vehicle as it is owned by: %s." ), veh->get_owner()->name );
+                popup( _( "You cannot relabel this vehicle as it is owned by: %s." ), _( veh->get_owner()->name ) );
                 redraw = true;
             }
         } else if( action == "FUEL_LIST_DOWN" ) {
@@ -2409,7 +2409,7 @@ void veh_interact::display_name()
     mvwprintz( w_name, 0, 1, c_light_gray, _( "Name: " ) );
     std::string fac_name = veh->get_owner() &&
                            veh->get_owner() != g->faction_manager_ptr->get( faction_id( "your_followers" ) ) ?
-                           veh->get_owner()->name : _( "Yours" );
+                           _( veh->get_owner()->name ) : _( "Yours" );
     mvwprintz( w_name, 0, 1 + utf8_width( _( "Name: " ) ),
                veh->get_owner() != g->faction_manager_ptr->get( faction_id( "your_followers" ) ) ? c_light_red :
                c_light_green, string_format( _( "%s (%s)" ), veh->name,

diff --git a/src/vehicle.cpp b/src/vehicle.cpp
@@ -3860,7 +3860,7 @@ bool vehicle::handle_potential_theft( player &p, bool check_only, bool prompt )
     if( prompt ) {
         if( !query_yn(
                 _( "This vehicle belongs to: %s, there may be consequences if you are observed interacting with it, continue?" ),
-                get_owner()->name ) ) {
+                _( get_owner()->name ) ) ) {
             return false;
         }
     }