From 7508ad8176348e6f7004c5fe6973910d95818d78 Mon Sep 17 00:00:00 2001 From: Thomas Boerger Date: Tue, 31 May 2016 10:11:41 +0200 Subject: [PATCH 1/3] Bumped to 1.0.4 --- CHANGELOG.md | 4 ++++ lib/gettext_i18n_rails_js/version.rb | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index 6e8727c..7057d0a 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,5 +1,9 @@ # Changelog +## [1.0.4](https://github.com/webhippie/gettext_i18n_rails_js/releases/tag/v1.0.4) - 2016-05-31 + +* Support ES2015 template strings (@bradbarrow) + ## [1.0.3](https://github.com/webhippie/gettext_i18n_rails_js/releases/tag/v1.0.3) - 2015-11-03 * Stop using bundler within the core lib (@domcleal) diff --git a/lib/gettext_i18n_rails_js/version.rb b/lib/gettext_i18n_rails_js/version.rb index c6c54dc..3da9d3c 100644 --- a/lib/gettext_i18n_rails_js/version.rb +++ b/lib/gettext_i18n_rails_js/version.rb @@ -27,7 +27,7 @@ module GettextI18nRailsJs class Version MAJOR = 1 MINOR = 0 - PATCH = 3 + PATCH = 4 PRE = nil From 0acaaf7332a6464ef9a2b02ba08047f099f60539 Mon Sep 17 00:00:00 2001 From: Thomas Boerger Date: Tue, 31 May 2016 10:14:17 +0200 Subject: [PATCH 2/3] Fix testing for ruby <= 2.1 --- Gemfile | 3 +++ 1 file changed, 3 insertions(+) diff --git a/Gemfile b/Gemfile index 3534a25..cf9bf0b 100644 --- a/Gemfile +++ b/Gemfile @@ -32,6 +32,9 @@ group :development do gem "guard", require: false gem "guard-rubocop", require: false gem "guard-rspec", require: false + + # Temporary fix for a ruby 2.2 requirement + gem "listen", "~> 3.0.7" end group :test do From 71c53b6a24955b56d7388fa933c49911cddf1993 Mon Sep 17 00:00:00 2001 From: Thomas Boerger Date: Tue, 31 May 2016 10:35:33 +0200 Subject: [PATCH 3/3] Fixed rubocop offense --- spec/gettext_i18n_rails_js/parser/javascript_spec.rb | 1 - 1 file changed, 1 deletion(-) diff --git a/spec/gettext_i18n_rails_js/parser/javascript_spec.rb b/spec/gettext_i18n_rails_js/parser/javascript_spec.rb index 589c7b3..a0cb22a 100644 --- a/spec/gettext_i18n_rails_js/parser/javascript_spec.rb +++ b/spec/gettext_i18n_rails_js/parser/javascript_spec.rb @@ -139,7 +139,6 @@ end end - it "finds interpolated multi-line messages" do content = <<-'EOF' """ Parser should grab