Skip to content

Commit cb984b0

Browse files
author
Ciaran McCrisken
committed
(IAC-889) Set FastGettext.default_text_domain in Rakefile
Also performed pdk update
1 parent f2b9314 commit cb984b0

File tree

4 files changed

+5
-4
lines changed

4 files changed

+5
-4
lines changed

Diff for: .sync.yml

+2
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,8 @@ Gemfile:
4242
ref: 20ee04ba1234e9e83eb2ffb5056e23d641c7a018
4343
condition: Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')
4444
Rakefile:
45+
extras:
46+
"FastGettext.default_text_domain = 'default-text-domain'"
4547
changelog_user: puppetlabs
4648
spec/spec_helper.rb:
4749
mock_with: ":rspec"

Diff for: Gemfile

-2
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@ group :development do
2929
gem "puppet-module-win-default-r#{minor_version}", '~> 0.4', require: false, platforms: [:mswin, :mingw, :x64_mingw]
3030
gem "puppet-module-win-dev-r#{minor_version}", '~> 0.4', require: false, platforms: [:mswin, :mingw, :x64_mingw]
3131
gem "github_changelog_generator", require: false, git: 'https://github.com/skywinder/github-changelog-generator', ref: '20ee04ba1234e9e83eb2ffb5056e23d641c7a018' if Gem::Version.new(RUBY_VERSION.dup) >= Gem::Version.new('2.2.2')
32-
gem 'ed25519', '>= 1.2', '< 2.0'
33-
gem 'bcrypt_pbkdf', '>= 1.0', '< 2.0'
3432
end
3533

3634
puppet_version = ENV['PUPPET_GEM_VERSION']

Diff for: Rakefile

+1
Original file line numberDiff line numberDiff line change
@@ -86,3 +86,4 @@ EOM
8686
end
8787
end
8888

89+
FastGettext.default_text_domain = 'default-text-domain'

Diff for: metadata.json

+2-2
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@
8787
"version_requirement": ">= 5.5.10 < 7.0.0"
8888
}
8989
],
90-
"pdk-version": "1.17.0",
90+
"pdk-version": "1.18.0",
9191
"template-url": "https://github.com/puppetlabs/pdk-templates#master",
92-
"template-ref": "heads/master-0-g88b05c7"
92+
"template-ref": "heads/master-0-g9c14433"
9393
}

0 commit comments

Comments
 (0)