(PUP-7042) Mark strings in type #5566
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
CLA signed by all contributors. |
|
Closing and reopening to fix Travis. |
Magisus
force-pushed
the
PUP-7042/type
branch
2 times, most recently
from
cf626fe
to
3622a09
Compare
This commit marks user-facing error and info strings in `lib/puppet/type/*` for translation.
|
Closing and reopening to fix CI. |
MosesMendoza
reviewed
Apr 3, 2017
lib/puppet/type/macauthorization.rb
Outdated
| @@ -31,7 +31,7 @@ def munge_boolean(value) | |||
| def munge_integer(value) | |||
| Integer(value) | |||
| rescue ArgumentError | |||
| fail("munge_integer only takes integers") | |||
| fail "munge_integer only takes integers" | |||
There was a problem hiding this comment.
Looks like this was modified incorrectly
MosesMendoza
reviewed
Apr 3, 2017
lib/puppet/type/tidy.rb
Outdated
| @@ -258,7 +260,7 @@ def generate | |||
| end | |||
| found_files = files.find_all { |path| tidy?(path) }.collect { |path| mkfile(path) } | |||
| result = found_files.each { |file| debug "Tidying #{file.ref}" }.sort { |a,b| b[:path] <=> a[:path] } | |||
| notice "Tidying #{found_files.size} files" | |||
| notice _("Tidying %{count} files") % { count: found_files.size } | |||
There was a problem hiding this comment.
Probably worth including note here too re: Tidying
MosesMendoza
reviewed
Apr 3, 2017
lib/puppet/type/tidy.rb
Outdated
| return nil | ||
| rescue Errno::EACCES => error | ||
| warning "Could not stat; permission denied" | ||
| warning _("Could not stat; permission denied") |
There was a problem hiding this comment.
Could you add a note re: stat is a program name?
MosesMendoza
reviewed
Apr 3, 2017
lib/puppet/type/user.rb
Outdated
| @@ -391,7 +391,7 @@ def insync?(current) | |||
|
|
|||
| validate do |value| | |||
| if value.intern != :absent and value !~ /^\d{4}-\d{2}-\d{2}$/ | |||
| raise ArgumentError, "Expiry dates must be YYYY-MM-DD or the string \"absent\"" | |||
| raise ArgumentError, _("Expiry dates must be YYYY-MM-DD or the string \"absent\"") | |||
There was a problem hiding this comment.
Do you think its worth a translator note that YYYY-MM-DD reflects a four digit year two digit month two digit day separated by dashes? Maybe that's self-evident, not sure how/if it translates though
MosesMendoza
reviewed
Apr 3, 2017
lib/puppet/type/user.rb
Outdated
| end | ||
|
|
||
| return [ "#{home}/.ssh/authorized_keys" ] if value == :true | ||
| # value is an array - munge each value | ||
| [ value ].flatten.map do |entry| | ||
| if entry =~ /^~|^%h/ and not home | ||
| raise ArgumentError, "purge_ssh_keys value '#{value}' meta character ~ or %h only allowed for users with a defined home directory" | ||
| raise ArgumentError, "purge_ssh_keys value '#{value}' meta character ~ or \%h only allowed for users with a defined home directory" |
There was a problem hiding this comment.
Looks like this line got skipped, maybe as a result of escaping %h ?
Magisus
force-pushed
the
PUP-7042/type
branch
2 times, most recently
from
efd6c4e
to
3a8a582
Compare
|
Updated. |
MosesMendoza
approved these changes
Apr 12, 2017
Iristyle
pushed a commit
to Iristyle/puppet
that referenced
this pull request
Dec 14, 2017
(PUP-7042) Mark strings in type
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This commit marks user-facing error and info strings in
lib/puppet/type/*for translation.