Skip to content

Commit a9634de

Browse files
Merge pull request #373 from david22swan/IAC-1497/main/translate_removal
(IAC-1497) - Removal of unsupported `translate` dependency
2 parents 6f22d12 + b1ab7d1 commit a9634de

File tree

9 files changed

+4
-157
lines changed

9 files changed

+4
-157
lines changed

.fixtures.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,6 @@ fixtures:
66
stdlib:
77
repo: 'https://github.com/puppetlabs/puppetlabs-stdlib.git'
88
ref: '5.0.0'
9-
translate:
10-
repo: 'https://github.com/puppetlabs/puppetlabs-translate'
119
facts: 'https://github.com/puppetlabs/puppetlabs-facts.git'
1210
puppet_agent: 'https://github.com/puppetlabs/puppetlabs-puppet_agent.git'
1311
provision: 'https://github.com/puppetlabs/provision.git'

locales/config.yaml

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

locales/ja/puppetlabs-accounts.po

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

locales/puppetlabs-accounts.pot

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

manifests/home_dir.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@
6464
) {
6565
assert_type(Stdlib::Unixpath, $name)
6666
if $ensure == 'absent' {
67-
fail(translate('To remove home directories, use the `file` resource.'))
67+
fail('To remove home directories, use the `file` resource.')
6868
} else {
6969
assert_type(Accounts::User::Name, $group)
7070
assert_type(Accounts::User::Name, $user)

manifests/key_management.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@
5555
} elsif $user_home {
5656
$key_file = "${sshkey_dotdir}/authorized_keys"
5757
} else {
58-
err(translate('Either user_home or sshkey_custom_path must be specified'))
58+
err('Either user_home or sshkey_custom_path must be specified')
5959
}
6060

6161
if $ensure == 'present' {

manifests/manage_keys.pp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@
2828

2929
$key_def = accounts_ssh_authorized_keys_line_parser($keyspec)
3030
if (! $key_def) {
31-
err(translate("Could not interpret SSH key definition: '%{keyspec}'", {'keyspec' => $keyspec}))
31+
err("Could not interpret SSH key definition: '${keyspec}'")
3232
}
3333
else {
3434
if (! empty($key_def[0])) {

manifests/user.pp

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -363,8 +363,7 @@
363363
}
364364
}
365365
else {
366-
warning(translate('ssh keys were passed for user %{name} but $managehome is set to false; not managing user ssh keys',
367-
{'name' => $name}))
366+
warning("ssh keys were passed for user ${name} but $managehome is set to false; not managing user ssh keys")
368367
}
369368
}
370369
}

metadata.json

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -8,10 +8,6 @@
88
"project_page": "https://github.com/puppetlabs/puppetlabs-accounts",
99
"issues_url": "https://tickets.puppetlabs.com/browse/MODULES",
1010
"dependencies": [
11-
{
12-
"name": "puppetlabs/translate",
13-
"version_requirement": ">= 1.0.0 < 3.0.0"
14-
},
1511
{
1612
"name": "puppetlabs/stdlib",
1713
"version_requirement": ">= 5.0.0 < 8.0.0"

0 commit comments

Comments
 (0)