Skip to content
代码片段 群组 项目
未验证 提交 1cac9fdd 编辑于 作者: David Pisek's avatar David Pisek 提交者: GitLab
浏览文件

Merge branch '508096-update-text-in-dep-list' into 'master'

No related branches found
No related tags found
无相关合并请求
...@@ -100,17 +100,9 @@ export default { ...@@ -100,17 +100,9 @@ export default {
<gl-popover <gl-popover
:target="() => $refs.moreLink.$el" :target="() => $refs.moreLink.$el"
placement="top" placement="top"
:title="s__('Dependencies|Dependency path')" :title="s__('Dependencies|Direct dependents')"
> >
<dependency-path-viewer :dependencies="ancestors" /> <dependency-path-viewer :dependencies="ancestors" />
<!-- footer -->
<div class="gl-mt-4">
<gl-icon class="!gl-align-middle" name="information" :size="12" variant="info" />
<span class="gl-align-middle gl-text-subtle">
{{ s__('Dependencies|There may be multiple paths') }}
</span>
</div>
</gl-popover> </gl-popover>
</span> </span>
</gl-intersperse> </gl-intersperse>
......
...@@ -13,9 +13,9 @@ export const DEPENDENCIES_TABLE_I18N = { ...@@ -13,9 +13,9 @@ export const DEPENDENCIES_TABLE_I18N = {
projects: s__('Dependencies|Projects'), projects: s__('Dependencies|Projects'),
vulnerabilities: s__('Dependencies|Vulnerabilities'), vulnerabilities: s__('Dependencies|Vulnerabilities'),
tooltipText: s__( tooltipText: s__(
'Dependencies|The component dependency path is based on the lock file. There may be several paths. In these cases, the longest path is displayed.', 'Dependencies|The location includes the lock file. For transitive dependencies a list of its direct dependents is shown.',
), ),
tooltipMoreText: s__('Dependencies|Learn more about dependency paths'), tooltipMoreText: s__('Dependencies|Learn more about direct dependents'),
locationDependencyTitle: s__('Dependencies|Location and dependency path'), locationDependencyTitle: s__('Dependencies|List of direct dependents'),
toggleVulnerabilityList: s__('Dependencies|Toggle vulnerability list'), toggleVulnerabilityList: s__('Dependencies|Toggle vulnerability list'),
}; };
...@@ -56,7 +56,7 @@ describe('Dependency Location component', () => { ...@@ -56,7 +56,7 @@ describe('Dependency Location component', () => {
it('should have the complete path', () => { it('should have the complete path', () => {
expect(trimText(findPopover().text())).toBe( expect(trimText(findPopover().text())).toBe(
'swell 1.2 / emmajsq 10.11 / zeb 12.1 / post 2.5 / core 1.0 There may be multiple paths', 'swell 1.2 / emmajsq 10.11 / zeb 12.1 / post 2.5 / core 1.0',
); );
}); });
}); });
......
...@@ -18689,7 +18689,7 @@ msgstr "" ...@@ -18689,7 +18689,7 @@ msgstr ""
msgid "Dependencies|Component name" msgid "Dependencies|Component name"
msgstr "" msgstr ""
   
msgid "Dependencies|Dependency path" msgid "Dependencies|Direct dependents"
msgstr "" msgstr ""
   
msgid "Dependencies|Error exporting the dependency list. Please reload the page." msgid "Dependencies|Error exporting the dependency list. Please reload the page."
...@@ -18704,16 +18704,16 @@ msgstr "" ...@@ -18704,16 +18704,16 @@ msgstr ""
msgid "Dependencies|Filtering unavailable" msgid "Dependencies|Filtering unavailable"
msgstr "" msgstr ""
   
msgid "Dependencies|Learn more about dependency paths" msgid "Dependencies|Learn more about direct dependents"
msgstr "" msgstr ""
   
msgid "Dependencies|License" msgid "Dependencies|License"
msgstr "" msgstr ""
   
msgid "Dependencies|Location" msgid "Dependencies|List of direct dependents"
msgstr "" msgstr ""
   
msgid "Dependencies|Location and dependency path" msgid "Dependencies|Location"
msgstr "" msgstr ""
   
msgid "Dependencies|Packager" msgid "Dependencies|Packager"
...@@ -18734,10 +18734,7 @@ msgstr "" ...@@ -18734,10 +18734,7 @@ msgstr ""
msgid "Dependencies|Software Bill of Materials (SBOM) based on the latest successful scan of each project." msgid "Dependencies|Software Bill of Materials (SBOM) based on the latest successful scan of each project."
msgstr "" msgstr ""
   
msgid "Dependencies|The component dependency path is based on the lock file. There may be several paths. In these cases, the longest path is displayed." msgid "Dependencies|The location includes the lock file. For transitive dependencies a list of its direct dependents is shown."
msgstr ""
msgid "Dependencies|There may be multiple paths"
msgstr "" msgstr ""
   
msgid "Dependencies|There was a problem fetching the licenses for this group." msgid "Dependencies|There was a problem fetching the licenses for this group."
0% 加载中 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册