composer/iTop
6
0
Fork 0
mirror of https://github.com/Combodo/iTop.git synced 2026-04-19 00:28:47 +02:00
Code Issues Packages Projects Releases Wiki Activity

When there is still no dictionary available, the menus / classes / attributes have a default label based on their raw names (replacing _ by a blank)

Browse Source 
SVN:trunk[1948]
This commit is contained in:
Romain Quetiez
2012-04-06 13:25:32 +00:00
parent 3a841269ec
commit da2abef030
3 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
application/menunode.class.inc.php
View File

@@ -372,12 +372,12 @@ abstract class MenuNode
public function GetTitle()
{
return Dict::S("Menu:$this->sMenuId");
return Dict::S("Menu:$this->sMenuId", str_replace('_', ' ', $this->sMenuId));
}
public function GetLabel()
{
return Dict::S("Menu:$this->sMenuId+");
return Dict::S("Menu:$this->sMenuId+", "");
}
public function GetIndex()

4
core/attributedef.class.inc.php
View File

@@ -181,7 +181,7 @@ abstract class AttributeDefinition
// If no default value is specified, let's define the most relevant one for developping purposes
if (is_null($sDefault))
{
$sDefault = $this->m_sCode;
$sDefault = str_replace('_', ' ', $this->m_sCode);
}
$sLabel = Dict::S('Class:'.$this->m_sHostClass.'/Attribute:'.$this->m_sCode, '');
@@ -2048,7 +2048,7 @@ class AttributeEnum extends AttributeString
$sLabel = Dict::S('Class:'.$this->GetHostClass().'/Attribute:'.$this->GetCode().'/Value:'.$sValue, '');
if (strlen($sLabel) == 0)
{
$sLabel = $sValue;
$sLabel = str_replace('_', ' ', $sValue);
$sParentClass = MetaModel::GetParentClass($this->m_sHostClass);
if ($sParentClass)
{

2
core/metamodel.class.php
View File

@@ -296,7 +296,7 @@ abstract class MetaModel
{
self::_check_subclass($sClass);
$sStringCode = 'Class:'.$sClass;
return Dict::S($sStringCode, $sClass);
return Dict::S($sStringCode, str_replace('_', ' ', $sClass));
}
final static public function GetName_Obsolete($sClass)
{