Merge pull request #1441 from myk002/myk_readable_english

adapt to longer strings returned from getReadableName

Author: myk002

gui/family-affairs.lua

@@ -777,7 +777,7 @@ end
 FamilyAffairs = defclass(FamilyAffairs, widgets.Window)
 FamilyAffairs.ATTRS {
     frame_title='Family manager',
-    frame={w=50, h=30, r=2, t=18},
+    frame={w=65, h=30, r=2, t=18},
     frame_inset={t=1, l=1, r=1},
     resizable=true,
     initial_tab=DEFAULT_NIL,

gui/manipulator.lua

@@ -709,11 +709,11 @@ function Spreadsheet:init()
         },
         DataColumn{
             view_id='name',
-            frame={w=30},
+            frame={w=45},
             label='Name',
             label_inset=8,
             data_fn=dfhack.units.getReadableName,
-            data_width=30,
+            data_width=45,
             shared=self.shared,
         },
         cols,

gui/sitemap.lua

@@ -18,7 +18,7 @@ end
 Sitemap = defclass(Sitemap, widgets.Window)
 Sitemap.ATTRS {
     frame_title='Sitemap',
-    frame={w=57, r=2, t=18, h=25},
+    frame={w=67, r=2, t=18, h=25},
     resizable=true,
     resize_min={w=44, h=20},
     frame_inset={l=1, t=1, r=0, b=0},

gui/unit-info-viewer.lua

@@ -179,12 +179,6 @@ local function get_name_chunk(unit)
     }
 end
 
-local function get_translated_name_chunk(unit)
-    local tname = dfhack.translation.translateName(dfhack.units.getVisibleName(unit), true)
-    if #tname == 0 then return '' end
-    return ('"%s"'):format(tname)
-end
-
 local function get_description_chunk(unit)
     local desc = dfhack.units.getCasteRaw(unit).description
     if #desc == 0 then return end
@@ -458,15 +452,12 @@ function UnitInfo:init()
     self:addviews{
         widgets.Label{
             view_id='nameprof',
-            frame={t=0, l=0},
-        },
-        widgets.Label{
-            view_id='translated_name',
-            frame={t=1, l=0},
+            frame={t=0, l=0, h=1},
+            auto_height=false,
         },
         widgets.Label{
             view_id='chunks',
-            frame={t=3, l=0, b=0, r=0},
+            frame={t=2, l=0, b=0, r=0},
             auto_height=false,
             text='Please select a unit.',
         },
@@ -492,7 +483,6 @@ end
 function UnitInfo:refresh(unit, width)
     self.unit_id = unit.id
     self.subviews.nameprof:setText{get_name_chunk(unit)}
-    self.subviews.translated_name:setText{get_translated_name_chunk(unit)}
 
     local chunks = {}
     add_chunk(chunks, get_description_chunk(unit), width)