Merge pull request #83201 from RenechCDDA/fix_some_UI_translations

Fix some issues with extracting/showing translations

Author: GuardianDll

src/basecamp.cpp

@@ -886,7 +886,7 @@ void basecamp::handle_takeover_by( faction_id new_owner, bool violent_takeover )
     camp_workers.clear();
 
     add_msg_debug( debugmode::DF_CAMPS, "Camp %s owned by %s is being taken over by %s!",
-                   name, fac()->name, new_owner->name );
+                   name, fac()->id.c_str(), new_owner->id.c_str() );
 
     if( !violent_takeover ) {
         set_owner( new_owner );
@@ -913,7 +913,8 @@ void basecamp::handle_takeover_by( faction_id new_owner, bool violent_takeover )
         if( checked_camp->get_owner() == get_owner() ) {
             add_msg_debug( debugmode::DF_CAMPS,
                            "Camp %s at %s is owned by %s, adding it to plunder calculations.",
-                           checked_camp->camp_name(), checked_camp->camp_omt_pos().to_string_writable(), get_owner()->name );
+                           checked_camp->camp_name(), checked_camp->camp_omt_pos().to_string_writable(),
+                           get_owner()->id.c_str() );
             num_of_owned_camps++;
         }
     }
@@ -933,7 +934,7 @@ void basecamp::handle_takeover_by( faction_id new_owner, bool violent_takeover )
     camp_food_supply( taken_from_camp );
     add_msg_debug( debugmode::DF_CAMPS,
                    "Food supplies of %s plundered by %d kilocalories!  Total food supply reduced to %d kilocalories after losing %.1f%% of their camps.",
-                   fac()->name, captured_with_camp.kcal(), fac()->food_supply().kcal(),
+                   fac()->id.c_str(), captured_with_camp.kcal(), fac()->food_supply().kcal(),
                    1.0 / static_cast<double>( num_of_owned_camps ) * 100.0 );
     set_owner( new_owner );
     int previous_days_of_food = camp_food_supply_days( MODERATE_EXERCISE );
@@ -943,7 +944,7 @@ void basecamp::handle_takeover_by( faction_id new_owner, bool violent_takeover )
     fac()->add_to_food_supply( added );
     add_msg_debug( debugmode::DF_CAMPS,
                    "Food supply of new owner %s has increased to %d kilocalories due to takeover of camp %s!",
-                   fac()->name, new_owner->food_supply().kcal(), name );
+                   fac()->id.c_str(), new_owner->food_supply().kcal(), name );
     if( new_owner == get_player_character().get_faction()->id ) {
         popup( _( "Through your looting of %s you found %d days worth of food and other resources." ),
                name, camp_food_supply_days( MODERATE_EXERCISE ) - previous_days_of_food );

src/calendar.cpp

@@ -15,6 +15,7 @@
 #include "options.h"
 #include "rng.h"
 #include "string_formatter.h"
+#include "translation.h"
 #include "translations.h"
 #include "units.h"
 #include "units_utility.h"
@@ -907,13 +908,13 @@ std::pair<month, int> month_and_day( time_point turn )
 
 std::string to_string( month m )
 {
-    static std::array<std::string, 12> months = {
-        translate_marker_context( "month", "Jan" ), translate_marker_context( "month", "Feb" ),
-        translate_marker_context( "month", "Mar" ), translate_marker_context( "month", "Apr" ),
-        translate_marker_context( "month", "May" ), translate_marker_context( "month", "Jun" ),
-        translate_marker_context( "month", "Jul" ), translate_marker_context( "month", "Aug" ),
-        translate_marker_context( "month", "Sep" ), translate_marker_context( "month", "Oct" ),
-        translate_marker_context( "month", "Nov" ), translate_marker_context( "month", "Dec" )
+    static std::array<translation, 12> months = {
+        to_translation( "month", "Jan" ), to_translation( "month", "Feb" ),
+        to_translation( "month", "Mar" ), to_translation( "month", "Apr" ),
+        to_translation( "month", "May" ), to_translation( "month", "Jun" ),
+        to_translation( "month", "Jul" ), to_translation( "month", "Aug" ),
+        to_translation( "month", "Sep" ), to_translation( "month", "Oct" ),
+        to_translation( "month", "Nov" ), to_translation( "month", "Dec" )
     };
 
     static_assert( static_cast<month>( 0 ) == month::JANUARY, "month enum out of phase" );
@@ -922,7 +923,7 @@ std::string to_string( month m )
         return _( "Cataclysm" );
     }
 
-    return _( months[static_cast<int>( m )] );
+    return months[static_cast<int>( m )].translated();
 }
 
 std::string get_diary_time_since_str( const time_duration &turn_diff, time_accuracy acc,

src/debug_menu.cpp

@@ -2356,7 +2356,7 @@ static faction *select_faction()
     uilist factionlist;
     int facnum = 0;
     for( const faction *faction : factions ) {
-        factionlist.addentry( facnum++, true, MENU_AUTOASSIGN, "%s", faction->name.c_str() );
+        factionlist.addentry( facnum++, true, MENU_AUTOASSIGN, "%s", faction->get_name() );
     }
 
     factionlist.query();
@@ -2903,7 +2903,7 @@ static void faction_edit_menu()
     uilist nmenu;
 
     std::stringstream data;
-    data << fac->name << std::endl;
+    data << fac->get_name() << std::endl;
     data << fac->describe() << std::endl;
     data << string_format( _( "Id: %s" ), fac->id.c_str() ) << std::endl;
     data << string_format( _( "Wealth: %d" ), fac->wealth ) << " | "
@@ -4449,7 +4449,7 @@ void debug()
                 std::cout << std::to_string( count ) << " Faction_id key in factions map = " << elem.first.str() <<
                           std::endl;
                 std::cout << std::to_string( count ) << " Faction name associated with this id is " <<
-                          elem.second.name << std::endl;
+                          elem.second.get_name() << std::endl;
                 std::cout << std::to_string( count ) << " the id of that faction object is " << elem.second.id.str()
                           << std::endl;
                 count++;

src/display.cpp

@@ -835,7 +835,7 @@ std::pair<std::string, nc_color> display::faction_text( const Character &u )
     if( owner->limited_area_claim && u.pos_abs_omt() != actual_camp->camp_omt_pos() ) {
         return std::pair( display_name, display_color );
     }
-    display_name = owner->name;
+    display_name = owner->get_name();
     // TODO: Make this magic number into a constant
     if( owner->likes_u < -10 ) {
         display_color = c_red;
@@ -954,9 +954,8 @@ std::pair<std::string, nc_color> display::vehicle_cruise_text_color( const Chara
     if( veh ) {
         const double target = convert_velocity( veh->cruise_velocity, VU_VEHICLE );
         const double current = convert_velocity( veh->velocity, VU_VEHICLE );
-        const std::string units = get_option<std::string> ( "USE_METRIC_SPEEDS" );
         vel_text = string_format( "%s < %s %s", three_digit_display( target ),
-                                  three_digit_display( current ), units );
+                                  three_digit_display( current ), velocity_units( VU_VEHICLE ) );
 
         const float strain = veh->strain( here );
         if( strain <= 0 ) {

src/faction.cpp

@@ -96,6 +96,16 @@ void faction_template::reset()
     npc_factions::all_templates.clear();
 }
 
+std::string faction_template::get_name() const
+{
+    return _( name );
+}
+
+void faction_template::set_name( std::string new_name )
+{
+    name = std::move( new_name );
+}
+
 void faction_template::load_relations( const JsonObject &jsobj )
 {
     for( const JsonMember fac : jsobj.get_object( "relations" ) ) {
@@ -536,7 +546,7 @@ faction *faction_manager::add_new_faction( const std::string &name_new, const fa
     for( const faction_template &fac_temp : npc_factions::all_templates ) {
         if( template_id == fac_temp.id ) {
             faction fac( fac_temp );
-            fac.name = name_new;
+            fac.set_name( name_new );
             fac.id = id_new;
             factions[fac.id] = fac;
             return &factions[fac.id];
@@ -559,7 +569,7 @@ faction *faction_manager::get( const faction_id &id, const bool complain )
                         elem.second.price_rules = fac_temp.price_rules;
                         elem.second.lone_wolf_faction = fac_temp.lone_wolf_faction;
                         elem.second.limited_area_claim = fac_temp.limited_area_claim;
-                        elem.second.name = fac_temp.name;
+                        elem.second.set_name( fac_temp.get_name() );
                         elem.second.desc = fac_temp.desc;
                         elem.second.mon_faction = fac_temp.mon_faction;
                         elem.second.epilogue_data = fac_temp.epilogue_data;
@@ -994,7 +1004,7 @@ void faction_manager::display() const
                 const std::string no_fac = _( "You don't know of any factions." );
                 if( active_vec_size > 0 ) {
                     draw_list( std::function( [&valfac]( size_t i ) {
-                        return _( valfac[i]->name );
+                        return valfac[i]->get_name();
                     } ) );
                     if( cur_fac ) {
                         cur_fac->faction_display( w_missions, 31 );

src/faction.h

@@ -123,7 +123,6 @@ class faction_template
     private:
         explicit faction_template( const JsonObject &jsobj );
 
-
     public:
         static void load( const JsonObject &jsobj );
         static void check_consistency();
@@ -141,7 +140,16 @@ class faction_template
         // debug access to food supply
         cata::list<std::pair<time_point, nutrients>> &debug_food_supply();
 
+        // Returns (hopefully) translated version of the faction's name.
+        std::string get_name() const;
+        // TODO: Move to faction constructor?
+        void set_name( std::string new_name );
+
+    protected:
+        // TODO: Shouldn't this be a translation object...
         std::string name;
+
+    public:
         int likes_u;
         int respects_u;
         int trusts_u; // Determines which item groups are available for trading
@@ -154,6 +162,7 @@ class faction_template
         // Sorted list of nutrients and when they expire
         // The time_point == 0 mod 1_days, and calendar::turn_zero is non-perishable food
         cata::list<std::pair<time_point, nutrients>> _food_supply; //Total nutritional value held
+
     public:
         bool consumes_food; //Whether this faction actually draws down the food_supply when eating from it
         int wealth;  //Total trade currency

src/game.cpp

@@ -3000,7 +3000,7 @@ void game::display_faction_epilogues()
                                                point( std::max( 0, ( TERMX - FULL_SCREEN_WIDTH ) / 2 ),
                                                       std::max( 0, ( TERMY - FULL_SCREEN_HEIGHT ) / 2 ) ) );
                 };
-                scrollable_text( new_win, elem.second.name,
+                scrollable_text( new_win, elem.second.get_name(),
                                  std::accumulate( epilogue.begin() + 1, epilogue.end(), epilogue.front(),
                 []( std::string lhs, const std::string & rhs ) -> std::string {
                     return std::move( lhs ) + "\n" + rhs;
@@ -5605,7 +5605,7 @@ bool game::warn_player_maybe_anger_local_faction( bool really_bad_offense,
     // Else there's a camp, and we're doing something we're not supposed to! Time to warn the player.
     if( !query_yn(
             _( "You're in the territory of %s, they probably won't appreciate your actions.  Continue anyway?" ),
-            actual_camp->get_owner()->name ) ) {
+            actual_camp->get_owner()->get_name() ) ) {
         return false;
     } else {
         faction *owner_fac_pointer = g->faction_manager_ptr->get( actual_camp->get_owner() );

src/iexamine.cpp

@@ -2202,7 +2202,7 @@ void iexamine::bulletin_board( Character &you, const tripoint_bub_ms &examp )
                           temp_camp->camp_name() ) ) {
                 bool plunder = query_yn(
                                    _( "Take whatever you can find from the stores?  This may anger %s and their allies." ),
-                                   temp_camp->get_owner()->name );
+                                   temp_camp->get_owner()->get_name() );
                 temp_camp->handle_takeover_by( you.get_faction()->id, plunder );
                 return;
             }

src/item.cpp

@@ -1060,7 +1060,7 @@ std::string item::get_old_owner_name() const
         debugmsg( "item::get_owner_name() item %s has no valid nor null faction id", tname() );
         return "no owner";
     }
-    return g->faction_manager_ptr->get( get_old_owner() )->name;
+    return g->faction_manager_ptr->get( get_old_owner() )->get_name();
 }
 
 std::string item::get_owner_name() const
@@ -1069,7 +1069,7 @@ std::string item::get_owner_name() const
         debugmsg( "item::get_owner_name() item %s has no valid nor null faction id ", tname() );
         return "no owner";
     }
-    return g->faction_manager_ptr->get( get_owner() )->name;
+    return g->faction_manager_ptr->get( get_owner() )->get_name();
 }
 
 void item::set_owner( const faction_id &new_owner )

src/item_info.cpp

@@ -283,7 +283,7 @@ void item::basic_info( std::vector<iteminfo> &info, const iteminfo_query *parts,
     }
     if( parts->test( iteminfo_parts::BASE_OWNER ) && !owner.is_null() ) {
         info.emplace_back( "BASE", string_format( _( "Owner: %s" ),
-                           _( get_owner_name() ) ) );
+                           get_owner_name() ) );
     }
     if( parts->test( iteminfo_parts::BASE_CATEGORY ) ) {
         info.emplace_back( "BASE", _( "Category: " ),
@@ -394,7 +394,7 @@ void item::debug_info( std::vector<iteminfo> &info, const iteminfo_query *parts,
                                typeId().str() ) );
             if( !old_owner.is_null() ) {
                 info.emplace_back( "BASE", string_format( _( "Old owner: %s" ),
-                                   _( get_old_owner_name() ) ) );
+                                   get_old_owner_name() ) );
             }
             info.emplace_back( "BASE", _( "age (hours): " ), "", iteminfo::lower_is_better,
                                to_hours<int>( age() ) );
@@ -1733,14 +1733,19 @@ void item::armor_protection_info( std::vector<iteminfo> &info, const iteminfo_qu
         bool display_median = percent_best < 50 && percent_worst < 50;
 
         std::string protection_table;
+        const std::string worst_chance_string = string_format( _( "<bad>%d%%</bad> chance" ),
+                                                percent_worst );
+        const std::string median_chance = _( "<color_c_yellow>Median</color> chance" );
+        const std::string best_chance_string = string_format( _( "<good>%d%%</good> chance" ),
+                                               percent_best );
         if( display_median ) {
             protection_table +=
-                string_format( "<bold>%s</bold>;<bad>%d%%</bad> chance;<color_c_yellow>Median</color> chance;<good>%d%%</good> chance\n",
-                               _( "Protection" ), percent_worst, percent_best );
+                string_format( "<bold>%s</bold>;%s;%s;%s\n",
+                               _( "Protection" ), worst_chance_string, median_chance, best_chance_string );
         } else if( percent_worst > 0 ) {
             protection_table +=
-                string_format( "<bold>%s</bold>;<bad>%d%%</bad> chance;<good>%d%%</good> chance\n",
-                               _( "Protection" ), percent_worst, percent_best );
+                string_format( "<bold>%s</bold>;%s;%s\n",
+                               _( "Protection" ), worst_chance_string, best_chance_string );
         } else {
             protection_table += string_format( "<bold>%s</bold>\n", _( "Protection" ) );
         }
@@ -2715,7 +2720,7 @@ void item::tool_info( std::vector<iteminfo> &info, const iteminfo_query *parts,
     std::string &eport = type->tool->e_port;
     if( !eport.empty() ) {
         std::string compat;
-        compat += _( "* This device has electronic port type: " + colorize( eport, c_light_green ) );
+        compat += _( "* This device has electronic port type: " ) + colorize( _( eport ), c_light_green ) ;
         std::vector<std::string> &eport_banned = type->tool->e_ports_banned;
         if( !eport_banned.empty() ) {
             compat += _( "\n* This device does not support transfer to e-port types: " );