Skip to content

Commit

Permalink
(FM-7316) - i18n Process implemented and .pot file generated
Browse files Browse the repository at this point in the history
  • Loading branch information
david22swan committed Aug 30, 2018
1 parent 1d5c598 commit 30c4de1
Show file tree
Hide file tree
Showing 13 changed files with 298 additions and 30 deletions.
2 changes: 2 additions & 0 deletions .rubocop_todo.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
GetText/DecorateString:
Enabled: false
12 changes: 6 additions & 6 deletions lib/puppet/provider/apt_key/apt_key.rb
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,7 @@ def self.key_line_hash(pub_line, fpr_line)
def source_to_file(value)
parsed_value = URI.parse(value)
if parsed_value.scheme.nil?
raise("The file #{value} does not exist") unless File.exist?(value)
raise(_('The file %{_value} does not exist') % { _value: value }) unless File.exist?(value)
# Because the tempfile method has to return a live object to prevent GC
# of the underlying file from occuring too early, we also have to return
# a file object here. The caller can still call the #path method on the
Expand All @@ -139,9 +139,9 @@ def source_to_file(value)
key = open(parsed_value, http_basic_authentication: user_pass).read
end
rescue OpenURI::HTTPError, Net::FTPPermError => e
raise("#{e.message} for #{resource[:source]}")
raise(_('%{_e} for %{_resource}') % { _e: e.message, _resource: resource[:source] })
rescue SocketError
raise("could not resolve #{resource[:source]}")
raise(_('could not resolve %{_resource}') % { _resource: resource[:source] })
else
tempfile(key)
end
Expand All @@ -168,7 +168,7 @@ def tempfile(content)
end
end
unless found_match
raise("The id in your manifest #{resource[:name]} and the fingerprint from content/source don't match. Check for an error in the id and content/source is legitimate.")
raise(_('The id in your manifest %{_resource} and the fingerprint from content/source don\'t match. Check for an error in the id and content/source is legitimate.') % { _name: resource[:name] }) # rubocop:disable Metrics/LineLength
end
else
warning('/usr/bin/gpg cannot be found for verification of the id.')
Expand Down Expand Up @@ -199,7 +199,7 @@ def create
command.push('add', key_file.path)
# In case we really screwed up, better safe than sorry.
else
raise("an unexpected condition occurred while trying to add the key: #{resource[:id]}")
raise(_('an unexpected condition occurred while trying to add the key: %{_resource}') % { _resource: resource[:id] })
end
apt_key(command)
@property_hash[:ensure] = :present
Expand All @@ -215,7 +215,7 @@ def destroy
end

def read_only(_value)
raise('This is a read-only property.')
raise(_('This is a read-only property.'))
end

mk_resource_methods
Expand Down
4 changes: 2 additions & 2 deletions lib/puppet/type/apt_key.rb
Original file line number Diff line number Diff line change
Expand Up @@ -20,10 +20,10 @@

validate do
if self[:content] && self[:source]
raise('The properties content and source are mutually exclusive.')
raise(_('The properties content and source are mutually exclusive.'))
end
if self[:id].length < 40
warning('The id should be a full fingerprint (40 characters), see README.')
warning(_('The id should be a full fingerprint (40 characters), see README.'))
end
end

Expand Down
266 changes: 266 additions & 0 deletions locales/puppetlabs-apt.pot
Original file line number Diff line number Diff line change
@@ -0,0 +1,266 @@
# #-#-#-#-# accounts.pot (PACKAGE VERSION) #-#-#-#-#
# #-#-#-#-# accounts.pot (PACKAGE VERSION) #-#-#-#-#
# #-#-#-#-# puppetlabs-apt.pot (puppetlabs-apt 6.0.0-9-g1d5c598) #-#-#-#-#
# SOME DESCRIPTIVE TITLE.
# Copyright (C) 2018 Puppet, Inc.
# This file is distributed under the same license as the puppetlabs-apt package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2018.
#
# #-#-#-#-# puppetlabs-apt_metadata.pot (PACKAGE VERSION) #-#-#-#-#
#
# #-#-#-#-# puppetlabs-apt.pot (puppetlabs-apt 6.0.0-9-g1d5c598) #-#-#-#-#
# SOME DESCRIPTIVE TITLE.
# Copyright (C) 2018 Puppet, Inc.
# This file is distributed under the same license as the puppetlabs-apt package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2018.
#
# #-#-#-#-# puppetlabs-apt_metadata.pot (PACKAGE VERSION) #-#-#-#-#
#
# #-#-#-#-# puppetlabs-apt.pot (puppetlabs-apt 6.0.0-9-g1d5c598) #-#-#-#-#
# SOME DESCRIPTIVE TITLE.
# Copyright (C) 2018 Puppet, Inc.
# This file is distributed under the same license as the puppetlabs-apt package.
# FIRST AUTHOR <EMAIL@ADDRESS>, 2018.
#
# #-#-#-#-# puppetlabs-apt_metadata.pot (PACKAGE VERSION) #-#-#-#-#
#
#, fuzzy
msgid ""
msgstr ""
"#-#-#-#-# accounts.pot (PACKAGE VERSION) #-#-#-#-#\n"
"#-#-#-#-# accounts.pot (PACKAGE VERSION) #-#-#-#-#\n"
"#-#-#-#-# puppet.pot (PACKAGE VERSION) #-#-#-#-#\n"
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-08-30 14:54:05 +0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Translate Toolkit 2.0.0\n"
"#-#-#-#-# puppetlabs-apt.pot (puppetlabs-apt 6.0.0-9-g1d5c598) #-#-#-#-#\n"
"Project-Id-Version: puppetlabs-apt 6.0.0-9-g1d5c598\n"
"\n"
"Report-Msgid-Bugs-To: docs@puppet.com\n"
"POT-Creation-Date: 2018-08-30 14:48+0100\n"
"PO-Revision-Date: 2018-08-30 14:48+0100\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
"#-#-#-#-# puppetlabs-apt_metadata.pot (PACKAGE VERSION) #-#-#-#-#\n"
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To:\n"
"POT-Creation-Date: 2018-08-30T14:54:45+01:00\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Translate Toolkit 2.0.0\n"
"#-#-#-#-# puppet.pot (PACKAGE VERSION) #-#-#-#-#\n"
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-08-30 14:54:05 +0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Translate Toolkit 2.0.0\n"
"#-#-#-#-# puppetlabs-apt.pot (puppetlabs-apt 6.0.0-9-g1d5c598) #-#-#-#-#\n"
"Project-Id-Version: puppetlabs-apt 6.0.0-9-g1d5c598\n"
"\n"
"Report-Msgid-Bugs-To: docs@puppet.com\n"
"POT-Creation-Date: 2018-08-30 14:48+0100\n"
"PO-Revision-Date: 2018-08-30 14:48+0100\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
"#-#-#-#-# puppetlabs-apt_metadata.pot (PACKAGE VERSION) #-#-#-#-#\n"
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To:\n"
"POT-Creation-Date: 2018-08-30T14:54:45+01:00\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Translate Toolkit 2.0.0\n"
"#-#-#-#-# puppet.pot (PACKAGE VERSION) #-#-#-#-#\n"
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2018-08-30 16:09:57 +0100\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Translate Toolkit 2.0.0\n"
"#-#-#-#-# puppetlabs-apt.pot (puppetlabs-apt 6.0.0-9-g1d5c598) #-#-#-#-#\n"
"Project-Id-Version: puppetlabs-apt 6.0.0-9-g1d5c598\n"
"\n"
"Report-Msgid-Bugs-To: docs@puppet.com\n"
"POT-Creation-Date: 2018-08-30 16:09+0100\n"
"PO-Revision-Date: 2018-08-30 16:09+0100\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: \n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
"#-#-#-#-# puppetlabs-apt_metadata.pot (PACKAGE VERSION) #-#-#-#-#\n"
"Project-Id-Version: PACKAGE VERSION\n"
"Report-Msgid-Bugs-To:\n"
"POT-Creation-Date: 2018-08-30T14:54:45+01:00\n"
"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"MIME-Version: 1.0\n"
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"X-Generator: Translate Toolkit 2.0.0\n"

#. ./manifests/backports.pp:36
msgid ""
"If not on Debian or Ubuntu, you must explicitly pass location, release, "
"repos, and key"
msgstr ""

#. ./manifests/backports.pp:50
msgid "pin must be either a string, number or hash"
msgstr ""

#. ./manifests/conf.pp:11
msgid "Need to pass in content parameter"
msgstr ""

#. ./manifests/init.pp:37 - ./manifests/params.pp:5
msgid "This module only works on Debian or derivatives like Ubuntu"
msgstr ""

#. ./manifests/params.pp:97
msgid "Unable to determine value for fact os['name']"
msgstr ""

#. ./manifests/pin.pp:52
msgid "parameters release, origin, and version are mutually exclusive"
msgstr ""

#. ./manifests/pin.pp:56
msgid "parameter version cannot be used in general form"
msgstr ""

#. ./manifests/pin.pp:59
msgid "parameters release and origin are mutually exclusive"
msgstr ""

#. ./manifests/ppa.pp:10 - ./manifests/source.pp:25
msgid "lsbdistcodename fact not available: release parameter required"
msgstr ""

#. ./manifests/ppa.pp:14
msgid "apt::ppa is not currently supported on Debian."
msgstr ""

#. ./manifests/setting.pp:11
msgid "apt::setting cannot have both content and source"
msgstr ""

#. ./manifests/setting.pp:15
msgid "apt::setting needs either of content or source"
msgstr ""

#. ./manifests/setting.pp:23
msgid ""
"apt::setting resource name/title must start with either 'conf-', 'pref-' or "
"'list-'"
msgstr ""

#. ./manifests/setting.pp:29
msgid "apt::setting priority must be an integer or a zero-padded integer"
msgstr ""

#. ./manifests/source.pp:33
msgid "cannot create a source entry without specifying a location"
msgstr ""

#. ./manifests/source.pp:47
msgid "key hash must contain at least an id entry"
msgstr ""

#. ./manifests/source.pp:86
msgid "Received invalid value for pin parameter"
msgstr ""

#: ../lib/puppet/provider/apt_key/apt_key.rb:122
msgid "The file %{_value} does not exist"
msgstr ""

#: ../lib/puppet/provider/apt_key/apt_key.rb:218
msgid "This is a read-only property."
msgstr ""

#: ../lib/puppet/type/apt_key.rb:23
msgid "The properties content and source are mutually exclusive."
msgstr ""

#. metadata.json
#: .summary
msgid ""
"Provides an interface for managing Apt source, key, and definitions with "
"Puppet"
msgstr ""

#. ./manifests/params.pp:97
msgid "Unable to determine value for fact os[\"name\"]"
msgstr ""

#. ./manifests/key.pp:29
msgid "key with id %{_id} already ensured as absent"
msgstr ""

#. ./manifests/key.pp:62
msgid "key with id %{_id} already ensured as present"
msgstr ""

#. ./manifests/key.pp:78
msgid "Invalid 'ensure' value '%{_ensure}' for apt::key"
msgstr ""

#: ../lib/puppet/provider/apt_key/apt_key.rb:142
msgid "%{_e} for %{_resource}"
msgstr ""

#: ../lib/puppet/provider/apt_key/apt_key.rb:144
msgid "could not resolve %{_resource}"
msgstr ""

#: ../lib/puppet/provider/apt_key/apt_key.rb:171
msgid ""
"The id in your manifest %{_resource} and the fingerprint from content/source "
"don't match. Check for an error in the id and content/source is legitimate."
msgstr ""

#: ../lib/puppet/provider/apt_key/apt_key.rb:202
msgid ""
"an unexpected condition occurred while trying to add the key: %{_resource}"
msgstr ""

#: ../lib/puppet/type/apt_key.rb:26
msgid "The id should be a full fingerprint (40 characters), see README."
msgstr ""
4 changes: 2 additions & 2 deletions manifests/backports.pp
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@
}
} else {
unless $location and $release and $repos and $key {
fail('If not on Debian or Ubuntu, you must explicitly pass location, release, repos, and key')
fail(translate('If not on Debian or Ubuntu, you must explicitly pass location, release, repos, and key'))
}
}

Expand All @@ -47,7 +47,7 @@
'release' => $_release,
}
} else {
fail('pin must be either a string, number or hash')
fail(translate('pin must be either a string, number or hash'))
}

apt::source { 'backports':
Expand Down
2 changes: 1 addition & 1 deletion manifests/conf.pp
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@

unless $ensure == 'absent' {
unless $content {
fail('Need to pass in content parameter')
fail(translate('Need to pass in content parameter'))
}
}

Expand Down
2 changes: 1 addition & 1 deletion manifests/init.pp
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,7 @@
) inherits apt::params {

if $facts['osfamily'] != 'Debian' {
fail('This module only works on Debian or derivatives like Ubuntu')
fail(translate('This module only works on Debian or derivatives like Ubuntu'))
}

if $update['frequency'] {
Expand Down
6 changes: 3 additions & 3 deletions manifests/key.pp
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@
case $ensure {
present: {
if defined(Anchor["apt_key ${id} absent"]){
fail("key with id ${id} already ensured as absent")
fail(translate('key with id %{_id} already ensured as absent'),{'_id' => id})
}

if !defined(Anchor["apt_key ${id} present"]) {
Expand Down Expand Up @@ -59,7 +59,7 @@

absent: {
if defined(Anchor["apt_key ${id} present"]){
fail("key with id ${id} already ensured as present")
fail(translate('key with id %{_id} already ensured as present', {'_id' => id}))
}

if !defined(Anchor["apt_key ${id} absent"]){
Expand All @@ -75,7 +75,7 @@
}

default: {
fail "Invalid 'ensure' value '${ensure}' for apt::key"
fail translate('Invalid \'ensure\' value \'%{_ensure}\' for apt::key', {'_ensure' => ensure})
}
}
}
Loading

0 comments on commit 30c4de1

Please sign in to comment.