Skip to content

Commit 76e9857

Browse files
authored
Merge pull request #693 from puppetlabs/remove-translate
(IAC-1497) remove unsupported `translate` dependency
2 parents 11c4fec + a1a3346 commit 76e9857

File tree

6 files changed

+2
-274
lines changed

6 files changed

+2
-274
lines changed

.fixtures.yml

-1
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,5 @@ fixtures:
44
provision: 'https://github.com/puppetlabs/provision.git'
55
puppet_agent: 'https://github.com/puppetlabs/puppetlabs-puppet_agent.git'
66
stdlib: 'https://github.com/puppetlabs/puppetlabs-stdlib.git'
7-
translate: 'https://github.com/puppetlabs/puppetlabs-translate.git'
87
symlinks:
98
concat: '#{source_dir}'

locales/config.yaml

-26
This file was deleted.

locales/ja/puppetlabs-concat.po

-110
This file was deleted.

locales/puppetlabs-concat.pot

-127
This file was deleted.

manifests/fragment.pp

+2-6
Original file line numberDiff line numberDiff line change
@@ -25,17 +25,13 @@
2525
$resource = 'Concat::Fragment'
2626

2727
if ($order =~ String and $order =~ /[:\n\/]/) {
28-
# lint:ignore:140chars
29-
fail(translate("%{_resource}['%{_title}']: 'order' cannot contain '/', ':', or '\\n'.", { '_resource' => $resource, '_title' => $title }))
30-
# lint:endignore
28+
fail("${resource}['${title}']: 'order' cannot contain '/', ':', or '\\n'.")
3129
}
3230

3331
if ! ($content or $source) {
3432
crit('No content, source or symlink specified')
3533
} elsif ($content and $source) {
36-
# lint:ignore:140chars
37-
fail(translate("%{_resource}['%{_title}']: Can't use 'source' and 'content' at the same time.", { '_resource' => $resource, '_title' => $title }))
38-
# lint:endignore
34+
fail("${resource}['${title}']: Can't use 'source' and 'content' at the same time.")
3935
}
4036

4137
# $serverversion is empty on 'puppet apply' runs. Just use clientversion.

metadata.json

-4
Original file line numberDiff line numberDiff line change
@@ -11,10 +11,6 @@
1111
{
1212
"name": "puppetlabs/stdlib",
1313
"version_requirement": ">= 4.13.1 < 8.0.0"
14-
},
15-
{
16-
"name": "puppetlabs/translate",
17-
"version_requirement": ">= 1.0.0 < 3.0.0"
1814
}
1915
],
2016
"operatingsystem_support": [

0 commit comments

Comments
 (0)