Skip to content

Commit 7b63b3c

Browse files
authored
Merge pull request #404 from david22swan/IAC-1497/main/remove_translate
(IAC-1497) - Removal of unsupported `translate` dependency
2 parents e3bfd33 + d3298e2 commit 7b63b3c

File tree

6 files changed

+3
-171
lines changed

6 files changed

+3
-171
lines changed

.fixtures.yml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,6 @@ fixtures:
44
provision: 'https://github.com/puppetlabs/provision.git'
55
puppet_agent: 'https://github.com/puppetlabs/puppetlabs-puppet_agent.git'
66
registry: 'https://github.com/puppetlabs/puppetlabs-registry.git'
7-
translate: 'https://github.com/puppetlabs/puppetlabs-translate.git'
87
stdlib: 'https://github.com/puppetlabs/puppetlabs-stdlib.git'
98
symlinks:
109
motd: "#{source_dir}"

locales/config.yaml

Lines changed: 0 additions & 26 deletions
This file was deleted.

locales/ja/puppetlabs-motd.po

Lines changed: 0 additions & 54 deletions
This file was deleted.

locales/puppetlabs-motd.pot

Lines changed: 0 additions & 83 deletions
This file was deleted.

manifests/init.pp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@
4343
) {
4444
if $template {
4545
if $content {
46-
warning(translate('Both $template and $content parameters passed to motd, ignoring content'))
46+
warning('Both $template and $content parameters passed to motd, ignoring content')
4747
}
4848
$motd_content = epp($template)
4949
} elsif $content {
@@ -54,7 +54,7 @@
5454

5555
if $issue_template {
5656
if $issue_content {
57-
warning(translate('Both $issue_template and $issue_content parameters passed to motd, ignoring issue_content'))
57+
warning('Both $issue_template and $issue_content parameters passed to motd, ignoring issue_content')
5858
}
5959
$_issue_content = epp($issue_template)
6060
} elsif $issue_content {
@@ -65,7 +65,7 @@
6565

6666
if $issue_net_template {
6767
if $issue_net_content {
68-
warning(translate('Both $issue_net_template and $issue_net_content parameters passed to motd, ignoring issue_net_content'))
68+
warning('Both $issue_net_template and $issue_net_content parameters passed to motd, ignoring issue_net_content')
6969
}
7070
$_issue_net_content = epp($issue_net_template)
7171
} elsif $issue_net_content {

metadata.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,6 @@
1515
{
1616
"name": "puppetlabs/stdlib",
1717
"version_requirement": ">= 2.1.0 < 8.0.0"
18-
},
19-
{
20-
"name": "puppetlabs/translate",
21-
"version_requirement": ">= 1.0.0 < 3.0.0"
2218
}
2319
],
2420
"operatingsystem_support": [

0 commit comments

Comments
 (0)