From fb028710e0e6af7a126f35410843a88f3a1e5991 Mon Sep 17 00:00:00 2001 From: Stephen Abello Date: Mon, 10 Dec 2018 15:10:58 +0100 Subject: [PATCH 1/6] Datamodel viewer: Fix an issue where OQL Filters were truncated --- pages/schema.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/pages/schema.php b/pages/schema.php index e4a8758aa..6a073679f 100644 --- a/pages/schema.php +++ b/pages/schema.php @@ -889,7 +889,7 @@ function DisplayClassDetails($oPage, $sClass, $sContext) } elseif (is_object($oAllowedValuesDef = $oAttDef->GetValuesDef())) { - $sAllowedValues = trim( $oAllowedValuesDef->GetValuesDescription(), "Filter : "); + $sAllowedValues = str_replace("Filter: ", "", $oAllowedValuesDef->GetValuesDescription()); $sAllowedValuesEscpd = json_encode($sAllowedValues); $sFilterURL = urlencode($sAllowedValues); From d3fd81545a5eabcbe52dbbcd61bdfd4753508f7d Mon Sep 17 00:00:00 2001 From: Purple Grape Date: Fri, 7 Dec 2018 20:21:03 +0800 Subject: [PATCH 2/6] Update zh.dictionary.itop.ui.php fix one line missing and small translation improvement --- dictionaries/zh.dictionary.itop.ui.php | 85 +++++++++++++------------- 1 file changed, 43 insertions(+), 42 deletions(-) diff --git a/dictionaries/zh.dictionary.itop.ui.php b/dictionaries/zh.dictionary.itop.ui.php index 2369419e4..b49778e57 100644 --- a/dictionaries/zh.dictionary.itop.ui.php +++ b/dictionaries/zh.dictionary.itop.ui.php @@ -123,10 +123,10 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( 'Class:User/Attribute:login+' => '用户标识字符串', 'Class:User/Attribute:language' => '语言', 'Class:User/Attribute:language+' => '用户语言', - 'Class:User/Attribute:language/Value:EN US' => 'English', - 'Class:User/Attribute:language/Value:EN US+' => 'English (U.S.)', - 'Class:User/Attribute:language/Value:FR FR' => 'French', - 'Class:User/Attribute:language/Value:FR FR+' => 'French (France)', + 'Class:User/Attribute:language/Value:EN US' => '英语', + 'Class:User/Attribute:language/Value:EN US+' => '英语 (U.S.)', + 'Class:User/Attribute:language/Value:FR FR' => '法语', + 'Class:User/Attribute:language/Value:FR FR+' => '法语 (France)', 'Class:User/Attribute:profile_list' => '角色', 'Class:User/Attribute:profile_list+' => '授予该用户的角色', 'Class:User/Attribute:allowed_org_list' => '可访问的组织', @@ -230,7 +230,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( 'Class:URP_ProfileProjection/Attribute:profile' => '角色', 'Class:URP_ProfileProjection/Attribute:profile+' => '角色名称', 'Class:URP_ProfileProjection/Attribute:value' => '值表达式', - 'Class:URP_ProfileProjection/Attribute:value+' => 'OQL expression (using $user) | constant | | +attribute code', + 'Class:URP_ProfileProjection/Attribute:value+' => 'OQL 表达式 (using $user) | constant | | +attribute code', 'Class:URP_ProfileProjection/Attribute:attribute' => '属性', 'Class:URP_ProfileProjection/Attribute:attribute+' => '目标属性编码 (可选)', )); @@ -249,7 +249,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( 'Class:URP_ClassProjection/Attribute:class' => '类', 'Class:URP_ClassProjection/Attribute:class+' => '目标类', 'Class:URP_ClassProjection/Attribute:value' => '值表达式', - 'Class:URP_ClassProjection/Attribute:value+' => 'OQL expression (using $this) | constant | | +attribute code', + 'Class:URP_ClassProjection/Attribute:value+' => 'OQL 表达式 (using $this) | constant | | +attribute code', 'Class:URP_ClassProjection/Attribute:attribute' => '属性', 'Class:URP_ClassProjection/Attribute:attribute+' => '目标属性编码 (可选)', )); @@ -391,7 +391,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( 'UI:Button:SimulateImport' => ' 开始导入 ', 'UI:Button:Test' => '测试!', 'UI:Button:Evaluate' => ' 测试 ', - 'UI:Button:Evaluate:Title' => ' Evaluate (Ctrl+Enter)', + 'UI:Button:Evaluate:Title' => ' 评估 (Ctrl+Enter)', 'UI:Button:AddObject' => ' 添加... ', 'UI:Button:BrowseObjects' => ' 浏览... ', 'UI:Button:Add' => ' 添加 ', @@ -404,8 +404,8 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( 'UI:Button:ChangePassword' => ' 修改密码 ', 'UI:Button:ResetPassword' => ' 重置密码 ', 'UI:Button:Insert' => '插入', - 'UI:Button:More' => 'More', - 'UI:Button:Less' => 'Less', + 'UI:Button:More' => '更多', + 'UI:Button:Less' => '更少', 'UI:SearchToggle' => '搜索', 'UI:ClickToCreateNew' => '新建 %1$s', @@ -461,11 +461,11 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( 'UI:History:Changes' => '变更', 'UI:History:Changes+' => '对该对象所做的变更', 'UI:History:StatsCreations' => '已创建', - 'UI:History:StatsCreations+' => 'Count of objects created', + 'UI:History:StatsCreations+' => '已创建的对象个数', 'UI:History:StatsModifs' => '已修改', - 'UI:History:StatsModifs+' => 'Count of objects modified', + 'UI:History:StatsModifs+' => '已修改的对象个数', 'UI:History:StatsDeletes' => '已删除', - 'UI:History:StatsDeletes+' => 'Count of objects deleted', + 'UI:History:StatsDeletes+' => '已删除的对象个数', 'UI:Loading' => '载入...', 'UI:Menu:Actions' => '操作', 'UI:Menu:OtherActions' => '其他操作', @@ -488,7 +488,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( 'UI:ChangesLogTitle' => '变更记录 (%1$d):', 'UI:EmptyChangesLogTitle' => '变更记录为空', 'UI:SearchFor_Class_Objects' => '搜索 %1$s ', - 'UI:OQLQueryBuilderTitle' => 'OQL Query Builder', + 'UI:OQLQueryBuilderTitle' => 'OQL 查询构建器', 'UI:OQLQueryTab' => 'OQL 查询', 'UI:SimpleSearchTab' => '简单搜索', 'UI:Details+' => '详情', @@ -537,8 +537,8 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( 'UI:LogOff:ClickHereToLoginAgain' => '点击这里再次登录...', 'UI:ChangePwdMenu' => '修改密码...', 'UI:Login:PasswordChanged' => '密码已成功设置!', - 'UI:AccessRO-All' => 'iTop is read-only', - 'UI:AccessRO-Users' => 'iTop is read-only for end-users', + 'UI:AccessRO-All' => 'iTop 是只读的', + 'UI:AccessRO-Users' => 'iTop 对于终端用户是只读的', 'UI:ApplicationEnvironment' => '应用环境: %1$s', 'UI:Login:RetypePwdDoesNotMatch' => '新密码输入不一致!', 'UI:Button:Login' => '登录iTop', @@ -612,7 +612,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( 'UI:CSVReport-Value-ChangeIssue' => '无法修改成 %1$s - 原因: %2$s', 'UI:CSVReport-Value-NoMatch' => '不匹配', 'UI:CSVReport-Value-Missing' => '缺少必填项', - 'UI:CSVReport-Value-Ambiguous' => 'Ambiguous: found %1$s objects', + 'UI:CSVReport-Value-Ambiguous' => '模糊匹配: 找到 %1$s 个对象', 'UI:CSVReport-Row-Unchanged' => '保持不变', 'UI:CSVReport-Row-Created' => '新建', 'UI:CSVReport-Row-Updated' => '已更新 %1$d 列', @@ -623,7 +623,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( 'UI:CSVReport-Value-Issue-FoundMany' => '找到 %1$d 个匹配项', 'UI:CSVReport-Value-Issue-Readonly' => '\'%1$s\' 的属性是只读的,不能修改 (当前值: %2$s, 建议值: %3$s)', 'UI:CSVReport-Value-Issue-Format' => '输入处理失败: %1$s', - 'UI:CSVReport-Value-Issue-NoMatch' => 'Unexpected value for attribute \'%1$s\': no match found, check spelling', + 'UI:CSVReport-Value-Issue-NoMatch' => 'Unexpected value for attribute \'%1$s\': 无法匹配, 请检查拼写', 'UI:CSVReport-Value-Issue-Unknown' => 'Unexpected value for attribute \'%1$s\': %2$s', 'UI:CSVReport-Row-Issue-Inconsistent' => '属性不一致: %1$s', 'UI:CSVReport-Row-Issue-Attribute' => '错误的属性', @@ -716,8 +716,8 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( 'UI:Schema:LifeCycle' => '生命周期', 'UI:Schema:Triggers' => '触发器', 'UI:Schema:Relation_Code_Description' => '关联 %1$s (%2$s)', - 'UI:Schema:RelationDown_Description' => 'Down: %1$s', - 'UI:Schema:RelationUp_Description' => 'Up: %1$s', + 'UI:Schema:RelationDown_Description' => '向下: %1$s', + 'UI:Schema:RelationUp_Description' => '向上: %1$s', 'UI:Schema:RelationPropagates' => '%1$s: 繁殖到 %2$d 个层级, 查询: %3$s', 'UI:Schema:RelationDoesNotPropagate' => '%1$s: 没有繁殖 (%2$d 层级), 查询: %3$s', 'UI:Schema:Class_ReferencingClasses_From_By' => '%1$s 被类 %2$s 参照, 通过栏目 %3$s', @@ -734,11 +734,11 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( 'UI:Schema:LifeCycleAttributeMustChange' => '必须变更', 'UI:Schema:LifeCycleAttributeMustPrompt' => '用户将被提示改变值', 'UI:Schema:LifeCycleEmptyList' => '空列表', - 'UI:Schema:ClassFilter' => 'Class:~~', - 'UI:Schema:DisplayLabel' => '显示:~~', - 'UI:Schema:DisplaySelector/LabelAndCode' => 'Label and code~~', - 'UI:Schema:DisplaySelector/Label' => 'Label~~', - 'UI:Schema:DisplaySelector/Code' => 'Code~~', + 'UI:Schema:ClassFilter' => '类别:', + 'UI:Schema:DisplayLabel' => '显示:', + 'UI:Schema:DisplaySelector/LabelAndCode' => '标记和代码', + 'UI:Schema:DisplaySelector/Label' => '标记', + 'UI:Schema:DisplaySelector/Code' => '代码', 'UI:Schema:Attribute/Filter' => '过滤器~~', 'UI:Schema:DefaultNullValue' => 'Default null : "%1$s"~~', 'UI:LinksWidget:Autocomplete+' => '输入前3个字符...', @@ -1080,7 +1080,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( 'UI:BulkModifyStatus' => '操作', 'UI:BulkModifyStatus+' => '操作状态', 'UI:BulkModifyErrors' => 'Errors (if any)', - 'UI:BulkModifyErrors+' => 'Errors preventing the modification', + 'UI:BulkModifyErrors+' => '阻止修改时报错', 'UI:BulkModifyStatusOk' => 'Ok', 'UI:BulkModifyStatusError' => '错误', 'UI:BulkModifyStatusModified' => '已修改', @@ -1143,8 +1143,8 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( 'UI:Button:MoveUp' => '上移', 'UI:Button:MoveDown' => '下移', - 'UI:OQL:UnknownClassAndFix' => '未知 class "%1$s". You may try "%2$s" instead.', - 'UI:OQL:UnknownClassNoFix' => '未知 class "%1$s"', + 'UI:OQL:UnknownClassAndFix' => '未知类别 "%1$s". 您可以试试 "%2$s" .', + 'UI:OQL:UnknownClassNoFix' => '未知类别 "%1$s"', 'UI:Dashboard:Edit' => '编辑这个页面...', 'UI:Dashboard:Revert' => '还原到初始版本...', @@ -1184,7 +1184,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( 'UI:DashletProxy:Label' => 'Proxy', 'UI:DashletProxy:Description' => 'Proxy dashlet', 'UI:DashletProxy:RenderNoDataText:Edit' => 'No preview available for this third-party dashlet (class "%1$s").', - 'UI:DashletProxy:Prop-XMLConfiguration' => 'Configuration (显示为纯 XML)', + 'UI:DashletProxy:Prop-XMLConfiguration' => '配置 (显示为纯 XML)', 'UI:DashletPlainText:Label' => '文本', 'UI:DashletPlainText:Description' => '纯文本(无格式)', @@ -1311,7 +1311,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( 'Class:Shortcut' => '快捷方式', 'Class:Shortcut+' => '', 'Class:Shortcut/Attribute:name' => '名称', - 'Class:Shortcut/Attribute:name+' => 'Label used in the menu and page title', + 'Class:Shortcut/Attribute:name+' => '用于菜单和页面的标记', 'Class:ShortcutOQL' => '搜索结果的快捷方式', 'Class:ShortcutOQL+' => '', 'Class:ShortcutOQL/Attribute:oql' => '查询', @@ -1365,7 +1365,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( 'UI:About:InstallationOptions' => '已安装的模块', 'UI:About:ManualExtensionSource' => '扩展', 'UI:About:Extension_Version' => '版本: %1$s', - 'UI:About:RemoteExtensionSource' => 'Data', + 'UI:About:RemoteExtensionSource' => '数据', 'UI:DisconnectedDlgMessage' => '您已断开. 要继续使用，需要重新验证您的用户名和密码.', 'UI:DisconnectedDlgTitle' => '警告!', @@ -1386,11 +1386,11 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( 'portal:backoffice' => 'iTop 后台用户界面', 'UI:CurrentObjectIsLockedBy_User' => '对象被锁住,因为正在修改 %1$s.', - 'UI:CurrentObjectIsLockedBy_User_Explanation' => 'The object is currently being modified by %1$s. Your modifications cannot be submitted since they would be overwritten.', - 'UI:CurrentObjectLockExpired' => 'The lock to prevent concurrent modifications of the object has expired.', + 'UI:CurrentObjectIsLockedBy_User_Explanation' => '该对象正在被 %1$s 修改. 您的修改无法提交因为它们会冲突.', + 'UI:CurrentObjectLockExpired' => '并发修改的锁定期已过.', 'UI:CurrentObjectLockExpired_Explanation' => 'The lock to prevent concurrent modifications of the object has expired. You can no longer submit your modification since other users are now allowed to modify this object.', - 'UI:ConcurrentLockKilled' => 'The lock preventing modifications on the current object has been deleted.', - 'UI:Menu:KillConcurrentLock' => 'Kill the Concurrent Modification Lock !', + 'UI:ConcurrentLockKilled' => '阻止并发修改当前对象的锁已被删除.', + 'UI:Menu:KillConcurrentLock' => '消除并发修改锁定!', 'UI:Menu:ExportPDF' => '导出 PDF...', 'UI:Menu:PrintableVersion' => '打印', @@ -1408,7 +1408,8 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( // Search form 'UI:Search:Toggle' => '折叠 / 展开', - 'UI:Search:AutoSubmit:DisabledHint' => 'Auto submit has been disabled for this class', + 'UI:Search:AutoSubmit:DisabledHint' => '该类别已禁用自动提交', + 'UI:Search:NoAutoSubmit:ExplainText' => '在搜索框中添加规则，或者单击对象按钮查看对象.', 'UI:Search:Criterion:MoreMenu:AddCriteria' => '添加条件', // - Add new criteria button 'UI:Search:AddCriteria:List:RecentlyUsed:Title' => '最近使用', @@ -1419,8 +1420,8 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( // - Criteria titles // - Default widget 'UI:Search:Criteria:Title:Default:Any' => '%1$s: 任何', - 'UI:Search:Criteria:Title:Default:Empty' => '%1$s is empty', - 'UI:Search:Criteria:Title:Default:NotEmpty' => '%1$s is not empty', + 'UI:Search:Criteria:Title:Default:Empty' => '%1$s 为空', + 'UI:Search:Criteria:Title:Default:NotEmpty' => '%1$s 不为空', 'UI:Search:Criteria:Title:Default:Equals' => '%1$s 等于 %2$s', 'UI:Search:Criteria:Title:Default:Contains' => '%1$s 包含 %2$s', 'UI:Search:Criteria:Title:Default:StartsWith' => '%1$s 起始于 %2$s', @@ -1445,22 +1446,22 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( 'UI:Search:Criteria:Title:DateTime:Between' => '%2$s <= 1$s <= %3$s', // - Enum widget 'UI:Search:Criteria:Title:Enum:In' => '%1$s: %2$s', - 'UI:Search:Criteria:Title:Enum:In:Many' => '%1$s: %2$s and %3$s others', + 'UI:Search:Criteria:Title:Enum:In:Many' => '%1$s: %2$s 和 %3$s others', 'UI:Search:Criteria:Title:Enum:In:All' => '%1$s: 任何', // - External key widget 'UI:Search:Criteria:Title:ExternalKey:Empty' => '%1$s 已定义', 'UI:Search:Criteria:Title:ExternalKey:NotEmpty' => '%1$s 未被定义', 'UI:Search:Criteria:Title:ExternalKey:Equals' => '%1$s %2$s', 'UI:Search:Criteria:Title:ExternalKey:In' => '%1$s: %2$s', - 'UI:Search:Criteria:Title:ExternalKey:In:Many' => '%1$s: %2$s and %3$s others', + 'UI:Search:Criteria:Title:ExternalKey:In:Many' => '%1$s: %2$s 和 %3$s others', 'UI:Search:Criteria:Title:ExternalKey:In:All' => '%1$s: 任何', // - Hierarchical key widget 'UI:Search:Criteria:Title:HierarchicalKey:Empty' => '%1$s 已定义', 'UI:Search:Criteria:Title:HierarchicalKey:NotEmpty' => '%1$s 未被定义', 'UI:Search:Criteria:Title:HierarchicalKey:Equals' => '%1$s %2$s', 'UI:Search:Criteria:Title:HierarchicalKey:In' => '%1$s: %2$s', - 'UI:Search:Criteria:Title:HierarchicalKey:In:Many' => '%1$s: %2$s and %3$s others', - 'UI:Search:Criteria:Title:HierarchicalKey:In:All' => '%1$s: Any', + 'UI:Search:Criteria:Title:HierarchicalKey:In:Many' => '%1$s: %2$s 和 %3$s others', + 'UI:Search:Criteria:Title:HierarchicalKey:In:All' => '%1$s: 任何', // - Criteria operators // - Default widget @@ -1484,7 +1485,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( // - Other translations 'UI:Search:Value:Filter:Placeholder' => '过滤器...', 'UI:Search:Value:Search:Placeholder' => '搜索...', - 'UI:Search:Value:Autocomplete:StartTyping' => 'Start typing for possible values.', + 'UI:Search:Value:Autocomplete:StartTyping' => '开始输入值.', 'UI:Search:Value:Autocomplete:Wait' => '请稍后...', 'UI:Search:Value:Autocomplete:NoResult' => '没有找到结果.', 'UI:Search:Value:Toggler:CheckAllNone' => '全选 / 不选', From 21549168489829dd84137e80ec2b23e7e50660b8 Mon Sep 17 00:00:00 2001 From: Pierre Goiffon Date: Tue, 11 Dec 2018 09:08:40 +0100 Subject: [PATCH 3/6] ZH translation : remove unecessary '~~' --- dictionaries/zh.dictionary.itop.ui.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/dictionaries/zh.dictionary.itop.ui.php b/dictionaries/zh.dictionary.itop.ui.php index b49778e57..cb46d896e 100644 --- a/dictionaries/zh.dictionary.itop.ui.php +++ b/dictionaries/zh.dictionary.itop.ui.php @@ -739,8 +739,8 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( 'UI:Schema:DisplaySelector/LabelAndCode' => '标记和代码', 'UI:Schema:DisplaySelector/Label' => '标记', 'UI:Schema:DisplaySelector/Code' => '代码', - 'UI:Schema:Attribute/Filter' => '过滤器~~', - 'UI:Schema:DefaultNullValue' => 'Default null : "%1$s"~~', + 'UI:Schema:Attribute/Filter' => '过滤器', + 'UI:Schema:DefaultNullValue' => 'Default null : "%1$s"', 'UI:LinksWidget:Autocomplete+' => '输入前3个字符...', 'UI:Edit:TestQuery' => '测试查询', 'UI:Combo:SelectValue' => '--- 请选择 ---', From 23ee8d6a14ca720856d2eeef54311294f05f3654 Mon Sep 17 00:00:00 2001 From: Purple Grape Date: Fri, 7 Dec 2018 20:59:18 +0800 Subject: [PATCH 4/6] Update zh.dict.itop-config-mgmt.php MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit add two empty lines against english ，small translation improvement --- .../zh.dict.itop-config-mgmt.php | 226 +++++++++--------- 1 file changed, 114 insertions(+), 112 deletions(-) diff --git a/datamodels/2.x/itop-config-mgmt/zh.dict.itop-config-mgmt.php b/datamodels/2.x/itop-config-mgmt/zh.dict.itop-config-mgmt.php index 685a6e865..58c826476 100755 --- a/datamodels/2.x/itop-config-mgmt/zh.dict.itop-config-mgmt.php +++ b/datamodels/2.x/itop-config-mgmt/zh.dict.itop-config-mgmt.php @@ -89,17 +89,17 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( 'Class:Organization/Attribute:code+' => '组织编码(Siret, DUNS,...)', 'Class:Organization/Attribute:status' => '状态', 'Class:Organization/Attribute:status+' => '', - 'Class:Organization/Attribute:status/Value:active' => '活动', - 'Class:Organization/Attribute:status/Value:active+' => '活动', - 'Class:Organization/Attribute:status/Value:inactive' => '非活动', - 'Class:Organization/Attribute:status/Value:inactive+' => '非活动', + 'Class:Organization/Attribute:status/Value:active' => '启用', + 'Class:Organization/Attribute:status/Value:active+' => '启用', + 'Class:Organization/Attribute:status/Value:inactive' => '停用', + 'Class:Organization/Attribute:status/Value:inactive+' => '停用', 'Class:Organization/Attribute:parent_id' => '父级', 'Class:Organization/Attribute:parent_id+' => '父级组织', 'Class:Organization/Attribute:parent_name' => '父级名称', 'Class:Organization/Attribute:parent_name+' => '父级组织名称', 'Class:Organization/Attribute:deliverymodel_id' => '交付模式', 'Class:Organization/Attribute:deliverymodel_id+' => '', - 'Class:Organization/Attribute:deliverymodel_name' => 'Delivery model name', + 'Class:Organization/Attribute:deliverymodel_name' => '交付模式名称', 'Class:Organization/Attribute:deliverymodel_name+' => '', 'Class:Organization/Attribute:parent_id_friendlyname' => '上级组织', 'Class:Organization/Attribute:parent_id_friendlyname+' => '上级组织', @@ -199,9 +199,9 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( 'Class:Person/Attribute:manager_name' => '名称', 'Class:Person/Attribute:manager_name+' => '', 'Class:Person/Attribute:team_list' => '团队', - 'Class:Person/Attribute:team_list+' => 'All the teams this person belongs to', + 'Class:Person/Attribute:team_list+' => '这个人归属的所有团队', 'Class:Person/Attribute:tickets_list' => '工单', - 'Class:Person/Attribute:tickets_list+' => 'All the tickets this person is the caller', + 'Class:Person/Attribute:tickets_list+' => '这个人发起的所有工单', 'Class:Person/Attribute:manager_id_friendlyname' => 'Manager friendly name', 'Class:Person/Attribute:manager_id_friendlyname+' => '', 'Class:Person/Attribute:picture' => '头像', @@ -234,19 +234,19 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( 'Class:Document/Attribute:description+' => '', 'Class:Document/Attribute:org_name' => '组织名称', 'Class:Document/Attribute:org_name+' => '', - 'Class:Document/Attribute:documenttype_id' => 'Document type', + 'Class:Document/Attribute:documenttype_id' => '文档类型', 'Class:Document/Attribute:documenttype_id+' => '', 'Class:Document/Attribute:documenttype_name' => 'Document type name', 'Class:Document/Attribute:documenttype_name+' => '', - 'Class:Document/Attribute:version' => 'Version', + 'Class:Document/Attribute:version' => '版本', 'Class:Document/Attribute:version+' => '', 'Class:Document/Attribute:description' => '描述', 'Class:Document/Attribute:description+' => '', 'Class:Document/Attribute:status' => '状态', 'Class:Document/Attribute:status+' => '', - 'Class:Document/Attribute:status/Value:draft' => '草案', + 'Class:Document/Attribute:status/Value:draft' => '草稿', 'Class:Document/Attribute:status/Value:draft+' => '', - 'Class:Document/Attribute:status/Value:obsolete' => '荒废', + 'Class:Document/Attribute:status/Value:obsolete' => '废弃', 'Class:Document/Attribute:status/Value:obsolete+' => '', 'Class:Document/Attribute:status/Value:published' => '已发布', 'Class:Document/Attribute:status/Value:published+' => '', @@ -358,8 +358,8 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( 'Class:PhysicalDevice/Attribute:status/Value:obsolete+' => '废弃', 'Class:PhysicalDevice/Attribute:status/Value:production' => '生产', 'Class:PhysicalDevice/Attribute:status/Value:production+' => '生产', - 'Class:PhysicalDevice/Attribute:status/Value:stock' => '库存', - 'Class:PhysicalDevice/Attribute:status/Value:stock+' => '库存', + 'Class:PhysicalDevice/Attribute:status/Value:stock' => '空闲', + 'Class:PhysicalDevice/Attribute:status/Value:stock+' => '空闲', 'Class:PhysicalDevice/Attribute:brand_id' => '品牌', 'Class:PhysicalDevice/Attribute:brand_id+' => '', 'Class:PhysicalDevice/Attribute:brand_name' => '品牌名称', @@ -420,7 +420,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( 'Class:MobilePhone+' => '', 'Class:MobilePhone/Attribute:imei' => 'IMEI', 'Class:MobilePhone/Attribute:imei+' => '', - 'Class:MobilePhone/Attribute:hw_pin' => '硬件PIN码', + 'Class:MobilePhone/Attribute:hw_pin' => '硬件PIN 码', 'Class:MobilePhone/Attribute:hw_pin+' => '', )); @@ -464,11 +464,11 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( 'Class:DatacenterDevice+' => '', 'Class:DatacenterDevice/Attribute:rack_id' => '机柜', 'Class:DatacenterDevice/Attribute:rack_id+' => '', - 'Class:DatacenterDevice/Attribute:rack_name' => 'Rack name', + 'Class:DatacenterDevice/Attribute:rack_name' => '机柜名称', 'Class:DatacenterDevice/Attribute:rack_name+' => '', 'Class:DatacenterDevice/Attribute:enclosure_id' => '机位', 'Class:DatacenterDevice/Attribute:enclosure_id+' => '', - 'Class:DatacenterDevice/Attribute:enclosure_name' => 'Enclosure name', + 'Class:DatacenterDevice/Attribute:enclosure_name' => '机位名称', 'Class:DatacenterDevice/Attribute:enclosure_name+' => '', 'Class:DatacenterDevice/Attribute:nb_u' => '高度', 'Class:DatacenterDevice/Attribute:nb_u+' => '', @@ -571,7 +571,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( 'Class:TapeLibrary' => '磁带库', 'Class:TapeLibrary+' => '', 'Class:TapeLibrary/Attribute:tapes_list' => '磁带', - 'Class:TapeLibrary/Attribute:tapes_list+' => 'All the tapes in the tape library', + 'Class:TapeLibrary/Attribute:tapes_list+' => '该磁带库里的所有磁带', )); // @@ -582,7 +582,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( 'Class:NAS' => 'NAS', 'Class:NAS+' => '', 'Class:NAS/Attribute:nasfilesystem_list' => '文件系统', - 'Class:NAS/Attribute:nasfilesystem_list+' => 'All the file systems in this NAS', + 'Class:NAS/Attribute:nasfilesystem_list+' => '该NAS 里的所有文件系统', )); // @@ -594,11 +594,11 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( 'Class:PC+' => '', 'Class:PC/Attribute:osfamily_id' => 'OS家族', 'Class:PC/Attribute:osfamily_id+' => '', - 'Class:PC/Attribute:osfamily_name' => 'OS family name', + 'Class:PC/Attribute:osfamily_name' => 'OS 家族名称', 'Class:PC/Attribute:osfamily_name+' => '', 'Class:PC/Attribute:osversion_id' => 'OS版本', 'Class:PC/Attribute:osversion_id+' => '', - 'Class:PC/Attribute:osversion_name' => 'OS version name', + 'Class:PC/Attribute:osversion_name' => 'OS 版本名称', 'Class:PC/Attribute:osversion_name+' => '', 'Class:PC/Attribute:cpu' => 'CPU', 'Class:PC/Attribute:cpu+' => '', @@ -607,7 +607,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( 'Class:PC/Attribute:type' => '类型', 'Class:PC/Attribute:type+' => '', 'Class:PC/Attribute:type/Value:desktop' => '桌面型', - 'Class:PC/Attribute:type/Value:desktop+' => 'desktop', + 'Class:PC/Attribute:type/Value:desktop+' => '桌面型', 'Class:PC/Attribute:type/Value:laptop' => '笔记本', 'Class:PC/Attribute:type/Value:laptop+' => '笔记本', )); @@ -638,7 +638,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( 'Class:PowerSource' => '电源', 'Class:PowerSource+' => '', 'Class:PowerSource/Attribute:pdus_list' => 'PDU', - 'Class:PowerSource/Attribute:pdus_list+' => 'All the PDUs using this power source', + 'Class:PowerSource/Attribute:pdus_list+' => '使用该电源的所有PDU', )); // @@ -650,7 +650,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( 'Class:PDU+' => '', 'Class:PDU/Attribute:rack_id' => '机柜', 'Class:PDU/Attribute:rack_id+' => '', - 'Class:PDU/Attribute:rack_name' => 'Rack name', + 'Class:PDU/Attribute:rack_name' => '机柜名称', 'Class:PDU/Attribute:rack_name+' => '', 'Class:PDU/Attribute:powerstart_id' => '上级电源', 'Class:PDU/Attribute:powerstart_id+' => '', @@ -676,12 +676,12 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( 'Class:Enclosure+' => '', 'Class:Enclosure/Attribute:rack_id' => '机柜', 'Class:Enclosure/Attribute:rack_id+' => '', - 'Class:Enclosure/Attribute:rack_name' => 'Rack name', + 'Class:Enclosure/Attribute:rack_name' => '机柜名称', 'Class:Enclosure/Attribute:rack_name+' => '', 'Class:Enclosure/Attribute:nb_u' => '高度', 'Class:Enclosure/Attribute:nb_u+' => '', 'Class:Enclosure/Attribute:device_list' => '设备', - 'Class:Enclosure/Attribute:device_list+' => 'All the devices in this enclosure', + 'Class:Enclosure/Attribute:device_list+' => '该机位的所有设备', )); // @@ -733,11 +733,11 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( 'Class:SoftwareInstance+' => '', 'Class:SoftwareInstance/Attribute:system_id' => '系统', 'Class:SoftwareInstance/Attribute:system_id+' => '', - 'Class:SoftwareInstance/Attribute:system_name' => 'System name', + 'Class:SoftwareInstance/Attribute:system_name' => '系统名称', 'Class:SoftwareInstance/Attribute:system_name+' => '', 'Class:SoftwareInstance/Attribute:software_id' => '软件', 'Class:SoftwareInstance/Attribute:software_id+' => '', - 'Class:SoftwareInstance/Attribute:software_name' => 'Software name', + 'Class:SoftwareInstance/Attribute:software_name' => '软件名称', 'Class:SoftwareInstance/Attribute:software_name+' => '', 'Class:SoftwareInstance/Attribute:softwarelicence_id' => '软件许可证', 'Class:SoftwareInstance/Attribute:softwarelicence_id+' => '', @@ -761,7 +761,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( 'Class:Middleware' => '中间件', 'Class:Middleware+' => '', 'Class:Middleware/Attribute:middlewareinstance_list' => '中间件实例', - 'Class:Middleware/Attribute:middlewareinstance_list+' => 'All the middleware instances provided by this middleware', + 'Class:Middleware/Attribute:middlewareinstance_list+' => '该中间件的所有实例', )); // @@ -772,7 +772,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( 'Class:DBServer' => '数据库服务器', 'Class:DBServer+' => '', 'Class:DBServer/Attribute:dbschema_list' => '数据库', - 'Class:DBServer/Attribute:dbschema_list+' => 'All the database schemas for this DB server', + 'Class:DBServer/Attribute:dbschema_list+' => '该数据库服务器上的所有数据库架构', )); // @@ -783,7 +783,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( 'Class:WebServer' => 'Web 服务器', 'Class:WebServer+' => '', 'Class:WebServer/Attribute:webapp_list' => 'Web 应用', - 'Class:WebServer/Attribute:webapp_list+' => 'All the web applications available on this web server', + 'Class:WebServer/Attribute:webapp_list+' => '该web 服务器上的所有web 应用', )); // @@ -965,9 +965,9 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( 'Class:LogicalVolume/Attribute:storagesystem_name' => '名称', 'Class:LogicalVolume/Attribute:storagesystem_name+' => '', 'Class:LogicalVolume/Attribute:servers_list' => '服务器', - 'Class:LogicalVolume/Attribute:servers_list+' => 'All the servers using this volume', + 'Class:LogicalVolume/Attribute:servers_list+' => '使用该逻辑卷的服务器', 'Class:LogicalVolume/Attribute:virtualdevices_list' => '虚拟设备', - 'Class:LogicalVolume/Attribute:virtualdevices_list+' => 'All the virtual devices using this volume', + 'Class:LogicalVolume/Attribute:virtualdevices_list+' => '使用该逻辑卷的所有虚拟设备', )); // @@ -979,11 +979,11 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( 'Class:lnkServerToVolume+' => '', 'Class:lnkServerToVolume/Attribute:volume_id' => '逻辑卷', 'Class:lnkServerToVolume/Attribute:volume_id+' => '', - 'Class:lnkServerToVolume/Attribute:volume_name' => 'Volume name', + 'Class:lnkServerToVolume/Attribute:volume_name' => '逻辑卷名称', 'Class:lnkServerToVolume/Attribute:volume_name+' => '', 'Class:lnkServerToVolume/Attribute:server_id' => '服务器', 'Class:lnkServerToVolume/Attribute:server_id+' => '', - 'Class:lnkServerToVolume/Attribute:server_name' => 'Server name', + 'Class:lnkServerToVolume/Attribute:server_name' => '服务器名称', 'Class:lnkServerToVolume/Attribute:server_name+' => '', 'Class:lnkServerToVolume/Attribute:size_used' => '已用容量', 'Class:lnkServerToVolume/Attribute:size_used+' => '', @@ -1065,7 +1065,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( 'Class:NASFileSystem/Attribute:size+' => '', 'Class:NASFileSystem/Attribute:nas_id' => 'NAS', 'Class:NASFileSystem/Attribute:nas_id+' => '', - 'Class:NASFileSystem/Attribute:nas_name' => 'NAS name', + 'Class:NASFileSystem/Attribute:nas_name' => 'NAS 名称', 'Class:NASFileSystem/Attribute:nas_name+' => '', )); @@ -1083,7 +1083,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( 'Class:Software/Attribute:version' => '版本', 'Class:Software/Attribute:version+' => '', 'Class:Software/Attribute:documents_list' => '文档', - 'Class:Software/Attribute:documents_list+' => 'All the documents linked to this software', + 'Class:Software/Attribute:documents_list+' => '该软件的所有文档', 'Class:Software/Attribute:type' => '类型', 'Class:Software/Attribute:type+' => '', 'Class:Software/Attribute:type/Value:DBServer' => '数据库服务器', @@ -1091,17 +1091,17 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( 'Class:Software/Attribute:type/Value:Middleware' => '中间件', 'Class:Software/Attribute:type/Value:Middleware+' => 'Middleware', 'Class:Software/Attribute:type/Value:OtherSoftware' => '其它软件', - 'Class:Software/Attribute:type/Value:OtherSoftware+' => 'Other Software', + 'Class:Software/Attribute:type/Value:OtherSoftware+' => '其它软件', 'Class:Software/Attribute:type/Value:PCSoftware' => 'PC 软件', - 'Class:Software/Attribute:type/Value:PCSoftware+' => 'PC Software', + 'Class:Software/Attribute:type/Value:PCSoftware+' => 'PC 软件', 'Class:Software/Attribute:type/Value:WebServer' => 'Web 服务器', - 'Class:Software/Attribute:type/Value:WebServer+' => 'Web Server', + 'Class:Software/Attribute:type/Value:WebServer+' => 'Web 服务器', 'Class:Software/Attribute:softwareinstance_list' => '软件实例', - 'Class:Software/Attribute:softwareinstance_list+' => 'All the software instances for this software', + 'Class:Software/Attribute:softwareinstance_list+' => '该软件的所有实例', 'Class:Software/Attribute:softwarepatch_list' => '软件补丁', - 'Class:Software/Attribute:softwarepatch_list+' => 'All the patchs for this software', + 'Class:Software/Attribute:softwarepatch_list+' => '该软件的所有补丁', 'Class:Software/Attribute:softwarelicence_list' => '软件许可证', - 'Class:Software/Attribute:softwarelicence_list+' => 'All the licences for this software', + 'Class:Software/Attribute:softwarelicence_list+' => '该软件的所有许可证', )); // @@ -1114,7 +1114,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( 'Class:Patch/Attribute:name' => '名称', 'Class:Patch/Attribute:name+' => '', 'Class:Patch/Attribute:documents_list' => '文档', - 'Class:Patch/Attribute:documents_list+' => 'All the documents linked to this patch', + 'Class:Patch/Attribute:documents_list+' => '该补丁关联的所有文档', 'Class:Patch/Attribute:description' => '描述', 'Class:Patch/Attribute:description+' => '', 'Class:Patch/Attribute:finalclass' => 'Patch sub-class', @@ -1129,7 +1129,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( 'Class:OSPatch' => 'OS 补丁', 'Class:OSPatch+' => '', 'Class:OSPatch/Attribute:functionalcis_list' => '设备', - 'Class:OSPatch/Attribute:functionalcis_list+' => 'All the systems where this patch is installed', + 'Class:OSPatch/Attribute:functionalcis_list+' => '已安装该补丁的所有系统', 'Class:OSPatch/Attribute:osversion_id' => 'OS 版本', 'Class:OSPatch/Attribute:osversion_id+' => '', 'Class:OSPatch/Attribute:osversion_name' => '名称', @@ -1148,7 +1148,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( 'Class:SoftwarePatch/Attribute:software_name' => '名称', 'Class:SoftwarePatch/Attribute:software_name+' => '', 'Class:SoftwarePatch/Attribute:softwareinstances_list' => '软件实例', - 'Class:SoftwarePatch/Attribute:softwareinstances_list+' => 'All the systems where this software patch is installed', + 'Class:SoftwarePatch/Attribute:softwareinstances_list+' => '已安装该软件补丁的所有系统', )); // @@ -1161,11 +1161,11 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( 'Class:Licence/Attribute:name' => '名称', 'Class:Licence/Attribute:name+' => '', 'Class:Licence/Attribute:documents_list' => '文档', - 'Class:Licence/Attribute:documents_list+' => 'All the documents linked to this licence', + 'Class:Licence/Attribute:documents_list+' => '该许可证关联的所有文档', 'Class:Licence/Attribute:org_id' => '组织', 'Class:Licence/Attribute:org_id+' => '', - 'Class:Licence/Attribute:organization_name' => 'Organization name', - 'Class:Licence/Attribute:organization_name+' => 'Common name', + 'Class:Licence/Attribute:organization_name' => '组织名称', + 'Class:Licence/Attribute:organization_name+' => '通用名称', 'Class:Licence/Attribute:usage_limit' => '使用限制', 'Class:Licence/Attribute:usage_limit+' => '', 'Class:Licence/Attribute:description' => '描述', @@ -1198,9 +1198,9 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( 'Class:OSLicence/Attribute:osversion_name' => '名称', 'Class:OSLicence/Attribute:osversion_name+' => '', 'Class:OSLicence/Attribute:virtualmachines_list' => '虚拟机', - 'Class:OSLicence/Attribute:virtualmachines_list+' => 'All the virtual machines where this licence is used', + 'Class:OSLicence/Attribute:virtualmachines_list+' => '使用该许可证的所有虚拟机', 'Class:OSLicence/Attribute:servers_list' => '服务器', - 'Class:OSLicence/Attribute:servers_list+' => 'All the servers where this licence is used', + 'Class:OSLicence/Attribute:servers_list+' => '使用该许可证的所有服务器', )); // @@ -1215,7 +1215,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( 'Class:SoftwareLicence/Attribute:software_name' => '名称', 'Class:SoftwareLicence/Attribute:software_name+' => '', 'Class:SoftwareLicence/Attribute:softwareinstance_list' => '软件实例', - 'Class:SoftwareLicence/Attribute:softwareinstance_list+' => 'All the systems where this licence is used', + 'Class:SoftwareLicence/Attribute:softwareinstance_list+' => '使用该许可证的所有系统', )); // @@ -1231,7 +1231,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( 'Class:lnkDocumentToLicence/Attribute:licence_name+' => '', 'Class:lnkDocumentToLicence/Attribute:document_id' => '文档', 'Class:lnkDocumentToLicence/Attribute:document_id+' => '', - 'Class:lnkDocumentToLicence/Attribute:document_name' => 'Document name', + 'Class:lnkDocumentToLicence/Attribute:document_name' => '文档名称', 'Class:lnkDocumentToLicence/Attribute:document_name+' => '', )); @@ -1296,7 +1296,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( 'Class:Brand' => '品牌', 'Class:Brand+' => '', 'Class:Brand/Attribute:physicaldevices_list' => '物理设备', - 'Class:Brand/Attribute:physicaldevices_list+' => 'All the physical devices corresponding to this brand', + 'Class:Brand/Attribute:physicaldevices_list+' => '该品牌的所有物理设备', )); // @@ -1319,7 +1319,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( 'Class:Model/Attribute:type/Value:Enclosure' => '机位', 'Class:Model/Attribute:type/Value:Enclosure+' => '机位', 'Class:Model/Attribute:type/Value:IPPhone' => 'IP 电话', - 'Class:Model/Attribute:type/Value:IPPhone+' => 'IP Phone', + 'Class:Model/Attribute:type/Value:IPPhone+' => 'IP 电话', 'Class:Model/Attribute:type/Value:MobilePhone' => '移动电话', 'Class:Model/Attribute:type/Value:MobilePhone+' => '移动电话', 'Class:Model/Attribute:type/Value:NAS' => 'NAS', @@ -1349,7 +1349,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( 'Class:Model/Attribute:type/Value:Phone' => '电话', 'Class:Model/Attribute:type/Value:Phone+' => '电话', 'Class:Model/Attribute:physicaldevices_list' => '物理设备', - 'Class:Model/Attribute:physicaldevices_list+' => 'All the physical devices corresponding to this model', + 'Class:Model/Attribute:physicaldevices_list+' => '该型号的所有物理设备', )); // @@ -1360,7 +1360,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( 'Class:NetworkDeviceType' => '网络设备类型', 'Class:NetworkDeviceType+' => '', 'Class:NetworkDeviceType/Attribute:networkdevicesdevices_list' => '网络设备', - 'Class:NetworkDeviceType/Attribute:networkdevicesdevices_list+' => 'All the network devices corresponding to this type', + 'Class:NetworkDeviceType/Attribute:networkdevicesdevices_list+' => '该类型的所有网络设备', )); // @@ -1385,11 +1385,11 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( 'Class:lnkDocumentToPatch+' => '', 'Class:lnkDocumentToPatch/Attribute:patch_id' => '补丁', 'Class:lnkDocumentToPatch/Attribute:patch_id+' => '', - 'Class:lnkDocumentToPatch/Attribute:patch_name' => 'Patch name', + 'Class:lnkDocumentToPatch/Attribute:patch_name' => '补丁名称', 'Class:lnkDocumentToPatch/Attribute:patch_name+' => '', 'Class:lnkDocumentToPatch/Attribute:document_id' => '文档', 'Class:lnkDocumentToPatch/Attribute:document_id+' => '', - 'Class:lnkDocumentToPatch/Attribute:document_name' => 'Document name', + 'Class:lnkDocumentToPatch/Attribute:document_name' => '文档名称', 'Class:lnkDocumentToPatch/Attribute:document_name+' => '', )); @@ -1400,13 +1400,13 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( Dict::Add('ZH CN', 'Chinese', '简体中文', array( 'Class:lnkSoftwareInstanceToSoftwarePatch' => '链接 软件实例 / 软件补丁', 'Class:lnkSoftwareInstanceToSoftwarePatch+' => '', - 'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_id' => 'Software patch', + 'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_id' => '软件补丁', 'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_id+' => '', - 'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_name' => 'Software patch name', + 'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_name' => '软件补丁名称', 'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwarepatch_name+' => '', - 'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwareinstance_id' => 'Software instance', + 'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwareinstance_id' => '软件实例', 'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwareinstance_id+' => '', - 'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwareinstance_name' => 'Software instance name', + 'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwareinstance_name' => '软件实例名称', 'Class:lnkSoftwareInstanceToSoftwarePatch/Attribute:softwareinstance_name+' => '', )); @@ -1417,13 +1417,13 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( Dict::Add('ZH CN', 'Chinese', '简体中文', array( 'Class:lnkFunctionalCIToOSPatch' => '链接 功能项 / OS 补丁', 'Class:lnkFunctionalCIToOSPatch+' => '', - 'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_id' => 'OS patch', + 'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_id' => 'OS 补丁', 'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_id+' => '', - 'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_name' => 'OS patch name', + 'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_name' => 'OS 补丁名称', 'Class:lnkFunctionalCIToOSPatch/Attribute:ospatch_name+' => '', 'Class:lnkFunctionalCIToOSPatch/Attribute:functionalci_id' => '功能项', 'Class:lnkFunctionalCIToOSPatch/Attribute:functionalci_id+' => '', - 'Class:lnkFunctionalCIToOSPatch/Attribute:functionalci_name' => 'Functionalci name', + 'Class:lnkFunctionalCIToOSPatch/Attribute:functionalci_name' => '功能项名称', 'Class:lnkFunctionalCIToOSPatch/Attribute:functionalci_name+' => '', )); @@ -1436,11 +1436,11 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( 'Class:lnkDocumentToSoftware+' => '', 'Class:lnkDocumentToSoftware/Attribute:software_id' => '软件', 'Class:lnkDocumentToSoftware/Attribute:software_id+' => '', - 'Class:lnkDocumentToSoftware/Attribute:software_name' => 'Software name', + 'Class:lnkDocumentToSoftware/Attribute:software_name' => '软件名称', 'Class:lnkDocumentToSoftware/Attribute:software_name+' => '', 'Class:lnkDocumentToSoftware/Attribute:document_id' => '文档', 'Class:lnkDocumentToSoftware/Attribute:document_id+' => '', - 'Class:lnkDocumentToSoftware/Attribute:document_name' => 'Document name', + 'Class:lnkDocumentToSoftware/Attribute:document_name' => '文档名称', 'Class:lnkDocumentToSoftware/Attribute:document_name+' => '', )); @@ -1449,15 +1449,15 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( // Dict::Add('ZH CN', 'Chinese', '简体中文', array( - 'Class:lnkContactToFunctionalCI' => '链接 Contact / FunctionalCI', + 'Class:lnkContactToFunctionalCI' => '链接 联系人 / 功能项', 'Class:lnkContactToFunctionalCI+' => '', - 'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => 'Functionalci', + 'Class:lnkContactToFunctionalCI/Attribute:functionalci_id' => '功能项', 'Class:lnkContactToFunctionalCI/Attribute:functionalci_id+' => '', - 'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => 'Functionalci name', + 'Class:lnkContactToFunctionalCI/Attribute:functionalci_name' => '功能项名称', 'Class:lnkContactToFunctionalCI/Attribute:functionalci_name+' => '', - 'Class:lnkContactToFunctionalCI/Attribute:contact_id' => 'Contact', + 'Class:lnkContactToFunctionalCI/Attribute:contact_id' => '联系人', 'Class:lnkContactToFunctionalCI/Attribute:contact_id+' => '', - 'Class:lnkContactToFunctionalCI/Attribute:contact_name' => 'Contact name', + 'Class:lnkContactToFunctionalCI/Attribute:contact_name' => '联系人名称', 'Class:lnkContactToFunctionalCI/Attribute:contact_name+' => '', )); @@ -1468,13 +1468,13 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( Dict::Add('ZH CN', 'Chinese', '简体中文', array( 'Class:lnkDocumentToFunctionalCI' => '链接 文档 / 功能项', 'Class:lnkDocumentToFunctionalCI+' => '', - 'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_id' => 'Functionalci', + 'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_id' => '功能项', 'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_id+' => '', - 'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_name' => 'Functionalci name', + 'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_name' => '功能项名称', 'Class:lnkDocumentToFunctionalCI/Attribute:functionalci_name+' => '', 'Class:lnkDocumentToFunctionalCI/Attribute:document_id' => '文档', 'Class:lnkDocumentToFunctionalCI/Attribute:document_id+' => '', - 'Class:lnkDocumentToFunctionalCI/Attribute:document_name' => 'Document name', + 'Class:lnkDocumentToFunctionalCI/Attribute:document_name' => '文档名称', 'Class:lnkDocumentToFunctionalCI/Attribute:document_name+' => '', )); @@ -1497,7 +1497,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( 'Class:Subnet/Attribute:ip+' => '', 'Class:Subnet/Attribute:ip_mask' => 'IP 掩码', 'Class:Subnet/Attribute:ip_mask+' => '', - 'Class:Subnet/Attribute:vlans_list' => 'VLANs', + 'Class:Subnet/Attribute:vlans_list' => 'VLAN', 'Class:Subnet/Attribute:vlans_list+' => '', )); @@ -1508,14 +1508,14 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( Dict::Add('ZH CN', 'Chinese', '简体中文', array( 'Class:VLAN' => 'VLAN', 'Class:VLAN+' => '', - 'Class:VLAN/Attribute:vlan_tag' => 'VLAN Tag', + 'Class:VLAN/Attribute:vlan_tag' => 'VLAN 标记', 'Class:VLAN/Attribute:vlan_tag+' => '', 'Class:VLAN/Attribute:description' => '描述', 'Class:VLAN/Attribute:description+' => '', 'Class:VLAN/Attribute:org_id' => '组织', 'Class:VLAN/Attribute:org_id+' => '', - 'Class:VLAN/Attribute:org_name' => 'Organization name', - 'Class:VLAN/Attribute:org_name+' => 'Common name', + 'Class:VLAN/Attribute:org_name' => '组织名称', + 'Class:VLAN/Attribute:org_name+' => '通用名称', 'Class:VLAN/Attribute:subnets_list' => '子网', 'Class:VLAN/Attribute:subnets_list+' => '', 'Class:VLAN/Attribute:physicalinterfaces_list' => '物理网卡', @@ -1531,13 +1531,13 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( 'Class:lnkSubnetToVLAN+' => '', 'Class:lnkSubnetToVLAN/Attribute:subnet_id' => '子网', 'Class:lnkSubnetToVLAN/Attribute:subnet_id+' => '', - 'Class:lnkSubnetToVLAN/Attribute:subnet_ip' => 'Subnet IP', + 'Class:lnkSubnetToVLAN/Attribute:subnet_ip' => '子网IP', 'Class:lnkSubnetToVLAN/Attribute:subnet_ip+' => '', - 'Class:lnkSubnetToVLAN/Attribute:subnet_name' => 'Subnet name', + 'Class:lnkSubnetToVLAN/Attribute:subnet_name' => '子网名称', 'Class:lnkSubnetToVLAN/Attribute:subnet_name+' => '', 'Class:lnkSubnetToVLAN/Attribute:vlan_id' => 'VLAN', 'Class:lnkSubnetToVLAN/Attribute:vlan_id+' => '', - 'Class:lnkSubnetToVLAN/Attribute:vlan_tag' => 'VLAN Tag', + 'Class:lnkSubnetToVLAN/Attribute:vlan_tag' => 'VLAN 标记', 'Class:lnkSubnetToVLAN/Attribute:vlan_tag+' => '', )); @@ -1561,9 +1561,11 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( Dict::Add('ZH CN', 'Chinese', '简体中文', array( 'Class:IPInterface' => 'IP Interface', 'Class:IPInterface+' => '', - 'Class:IPInterface/Attribute:ipaddress' => 'IP地址', + 'Class:IPInterface/Attribute:ipaddress' => 'IP 地址', 'Class:IPInterface/Attribute:ipaddress+' => '', - 'Class:IPInterface/Attribute:macaddress' => 'MAC地址', + + + 'Class:IPInterface/Attribute:macaddress' => 'MAC 地址', 'Class:IPInterface/Attribute:macaddress+' => '', 'Class:IPInterface/Attribute:comment' => '注释', 'Class:IPInterface/Attribute:coment+' => '', @@ -1599,15 +1601,15 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( 'Class:lnkPhysicalInterfaceToVLAN+' => '', 'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_id' => '物理网卡', 'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_id+' => '', - 'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_name' => 'Physical Interface Name', + 'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_name' => '物理网卡名称', 'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_name+' => '', 'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_device_id' => '设备', 'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_device_id+' => '', - 'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_device_name' => 'Device name', + 'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_device_name' => '设备名称', 'Class:lnkPhysicalInterfaceToVLAN/Attribute:physicalinterface_device_name+' => '', 'Class:lnkPhysicalInterfaceToVLAN/Attribute:vlan_id' => 'VLAN', 'Class:lnkPhysicalInterfaceToVLAN/Attribute:vlan_id+' => '', - 'Class:lnkPhysicalInterfaceToVLAN/Attribute:vlan_tag' => 'VLAN Tag', + 'Class:lnkPhysicalInterfaceToVLAN/Attribute:vlan_tag' => 'VLAN 标记', 'Class:lnkPhysicalInterfaceToVLAN/Attribute:vlan_tag+' => '', )); @@ -1621,7 +1623,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( 'Class:LogicalInterface+' => '', 'Class:LogicalInterface/Attribute:virtualmachine_id' => '虚拟机', 'Class:LogicalInterface/Attribute:virtualmachine_id+' => '', - 'Class:LogicalInterface/Attribute:virtualmachine_name' => 'Virtual machine name', + 'Class:LogicalInterface/Attribute:virtualmachine_name' => '虚拟机名称', 'Class:LogicalInterface/Attribute:virtualmachine_name+' => '', )); @@ -1630,7 +1632,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( // Dict::Add('ZH CN', 'Chinese', '简体中文', array( - 'Class:FiberChannelInterface' => 'Fiber Channel Interface', + 'Class:FiberChannelInterface' => '光纤通道接口', 'Class:FiberChannelInterface+' => '', 'Class:FiberChannelInterface/Attribute:speed' => '速率', 'Class:FiberChannelInterface/Attribute:speed+' => '', @@ -1640,7 +1642,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( 'Class:FiberChannelInterface/Attribute:wwn+' => '', 'Class:FiberChannelInterface/Attribute:datacenterdevice_id' => '设备', 'Class:FiberChannelInterface/Attribute:datacenterdevice_id+' => '', - 'Class:FiberChannelInterface/Attribute:datacenterdevice_name' => 'Device name', + 'Class:FiberChannelInterface/Attribute:datacenterdevice_name' => '设备名称', 'Class:FiberChannelInterface/Attribute:datacenterdevice_name+' => '', )); @@ -1653,11 +1655,11 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( 'Class:lnkConnectableCIToNetworkDevice+' => '', 'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_id' => '网络设备', 'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_id+' => '', - 'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_name' => 'Network device name', + 'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_name' => '网络设备名称', 'Class:lnkConnectableCIToNetworkDevice/Attribute:networkdevice_name+' => '', - 'Class:lnkConnectableCIToNetworkDevice/Attribute:connectableci_id' => '连接的设备', + 'Class:lnkConnectableCIToNetworkDevice/Attribute:connectableci_id' => '可连接的设备', 'Class:lnkConnectableCIToNetworkDevice/Attribute:connectableci_id+' => '', - 'Class:lnkConnectableCIToNetworkDevice/Attribute:connectableci_name' => 'Connected device name', + 'Class:lnkConnectableCIToNetworkDevice/Attribute:connectableci_name' => '已连接的设备', 'Class:lnkConnectableCIToNetworkDevice/Attribute:connectableci_name+' => '', 'Class:lnkConnectableCIToNetworkDevice/Attribute:network_port' => '网络端口', 'Class:lnkConnectableCIToNetworkDevice/Attribute:network_port+' => '', @@ -1678,13 +1680,13 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( Dict::Add('ZH CN', 'Chinese', '简体中文', array( 'Class:lnkApplicationSolutionToFunctionalCI' => '链接 应用方案 / 功能项', 'Class:lnkApplicationSolutionToFunctionalCI+' => '', - 'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_id' => 'Application solution', + 'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_id' => '应用方案', 'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_id+' => '', - 'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_name' => 'Application solution name', + 'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_name' => '应用方案名称', 'Class:lnkApplicationSolutionToFunctionalCI/Attribute:applicationsolution_name+' => '', - 'Class:lnkApplicationSolutionToFunctionalCI/Attribute:functionalci_id' => 'Functionalci', + 'Class:lnkApplicationSolutionToFunctionalCI/Attribute:functionalci_id' => '功能项', 'Class:lnkApplicationSolutionToFunctionalCI/Attribute:functionalci_id+' => '', - 'Class:lnkApplicationSolutionToFunctionalCI/Attribute:functionalci_name' => 'Functionalci name', + 'Class:lnkApplicationSolutionToFunctionalCI/Attribute:functionalci_name' => '功能项名称', 'Class:lnkApplicationSolutionToFunctionalCI/Attribute:functionalci_name+' => '', )); @@ -1697,11 +1699,11 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( 'Class:lnkApplicationSolutionToBusinessProcess+' => '', 'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_id' => '业务流程', 'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_id+' => '', - 'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_name' => 'Business process name', + 'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_name' => '业务流程名称', 'Class:lnkApplicationSolutionToBusinessProcess/Attribute:businessprocess_name+' => '', 'Class:lnkApplicationSolutionToBusinessProcess/Attribute:applicationsolution_id' => '应用方案', 'Class:lnkApplicationSolutionToBusinessProcess/Attribute:applicationsolution_id+' => '', - 'Class:lnkApplicationSolutionToBusinessProcess/Attribute:applicationsolution_name' => 'Application solution name', + 'Class:lnkApplicationSolutionToBusinessProcess/Attribute:applicationsolution_name' => '应用方案名称', 'Class:lnkApplicationSolutionToBusinessProcess/Attribute:applicationsolution_name+' => '', )); @@ -1710,19 +1712,19 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( // Dict::Add('ZH CN', 'Chinese', '简体中文', array( - 'Class:lnkPersonToTeam' => '链接 个人 / 团队', + 'Class:lnkPersonToTeam' => '链接 个体 / 团队', 'Class:lnkPersonToTeam+' => '', 'Class:lnkPersonToTeam/Attribute:team_id' => '团队', 'Class:lnkPersonToTeam/Attribute:team_id+' => '', - 'Class:lnkPersonToTeam/Attribute:team_name' => 'Team name', + 'Class:lnkPersonToTeam/Attribute:team_name' => '团队名称', 'Class:lnkPersonToTeam/Attribute:team_name+' => '', - 'Class:lnkPersonToTeam/Attribute:person_id' => '个人', + 'Class:lnkPersonToTeam/Attribute:person_id' => '个体', 'Class:lnkPersonToTeam/Attribute:person_id+' => '', - 'Class:lnkPersonToTeam/Attribute:person_name' => 'Person name', + 'Class:lnkPersonToTeam/Attribute:person_name' => '姓名', 'Class:lnkPersonToTeam/Attribute:person_name+' => '', 'Class:lnkPersonToTeam/Attribute:role_id' => '角色', 'Class:lnkPersonToTeam/Attribute:role_id+' => '', - 'Class:lnkPersonToTeam/Attribute:role_name' => 'Role name', + 'Class:lnkPersonToTeam/Attribute:role_name' => '角色名称', 'Class:lnkPersonToTeam/Attribute:role_name+' => '', )); @@ -1746,7 +1748,7 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( 'Class:Group/Attribute:org_id' => '组织', 'Class:Group/Attribute:org_id+' => '', 'Class:Group/Attribute:owner_name' => '名称', - 'Class:Group/Attribute:owner_name+' => 'Common name', + 'Class:Group/Attribute:owner_name+' => '通用名称', 'Class:Group/Attribute:description' => '描述', 'Class:Group/Attribute:description+' => '', 'Class:Group/Attribute:type' => '类型', @@ -1769,13 +1771,13 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( Dict::Add('ZH CN', 'Chinese', '简体中文', array( 'Class:lnkGroupToCI' => '链接 配置组 / 配置项', 'Class:lnkGroupToCI+' => '', - 'Class:lnkGroupToCI/Attribute:group_id' => 'Group', + 'Class:lnkGroupToCI/Attribute:group_id' => '组', 'Class:lnkGroupToCI/Attribute:group_id+' => '', 'Class:lnkGroupToCI/Attribute:group_name' => '名称', 'Class:lnkGroupToCI/Attribute:group_name+' => '', 'Class:lnkGroupToCI/Attribute:ci_id' => '配置项', 'Class:lnkGroupToCI/Attribute:ci_id+' => '', - 'Class:lnkGroupToCI/Attribute:ci_name' => 'Name', + 'Class:lnkGroupToCI/Attribute:ci_name' => '名称', 'Class:lnkGroupToCI/Attribute:ci_name+' => '', 'Class:lnkGroupToCI/Attribute:reason' => '原因', 'Class:lnkGroupToCI/Attribute:reason+' => '', @@ -1796,21 +1798,21 @@ Dict::Add('ZH CN', 'Chinese', '简体中文', array( 'Menu:CSVImport' => 'CSV 导入', 'Menu:CSVImport+' => '批量创建或更新', 'Menu:Organization' => '组织', -'Menu:Organization+' => 'All organizations', +'Menu:Organization+' => '所有组织', 'Menu:Application' => '应用', 'Menu:Application+' => '所有应用', 'Menu:DBServer' => '数据库服务器', -'Menu:DBServer+' => 'Database servers', +'Menu:DBServer+' => '数据库服务器', 'Menu:Audit' => '审计', 'Menu:ConfigManagement' => '配置管理', 'Menu:ConfigManagement+' => '配置管理', 'Menu:ConfigManagementOverview' => '概览', 'Menu:ConfigManagementOverview+' => '概览', 'Menu:Contact' => '联系人', -'Menu:Contact+' => 'Contacts', +'Menu:Contact+' => '联系人', 'Menu:Contact:Count' => '%1$d 个联系人', -'Menu:Person' => '个人', -'Menu:Person+' => '所有个人', +'Menu:Person' => '个体', +'Menu:Person+' => '所有个体', 'Menu:Team' => '团队', 'Menu:Team+' => '所有团队', 'Menu:Document' => '文档', From b38d33d7a685903f39e8bdfe70c7dc1466e40c11 Mon Sep 17 00:00:00 2001 From: Eric Date: Tue, 11 Dec 2018 16:22:44 +0100 Subject: [PATCH 5/6] =?UTF-8?q?:zap:=20N=C2=B01420=20-=20Perf=20autocomple?= =?UTF-8?q?te=20(remove=20almost=20duplicated=20requests)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/ui.extkeywidget.class.inc.php | 39 ++++------------------- 1 file changed, 6 insertions(+), 33 deletions(-) diff --git a/application/ui.extkeywidget.class.inc.php b/application/ui.extkeywidget.class.inc.php index 780ed999c..bb625f8e1 100644 --- a/application/ui.extkeywidget.class.inc.php +++ b/application/ui.extkeywidget.class.inc.php @@ -434,41 +434,14 @@ EOF $oValuesSet->SetLimit($iMax); $oValuesSet->SetSort(false); $oValuesSet->SetModifierProperty('UserRightsGetSelectFilter', 'bSearchMode', $this->bSearchMode); - - if (empty($sOperation) || 'equals_start_with' == $sOperation) - { - $aValues = $oValuesSet->GetValues(array('this' => $oObj, 'current_extkey_id' => $iCurrentExtKeyId), $sContains, 'equals'); - asort($aValues); - - $iMax -= count($aValues); - if ($iMax > 0 ) { - $oValuesSet->SetLimit($iMax); - $aValuesStartWith = $oValuesSet->GetValues(array('this' => $oObj, 'current_extkey_id' => $iCurrentExtKeyId), $sContains, 'start_with'); - asort($aValuesStartWith); - foreach ($aValuesStartWith as $sKey => $sFriendlyName) { - if (!isset($aValues[$sKey])) { - $aValues[$sKey] = $sFriendlyName; - } - } - } - } - else - { - $aValues = array(); - } - - $iMax -= count($aValues); - if ($iMax > 0 && (empty($sOperation) || 'contains' == $sOperation)) + $oValuesSet->SetLimit($iMax); + $aValuesContains = $oValuesSet->GetValues(array('this' => $oObj, 'current_extkey_id' => $iCurrentExtKeyId), $sContains, 'contains'); + asort($aValuesContains); + foreach($aValuesContains as $sKey => $sFriendlyName) { - $oValuesSet->SetLimit($iMax); - $aValuesContains = $oValuesSet->GetValues(array('this' => $oObj, 'current_extkey_id' => $iCurrentExtKeyId), $sContains, 'contains'); - asort($aValuesContains); - foreach($aValuesContains as $sKey => $sFriendlyName) + if (!isset($aValues[$sKey])) { - if (!isset($aValues[$sKey])) - { - $aValues[$sKey] = $sFriendlyName; - } + $aValues[$sKey] = $sFriendlyName; } } From 8400eb910f6db6da049a8a270ac56dae775f5de1 Mon Sep 17 00:00:00 2001 From: Eric Date: Tue, 11 Dec 2018 16:35:31 +0100 Subject: [PATCH 6/6] =?UTF-8?q?:zap:=20N=C2=B01420=20-=20Perf=20autocomple?= =?UTF-8?q?te=20(remove=20almost=20duplicated=20requests)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- application/ui.extkeywidget.class.inc.php | 1 + 1 file changed, 1 insertion(+) diff --git a/application/ui.extkeywidget.class.inc.php b/application/ui.extkeywidget.class.inc.php index bb625f8e1..cafac59bc 100644 --- a/application/ui.extkeywidget.class.inc.php +++ b/application/ui.extkeywidget.class.inc.php @@ -437,6 +437,7 @@ EOF $oValuesSet->SetLimit($iMax); $aValuesContains = $oValuesSet->GetValues(array('this' => $oObj, 'current_extkey_id' => $iCurrentExtKeyId), $sContains, 'contains'); asort($aValuesContains); + $aValues = array(); foreach($aValuesContains as $sKey => $sFriendlyName) { if (!isset($aValues[$sKey]))