Skip to content
This repository has been archived by the owner on Apr 21, 2023. It is now read-only.

fix translation support (#463) #466

Merged
merged 3 commits into from
Apr 24, 2018
Merged

fix translation support (#463) #466

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
a138ce7
fix translation support (#463)
jharting Apr 23, 2018
cd34df7
do not use :: in localized string plurals as that is not supported by…
jharting Apr 23, 2018
aa7fa51
Merge branch 'master' into fixes/463
jharting Apr 24, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/js/components/inventory/inventoryActions/inventoryActions.jade
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@
translate) Unregister
.col-xs-8.col-sm-8.text-center
span(ng-hide='reloading')
h3.system-count(translate, translate-n='totalSystems()', translate-plural='{{:: $count}} Systems') 1 System
h3.system-count(translate, translate-n='totalSystems()', translate-plural='{{$count}} Systems') 1 System
small.light(ng-if='checkboxes.totalChecked', translate)   ({{totalSystemsSelected}} Selected
span(ng-if='allSelected && pager.perPage < totalSystems()') .
a(ng-if='!reallyAllSelected', ng-click='reallySelectAll()', translate) &nbsp;Select All Systems.
Expand Down
6 changes: 3 additions & 3 deletions app/js/components/rule/ruleGroupCard/ruleGroupCard.jade
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
.card-group(ng-keypress='keyPressed($event)')
header.header
.count(translate, translate-n='plugin.hitCount', translate-plural="{{:: $count}} Systems") 1 System
.count(translate, translate-n='plugin.hitCount', translate-plural="{{$count}} Systems") 1 System
.row
.col-sm-9
i.fa.fa-users(aria-hidden="true")
Expand All @@ -11,7 +11,7 @@
| {{:: plugin.categories[0]}}
span &nbsp; {{:: plugin.display_name}}
.col-sm-3.text-right-sm
span(translate, translate-n='plugin.rules.length', translate-plural='{{:: $count}} Rules in this group') 1 Rule in this group
span(translate, translate-n='plugin.rules.length', translate-plural='{{$count}} Rules in this group') 1 Rule in this group
.content.disabled-start(
ng-class='{swapping: swapping}',
ng-mouseenter='setActive(true)',
Expand Down Expand Up @@ -39,5 +39,5 @@
ng-disabled="rule.hitCount === 0",
translate,
translate-n='rule.hitCount',
translate-plural='View Impacted Systems ({{:: $count}})')
translate-plural='View Impacted Systems ({{$count}})')
| View Impacted System (1)
2 changes: 1 addition & 1 deletion app/js/components/topics/otherTopic/otherTopic.jade
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@ card
.card-header-title
h4 {{:: topic.title}}
.card-header-supporting-info
span.count(translate, translate-n='topic.affectedSystemCount', translate-plural='{{:: $count}} Systems') 1 System
span.count(translate, translate-n='topic.affectedSystemCount', translate-plural='{{$count}} Systems') 1 System
card-content(ng-bind-html=':: topic.summary_html ? topic.summary_html : Xtopic.content_html | trust_html')
card-footer.text-right-sm
strong
Expand Down
2 changes: 2 additions & 0 deletions app/js/insights.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -126,6 +126,8 @@ if (isPortal) {
angular.module('insights').config(require('./base_routes'));
}

angular.module('insights').run(require('./boot'));

// Common routes
angular.module('insights').config(require('./routes'));

Expand Down
4 changes: 2 additions & 2 deletions app/js/states/actions/actions.jade
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@
.card-header-title
h4 {{:: topic.title}}
.card-header-supporting-info
span.count(translate, translate-n='topic.affectedSystemCount', translate-plural='{{:: $count}} Systems') 1 System
span.count(translate, translate-n='topic.affectedSystemCount', translate-plural='{{$count}} Systems') 1 System
card-content(ng-bind-html=':: topic.summary_html ? topic.summary_html : Xtopic.content_html | trust_html')
card-footer.text-right-sm
strong
Expand All @@ -70,7 +70,7 @@
.card-header-title
h4 {{:: topic.title}}
.card-header-supporting-info
span.count(translate, translate-n='topic.affectedSystemCount', translate-plural='{{:: $count}} Systems') 1 System
span.count(translate, translate-n='topic.affectedSystemCount', translate-plural='{{$count}} Systems') 1 System
card-content(ng-bind-html=':: topic.summary_html ? topic.summary_html : Xtopic.content_html | trust_html')
card-footer.text-right-sm
strong
Expand Down
4 changes: 2 additions & 2 deletions app/js/states/vulnerabilities/views/view-package.jade
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,9 +26,9 @@
a(ui-sref='app.vulnerabilities-package-erratum({rhsa_id: rhsa.erratum_id, package_id: package.name, root_view: selectedView})',
ng-click="$event.stopPropagation()") {{:: rhsa.erratum_id }}
.cve-count
span(translate, translate-n='rhsa.cve_count', translate-plural='{{:: $count}} CVEs') 1 CVE
span(translate, translate-n='rhsa.cve_count', translate-plural='{{$count}} CVEs') 1 CVE
.pipe |
span.hits(translate, translate-n='rhsa.system_count', translate-plural='{{:: $count}} systems') 1 system
span.hits(translate, translate-n='rhsa.system_count', translate-plural='{{$count}} systems') 1 system

cve-summary(ng-if='selectedRHSA && selectedRHSA.cves.length', style='order: {{cveOrder}}', cves='selectedRHSA.cves')
.footer
Expand Down