mirror of
https://github.com/FlightControl-Master/MOOSE.git
synced 2026-08-14 13:18:48 +00:00
#Fix some missing localizations
This commit is contained in:
@@ -3292,7 +3292,7 @@ do -- COORDINATE
|
|||||||
local DirectionVec3 = FromCoordinate:GetDirectionVec3( self )
|
local DirectionVec3 = FromCoordinate:GetDirectionVec3( self )
|
||||||
local AngleRadians = self:GetAngleRadians( DirectionVec3 )
|
local AngleRadians = self:GetAngleRadians( DirectionVec3 )
|
||||||
local Distance = self:Get2DDistance( FromCoordinate )
|
local Distance = self:Get2DDistance( FromCoordinate )
|
||||||
return "BR, " .. self:GetBRText( AngleRadians, Distance, Settings, nil, MagVar, Precision )
|
return "BR " .. self:GetBRText( AngleRadians, Distance, Settings, nil, MagVar, Precision )
|
||||||
end
|
end
|
||||||
|
|
||||||
--- Return a Bearing string from a COORDINATE to the (self) COORDINATE.
|
--- Return a Bearing string from a COORDINATE to the (self) COORDINATE.
|
||||||
|
|||||||
@@ -279,6 +279,8 @@
|
|||||||
-- REQUESTSAR = "%s requests SAR at %s, beacon at %.2f KHz!",
|
-- REQUESTSAR = "%s requests SAR at %s, beacon at %.2f KHz!",
|
||||||
-- REQUESTSARBEACON = "%s requests SAR at %s, beacon at %.2f KHz!",
|
-- REQUESTSARBEACON = "%s requests SAR at %s, beacon at %.2f KHz!",
|
||||||
-- KHZ = "kilo hertz",
|
-- KHZ = "kilo hertz",
|
||||||
|
-- FILLAT = "at",
|
||||||
|
-- FILLFOR = "for",
|
||||||
-- },
|
-- },
|
||||||
--
|
--
|
||||||
-- e.g. for Spanish:
|
-- e.g. for Spanish:
|
||||||
@@ -377,6 +379,8 @@ CSAR.Messages = {
|
|||||||
REQUESTSAR = "%s requests SAR at %s, beacon at %.2f KHz!",
|
REQUESTSAR = "%s requests SAR at %s, beacon at %.2f KHz!",
|
||||||
REQUESTSARBEACON = "%s requests SAR at %s, beacon at %.2f KHz!",
|
REQUESTSARBEACON = "%s requests SAR at %s, beacon at %.2f KHz!",
|
||||||
KHZ = "kilo hertz",
|
KHZ = "kilo hertz",
|
||||||
|
FILLAT = "at",
|
||||||
|
FILLFOR = "for",
|
||||||
},
|
},
|
||||||
DE = {
|
DE = {
|
||||||
HEARYOULONG = "%s: %s. Ich höre Sie! Endlich, das ist Musik in meinen Ohren!\nIch zünde eine Rauchgranate, wenn Sie %s entfernt sind.\nLanden Sie oder hovern Sie beim Rauch.",
|
HEARYOULONG = "%s: %s. Ich höre Sie! Endlich, das ist Musik in meinen Ohren!\nIch zünde eine Rauchgranate, wenn Sie %s entfernt sind.\nLanden Sie oder hovern Sie beim Rauch.",
|
||||||
@@ -414,6 +418,8 @@ CSAR.Messages = {
|
|||||||
REQUESTSAR = "%s fordert SAR bei %s an, ADF %.2f KHz!",
|
REQUESTSAR = "%s fordert SAR bei %s an, ADF %.2f KHz!",
|
||||||
REQUESTSARBEACON = "%s fordert SAR bei %s an, ADF %.2f KHz!",
|
REQUESTSARBEACON = "%s fordert SAR bei %s an, ADF %.2f KHz!",
|
||||||
KHZ = "Kilohertz",
|
KHZ = "Kilohertz",
|
||||||
|
FILLAT = "bei",
|
||||||
|
FILLFOR = "für",
|
||||||
},
|
},
|
||||||
FR = {
|
FR = {
|
||||||
HEARYOULONG = "%s: %s. Je vous entends! Enfin, c'est de la musique dans mes oreilles!\nJe lancerai une fumée quand vous serez à %s.\nAtterrissez ou survolez la fumée.",
|
HEARYOULONG = "%s: %s. Je vous entends! Enfin, c'est de la musique dans mes oreilles!\nJe lancerai une fumée quand vous serez à %s.\nAtterrissez ou survolez la fumée.",
|
||||||
@@ -451,6 +457,8 @@ CSAR.Messages = {
|
|||||||
REQUESTSAR = "%s demande un SAR à %s, balise à %.2f KHz!",
|
REQUESTSAR = "%s demande un SAR à %s, balise à %.2f KHz!",
|
||||||
REQUESTSARBEACON = "%s demande un SAR à %s, balise à %.2f KHz!",
|
REQUESTSARBEACON = "%s demande un SAR à %s, balise à %.2f KHz!",
|
||||||
KHZ = "kilohertz",
|
KHZ = "kilohertz",
|
||||||
|
FILLAT = "au",
|
||||||
|
FILLFOR = "pour",
|
||||||
},
|
},
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -1513,10 +1521,10 @@ function CSAR:_InitSARForPilot(_downedGroup, _GroupName, _freq, _nomessage, _pla
|
|||||||
self:_DisplayToAllSAR(_text,self.coalition,self.messageTime)
|
self:_DisplayToAllSAR(_text,self.coalition,self.messageTime)
|
||||||
else
|
else
|
||||||
self:_DisplayToAllSAR(_text,self.coalition,self.messageTime,false,true)
|
self:_DisplayToAllSAR(_text,self.coalition,self.messageTime,false,true)
|
||||||
local coordtext = UTILS.MGRSStringToSRSFriendly(_coordinatesText,true)
|
local coordtext = UTILS.MGRSStringToSRSFriendly(_coordinatesText,true,self.SRSBackend)
|
||||||
local request = self.gettext:GetEntry("REQUESTSARBEACON",self.locale)
|
local request = self.gettext:GetEntry("REQUESTSARBEACON",self.locale)
|
||||||
local _text = string.format(request, _groupName, coordtext, _freqk)
|
local _text = string.format(request, _groupName, coordtext, _freqk)
|
||||||
self:_DisplayToAllSAR(_text,self.coalition,self.messageTime,true,false)
|
self:_DisplayToAllSAR(_text,self.coalition,self.messageTime,true,false,self.SRSBackend)
|
||||||
end
|
end
|
||||||
else --shagrat CASEVAC msg
|
else --shagrat CASEVAC msg
|
||||||
local request = self.gettext:GetEntry("PICKUPZONE",self.locale)
|
local request = self.gettext:GetEntry("PICKUPZONE",self.locale)
|
||||||
@@ -1525,7 +1533,7 @@ function CSAR:_InitSARForPilot(_downedGroup, _GroupName, _freq, _nomessage, _pla
|
|||||||
self:_DisplayToAllSAR(_text,self.coalition,self.messageTime)
|
self:_DisplayToAllSAR(_text,self.coalition,self.messageTime)
|
||||||
else
|
else
|
||||||
self:_DisplayToAllSAR(_text,self.coalition,self.messageTime,false,true)
|
self:_DisplayToAllSAR(_text,self.coalition,self.messageTime,false,true)
|
||||||
local coordtext = UTILS.MGRSStringToSRSFriendly(_coordinatesText,true)
|
local coordtext = UTILS.MGRSStringToSRSFriendly(_coordinatesText,true,self.SRSBackend)
|
||||||
local _text = string.format(request, coordtext )
|
local _text = string.format(request, coordtext )
|
||||||
self:_DisplayToAllSAR(_text,self.coalition,self.messageTime,true,false)
|
self:_DisplayToAllSAR(_text,self.coalition,self.messageTime,true,false)
|
||||||
end
|
end
|
||||||
@@ -2130,6 +2138,8 @@ function CSAR:_GetPositionOfWounded(_woundedGroup,_Unit)
|
|||||||
-- attention this is the distance from the ASKING unit to target, not from RECCE to target!
|
-- attention this is the distance from the ASKING unit to target, not from RECCE to target!
|
||||||
local startcoordinate = _Unit:GetCoordinate()
|
local startcoordinate = _Unit:GetCoordinate()
|
||||||
_coordinatesText = _coordinate:ToStringBR(startcoordinate,settings)
|
_coordinatesText = _coordinate:ToStringBR(startcoordinate,settings)
|
||||||
|
local fillfor = self.gettext:GetEntry("FILLFOR",self.locale)
|
||||||
|
_coordinatesText = string.gsub(_coordinatesText,"for","")
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
@@ -2174,10 +2184,11 @@ function CSAR:_DisplayActiveSAR(_unitName)
|
|||||||
else
|
else
|
||||||
distancetext = string.format("%.1fkm", _distance/1000.0)
|
distancetext = string.format("%.1fkm", _distance/1000.0)
|
||||||
end
|
end
|
||||||
|
local fillat = self.gettext:GetEntry("FILLAT",self.locale)
|
||||||
if _value.frequency == 0 or self.CreateRadioBeacons == false then--shagrat insert CASEVAC without Frequency
|
if _value.frequency == 0 or self.CreateRadioBeacons == false then--shagrat insert CASEVAC without Frequency
|
||||||
table.insert(_csarList, { dist = _distance, msg = string.format("%s at %s - %s ", _value.desc, _coordinatesText, distancetext) })
|
table.insert(_csarList, { dist = _distance, msg = string.format("%s %s %s - %s ", _value.desc, fillat, _coordinatesText, distancetext) })
|
||||||
else
|
else
|
||||||
table.insert(_csarList, { dist = _distance, msg = string.format("%s at %s - %.2f KHz ADF - %s ", _value.desc, _coordinatesText, _value.frequency / 1000, distancetext) })
|
table.insert(_csarList, { dist = _distance, msg = string.format("%s %s %s - %.2f KHz ADF - %s ", _value.desc, fillat, _coordinatesText, _value.frequency / 1000, distancetext) })
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
@@ -5744,11 +5744,12 @@ function CTLD:_RefreshLoadCratesMenu(Group,Unit)
|
|||||||
while i<=#list do
|
while i<=#list do
|
||||||
local left=#list-i+1
|
local left=#list-i+1
|
||||||
local label
|
local label
|
||||||
if left>=needed then
|
local loadkey = self.gettext:GetEntry("MENU_LOAD_SINGLE",self.locale)
|
||||||
label=string.format("%d. Load %s",lineIndex,cName)
|
if left>=needed then
|
||||||
|
label=string.format("%d. %s %s",lineIndex,loadkey, cName)
|
||||||
i=i+needed
|
i=i+needed
|
||||||
else
|
else
|
||||||
label=string.format("%d. Load %s (%d/%d)",lineIndex,cName,left,needed)
|
label=string.format("%d. %s %s (%d/%d)",lineIndex,loadkey, cName,left,needed)
|
||||||
i=#list+1
|
i=#list+1
|
||||||
end
|
end
|
||||||
MENU_GROUP_COMMAND:New(Group,label,Group.MyLoadCratesMenu,self._LoadSingleCrateSet,self,Group,Unit,cName)
|
MENU_GROUP_COMMAND:New(Group,label,Group.MyLoadCratesMenu,self._LoadSingleCrateSet,self,Group,Unit,cName)
|
||||||
|
|||||||
Reference in New Issue
Block a user